Merge branch 'develop' into merge/2024-02-03
# Conflicts: # packages/backend/src/core/SearchService.ts # packages/misskey-js/src/autogen/types.ts
This commit is contained in:
commit
c67d985254
2 changed files with 3 additions and 3 deletions
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue