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

1 files changed, 58 insertions, 49 deletions

diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 3ad2042d53..5794d27d4a 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -34,11 +34,65 @@ type Q =
 	{ op: 'or', qs: Q[] } |
 	{ op: 'not', q: Q };
 
+const fileTypes = {
+	image: [
+		'image/webp',
+		'image/png',
+		'image/jpeg',
+		'image/avif',
+		'image/apng',
+		'image/gif',
+	],
+	video: [
+		'video/mp4',
+		'video/webm',
+		'video/mpeg',
+		'video/x-m4v',
+	],
+	audio: [
+		'audio/mpeg',
+		'audio/flac',
+		'audio/wav',
+		'audio/aac',
+		'audio/webm',
+		'audio/opus',
+		'audio/ogg',
+		'audio/x-m4a',
+		'audio/mod',
+		'audio/s3m',
+		'audio/xm',
+		'audio/it',
+		'audio/x-mod',
+		'audio/x-s3m',
+		'audio/x-xm',
+		'audio/x-it',
+	],
+	// Keep in sync with frontend-shared/js/const.ts
+	module: [
+		'audio/mod',
+		'audio/x-mod',
+		'audio/s3m',
+		'audio/x-s3m',
+		'audio/xm',
+		'audio/x-xm',
+		'audio/it',
+		'audio/x-it',
+	],
+	flash: [
+		'application/x-shockwave-flash',
+		'application/vnd.adobe.flash.movie',
+	],
+};
+
+// 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 type FileTypeCategory = typeof fileTypeCategories[number];
+
 export type SearchOpts = {
 	userId?: MiNote['userId'] | null;
 	channelId?: MiNote['channelId'] | null;
 	host?: string | null;
-	filetype?: string | null;
+	filetype?: FileTypeCategory | null;
 	order?: string | null;
 	disableMeili?: boolean | null;
 };
@@ -239,18 +293,7 @@ export class SearchService {
 		}
 
 		if (opts.filetype) {
-			/* this is very ugly, but the "correct" solution would
-				be `and exists (select 1 from
-				unnest(note."attachedFileTypes") x(t) where t like
-				:type)` and I can't find a way to get TypeORM to
-				generate that; this hack works because `~*` is
-				"regexp match, ignoring case" and the stringified
-				version of an array of varchars (which is what
-				`attachedFileTypes` is) looks like `{foo,bar}`, so
-				we're looking for opts.filetype as the first half of
-				a MIME type, either at start of the array (after the
-				`{`) or later (after a `,`) */
-			query.andWhere('note."attachedFileTypes"::varchar ~* :type', { type: `[{,]${opts.filetype}/` });
+			query.andWhere('note."attachedFileTypes" && :types', { types: fileTypes[opts.filetype] });
 		}
 
 		this.queryService.generateVisibilityQuery(query, me);
@@ -296,42 +339,8 @@ export class SearchService {
 		}
 
 		if (opts.filetype) {
-			if (opts.filetype === 'image') {
-				filter.qs.push({ op: 'or', qs: [
-					{ op: '=', k: 'attachedFileTypes', v: 'image/webp' },
-					{ op: '=', k: 'attachedFileTypes', v: 'image/png' },
-					{ op: '=', k: 'attachedFileTypes', v: 'image/jpeg' },
-					{ op: '=', k: 'attachedFileTypes', v: 'image/avif' },
-					{ op: '=', k: 'attachedFileTypes', v: 'image/apng' },
-					{ op: '=', k: 'attachedFileTypes', v: 'image/gif' },
-				] });
-			} else if (opts.filetype === 'video') {
-				filter.qs.push({ op: 'or', qs: [
-					{ op: '=', k: 'attachedFileTypes', v: 'video/mp4' },
-					{ op: '=', k: 'attachedFileTypes', v: 'video/webm' },
-					{ op: '=', k: 'attachedFileTypes', v: 'video/mpeg' },
-					{ op: '=', k: 'attachedFileTypes', v: 'video/x-m4v' },
-				] });
-			} else if (opts.filetype === 'audio') {
-				filter.qs.push({ op: 'or', qs: [
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/mpeg' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/flac' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/wav' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/aac' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/webm' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/opus' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/ogg' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/x-m4a' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/mod' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/s3m' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/xm' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/it' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/x-mod' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/x-s3m' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/x-xm' },
-					{ op: '=', k: 'attachedFileTypes', v: 'audio/x-it' },
-				] });
-			}
+			const filters = fileTypes[opts.filetype].map(mime => ({ op: '=' as const, k: 'attachedFileTypes', v: mime }));
+			filter.qs.push({ op: 'or', qs: filters });
 		}
 
 		const res = await this.meilisearchNoteIndex.search(q, {