merge: upstream

This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions

View file

@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { computed, defineAsyncComponent, onMounted } from 'vue';
import { ref } from 'vue';
import MkUserList from '@/components/MkUserList.vue';
import MkInput from '@/components/MkInput.vue';
import MkRadios from '@/components/MkRadios.vue';
@ -33,20 +33,17 @@ import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import MkFoldableSection from '@/components/MkFoldableSection.vue';
import { $i } from '@/account.js';
import { instance } from '@/instance.js';
import MkInfo from '@/components/MkInfo.vue';
import { useRouter } from '@/router.js';
const router = useRouter();
let key = $ref('');
let searchQuery = $ref('');
let searchOrigin = $ref('combined');
let userPagination = $ref();
const key = ref('');
const searchQuery = ref('');
const searchOrigin = ref('combined');
const userPagination = ref();
async function search() {
const query = searchQuery.toString().trim();
const query = searchQuery.value.toString().trim();
if (query == null || query === '') return;
@ -68,15 +65,15 @@ async function search() {
return;
}
userPagination = {
userPagination.value = {
endpoint: 'users/search',
limit: 10,
params: {
query: query,
origin: searchOrigin,
origin: searchOrigin.value,
},
};
key = query;
key.value = query;
}
</script>