diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-14 23:43:57 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-14 23:48:36 -0500 |
| commit | c67d985254df63ca803f22ac4eda413aba1e95f6 (patch) | |
| tree | 21ce328fa5944cd100de5ef4e2ebc3152ad342b0 | |
| parent | fix performance of SQL LIKE note search (diff) | |
| parent | merge: Fix error when searching without a specified host (!898) (diff) | |
| download | sharkey-c67d985254df63ca803f22ac4eda413aba1e95f6.tar.gz sharkey-c67d985254df63ca803f22ac4eda413aba1e95f6.tar.bz2 sharkey-c67d985254df63ca803f22ac4eda413aba1e95f6.zip | |
Merge branch 'develop' into merge/2024-02-03
# Conflicts:
# packages/backend/src/core/SearchService.ts
# packages/misskey-js/src/autogen/types.ts
| -rw-r--r-- | packages/backend/src/core/SearchService.ts | 4 | ||||
| -rw-r--r-- | packages/misskey-js/src/autogen/types.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts index d16f9eb6bd..0063dbc762 100644 --- a/packages/backend/src/core/SearchService.ts +++ b/packages/backend/src/core/SearchService.ts @@ -85,14 +85,14 @@ const fileTypes = { }; // Make sure to regenerate misskey-js and check search.note.vue after changing these -export const fileTypeCategories = ['image', 'video', 'audio', 'module', 'flash'] as const; +export const fileTypeCategories = ['image', 'video', 'audio', 'module', 'flash', null] as const; export type FileTypeCategory = typeof fileTypeCategories[number]; export type SearchOpts = { userId?: MiNote['userId'] | null; channelId?: MiNote['channelId'] | null; host?: string | null; - filetype?: FileTypeCategory | null; + filetype?: FileTypeCategory; order?: string | null; disableMeili?: boolean | null; }; diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index 258254ad02..9bac7a812c 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -25901,7 +25901,7 @@ export type operations = { /** @description The local host is represented with `.`. */ host?: string; /** @enum {string|null} */ - filetype?: 'image' | 'video' | 'audio' | 'module' | 'flash'; + filetype?: 'image' | 'video' | 'audio' | 'module' | 'flash' | null; /** * Format: misskey:id * @default null |