mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-04-30 02:26:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	packages/backend/src/core/SearchService.ts
#	packages/misskey-js/src/autogen/types.ts
This commit is contained in:
Hazelnoot 2025-02-14 23:43:57 -05:00
commit c67d985254
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/SearchService.ts
View file

@ -85,14 +85,14 @@ const fileTypes = {
}; };
// Make sure to regenerate misskey-js and check search.note.vue after changing these // 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 FileTypeCategory = typeof fileTypeCategories[number];
export type SearchOpts = { export type SearchOpts = {
userId?: MiNote['userId'] | null; userId?: MiNote['userId'] | null;
channelId?: MiNote['channelId'] | null; channelId?: MiNote['channelId'] | null;
host?: string | null; host?: string | null;
filetype?: FileTypeCategory | null; filetype?: FileTypeCategory;
order?: string | null; order?: string | null;
disableMeili?: boolean | null; disableMeili?: boolean | null;
}; };

2
packages/misskey-js/src/autogen/types.ts
View file

@ -25901,7 +25901,7 @@ export type operations = {
/** @description The local host is represented with `.`. */ /** @description The local host is represented with `.`. */
host?: string; host?: string;
/** @enum {string|null} */ /** @enum {string|null} */
filetype?: 'image' | 'video' | 'audio' | 'module' | 'flash'; filetype?: 'image' | 'video' | 'audio' | 'module' | 'flash' | null;
/** /**
* Format: misskey:id * Format: misskey:id
* @default null * @default null