enhance(frontend): リアクションの受け入れ設定にキャプションを追加 (#16807)

* enhance(frontend): リアクションの受け入れ設定にキャプションを追加

* Update Changelog

* CHANGELOG.mdを修正

* CHANGELOG.mdのコンフリクトを解消し、再度変更内容を記載

* 条件分岐をswitch文に変更

* chore: trigger CI re-run
This commit is contained in:
kami8 2025-11-19 19:17:43 +09:00 committed by GitHub
parent 2f3421645a
commit 9f810d701d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 6 deletions

View File

@ -4,12 +4,11 @@
- -
### Client ### Client
- - Enhance: リアクションの受け入れ設定にキャプションを追加 #15921
### Server ### Server
- -
## 2025.11.0 ## 2025.11.0
### General ### General

View File

@ -608,11 +608,30 @@ async function toggleReactionAcceptance() {
//#region popup //#region popup
function showOtherSettings() { function showOtherSettings() {
let reactionAcceptanceIcon = 'ti ti-icons'; let reactionAcceptanceIcon = 'ti ti-icons';
let reactionAcceptanceCaption = '';
if (reactionAcceptance.value === 'likeOnly') { switch (reactionAcceptance.value) {
reactionAcceptanceIcon = 'ti ti-heart _love'; case 'likeOnly':
} else if (reactionAcceptance.value === 'likeOnlyForRemote') { reactionAcceptanceIcon = 'ti ti-heart _love';
reactionAcceptanceIcon = 'ti ti-heart-plus'; reactionAcceptanceCaption = i18n.ts.likeOnly;
break;
case 'likeOnlyForRemote':
reactionAcceptanceIcon = 'ti ti-heart-plus';
reactionAcceptanceCaption = i18n.ts.likeOnlyForRemote;
break;
case 'nonSensitiveOnly':
reactionAcceptanceCaption = i18n.ts.nonSensitiveOnly;
break;
case 'nonSensitiveOnlyForLocalLikeOnlyForRemote':
reactionAcceptanceCaption = i18n.ts.nonSensitiveOnlyForLocalLikeOnlyForRemote;
break;
default:
reactionAcceptanceCaption = i18n.ts.all;
break;
} }
const menuItems = [{ const menuItems = [{
@ -624,6 +643,7 @@ function showOtherSettings() {
}, { type: 'divider' }, { }, { type: 'divider' }, {
icon: reactionAcceptanceIcon, icon: reactionAcceptanceIcon,
text: i18n.ts.reactionAcceptance, text: i18n.ts.reactionAcceptance,
caption: reactionAcceptanceCaption,
action: () => { action: () => {
toggleReactionAcceptance(); toggleReactionAcceptance();
}, },