Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot 2025-02-13 17:02:52 -05:00
commit 667262dcfb
8 changed files with 135 additions and 59 deletions

View file

@ -25,14 +25,16 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkInput>
</template>
<MkSwitch v-model="order">Sort by newest to oldest</MkSwitch>
<MkSwitch v-model="order">{{ i18n.ts._noteSearch.newestToOldest }}</MkSwitch>
<MkSelect v-model="filetype" small>
<template #label>File Type</template>
<option :value="null">None</option>
<option value="image">Images</option>
<option value="video">Videos</option>
<option value="audio">Audio</option>
<template #label>{{ i18n.ts._noteSearch.fileType }}</template>
<option :value="null">{{ i18n.ts._noteSearch._fileType.none }}</option>
<option value="image">{{ i18n.ts._noteSearch._fileType.image }}</option>
<option value="video">{{ i18n.ts._noteSearch._fileType.video }}</option>
<option value="audio">{{ i18n.ts._noteSearch._fileType.audio }}</option>
<option value="module">{{ i18n.ts._noteSearch._fileType.module }}</option>
<option value="flash">{{ i18n.ts._noteSearch._fileType.flash }}</option>
</MkSelect>
<MkFolder :defaultOpen="true">
@ -101,7 +103,7 @@ const notePagination = ref<Paging>();
const user = ref<UserDetailed | null>(null);
const hostInput = ref(toRef(props, 'host').value);
const order = ref(false);
const filetype = ref(null);
const filetype = ref<'image' | 'video' | 'audio' | 'module' | 'flash' | null>(null);
const noteSearchableScope = instance.noteSearchableScope ?? 'local';