Merge pull request #37 from penginn-0/fix-2024-0325-1

Fix:Searchfile/missinglocale
1673beta · Mar 27, 2024 · c7c1d67 · c7c1d67
2 parents 869c610 + 4101d42
commit c7c1d67
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1800,6 +1800,9 @@ _achievements:
     _setNameToNoriDev:
       title: "神様コンプレックス（CherryPick）"
       description: "名前を noridev に設定した"
+    _setNameToYojo:
+      title: "ロリータコンプレックス"
+      description: "名前を 幼女 に設定した"
     _passedSinceAccountCreated1:
       title: "一周年"
       description: "アカウント作成から1年経過した"

diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
@@ -243,6 +243,13 @@ export class SearchService {
 				}
 			}
 
+			if (opts.fileOption) {
+				if (opts.fileOption === 'file-only') {
+					query.andWhere('note.fileIds != \'{}\'');
+				} else if (opts.fileOption === 'no-file') {
+					query.andWhere('note.fileIds = :fIds', { fIds: '{}' });
+				}
+			}
 			this.queryService.generateVisibilityQuery(query, me);
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);

diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
@@ -84,6 +84,7 @@ export const ROLE_POLICIES = [
 	'canManageCustomEmojis',
 	'canManageAvatarDecorations',
 	'canSearchNotes',
+	'canAdvancedSearchNotes',
 	'canUseTranslator',
 	'canHideAds',
 	'driveCapacityMb',

diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
@@ -111,7 +111,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canSearchNotes'])">
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canAdvancedSearchNotes, 'canAdvancedSearchNotes'])">
+							<template #label>{{ i18n.ts._role._options.canAdvancedSearchNotes }}</template>
+							<template #suffix>{{ policies.canAdvancedSearchNotes ? i18n.ts.yes : i18n.ts.no }}</template>
+							<MkSwitch v-model="policies.canAdvancedSearchNotes">
+								<template #label>{{ i18n.ts.enable }}</template>
+							</MkSwitch>
+						</MkFolder>
+
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canUseTranslator'])">
 							<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template>
 							<template #suffix>{{ policies.canUseTranslator ? i18n.ts.yes : i18n.ts.no }}</template>
 							<MkSwitch v-model="policies.canUseTranslator">

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
@@ -118,7 +118,6 @@ async function search() {
 			query: searchQuery.value,
 			userId: user.value ? user.value.id : null,
 			origin: searchOrigin.value,
-			fileOption: isfileOnly.value,
 		},
 	};