Merge branch 'kokonect-link-develop-alpha' into develop

1673beta · Mar 25, 2024 · ccdaded · ccdaded
2 parents c816b21 + 7113343
commit ccdaded
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -2936,7 +2936,7 @@ _imageCompressionMode:
   noResizeCompress: "縮小せず再圧縮する"
   resizeCompressLossy: "縮小して非可逆圧縮する"
   noResizeCompressLossy: "縮小せず非可逆圧縮する"
-  
+
 _advancedSearch:
   _fileOption:
     fileAttachedOnly: ファイル付きのみ

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -67,7 +67,9 @@ const reactionName = computed(() => {
 	return r.slice(0, r.indexOf('@'));
 });
 
-const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojis.value.find(it => it.name === reactionName.value)?.name ?? null) : null);
+
+const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojisMap.get(reactionName.value)?.name ?? null) : null);
+
 
 async function toggleReaction(ev: MouseEvent) {
 	if (!canToggle.value) {
@@ -168,7 +170,9 @@ async function menu(ev) {
 				}),
 			});
 		},
-	}, customEmojis.value.find(it => it.name === reactionName.value)?.name ? {
+
+	}, customEmojisMap.get(reactionName.value)?.name ? {
+
 		text: i18n.ts.copy,
 		icon: 'ti ti-copy',
 		action: () => {

diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -333,7 +333,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitch v-model="role.policies.canAdvancedSearchNotes.value" :disabled="role.policies.canAdvancedSearchNotes.useDefault" :readonly="readonly">
 						<template #label>{{ i18n.ts.enable }}</template>
 					</MkSwitch>
+
 					<MkRange v-model="role.policies.canAdvancedSearchNotes.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
+
 						<template #label>{{ i18n.ts._role.priority }}</template>
 					</MkRange>
 				</div>

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
@@ -47,6 +47,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 			</div>
+
+			<!-- ファイル付き検索のみ -->
+
+			<div class="_gaps_m">
+				<MkFolder :defaultOpen="true">
+					<template #label>{{ i18n.ts.fileAttachedOnly }}</template>
+					<template v-if="isfileOnly" #suffix></template>
+
+					<div style="text-align: center;" class="_gaps">
+						<div>
+							<MkRadios v-model="isfileOnly" @update:modelValue="search()">
+								<option value="combined">{{ i18n.ts._advancedSearch._fileOption.combined }}</option>
+								<option value="file-only">{{ i18n.ts._advancedSearch._fileOption.fileAttachedOnly }}</option>
+								<option value="no-file">{{ i18n.ts._advancedSearch._fileOption.noFile }}</option>
+							</MkRadios>
+						</div>
+					</div>
+				</MkFolder>
+			</div>
 		</MkFolder>
 		<div>
 			<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>