From 5bdae9f6d03bbb1fc1cf341b2e6b3e5d15d03fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 26 Nov 2023 13:04:44 +0900 Subject: [PATCH] =?UTF-8?q?enhance(frontend):=20=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E9=81=B8=E6=8A=9E=E6=99=82?= =?UTF-8?q?=E3=81=AB=E9=9F=B3=E3=82=92=E6=B5=81=E3=81=9B=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=20(#12441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (add) リアクション選択時に音を鳴らせるように * Update Changelog * tweak sound * tweak sound --------- Co-authored-by: syuilo --- CHANGELOG.md | 1 + locales/index.d.ts | 1 + locales/ja-JP.yml | 1 + .../frontend/assets/sounds/syuilo/bubble1.mp3 | Bin 0 -> 19328 bytes .../frontend/assets/sounds/syuilo/bubble2.mp3 | Bin 0 -> 19328 bytes packages/frontend/src/components/MkNote.vue | 5 +++++ .../frontend/src/components/MkNoteDetailed.vue | 5 +++++ .../components/MkReactionsViewer.reaction.vue | 7 +++++++ packages/frontend/src/pages/settings/sounds.vue | 3 ++- packages/frontend/src/scripts/sound.ts | 4 +++- packages/frontend/src/store.ts | 4 ++++ 11 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 packages/frontend/assets/sounds/syuilo/bubble1.mp3 create mode 100644 packages/frontend/assets/sounds/syuilo/bubble2.mp3 diff --git a/CHANGELOG.md b/CHANGELOG.md index fdf6709117..7f02d462b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ### Client - Enhance: 絵文字のオートコンプリート機能強化 #12364 - Enhance: ユーザーのRawデータを表示するページが復活 +- Enhance: リアクション選択時に音を鳴らせるように - fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正 - Fix: ウィジェットのジョブキューにて音声の発音方法変更に追従できていなかったのを修正 #12367 - Fix: コードエディタが正しく表示されない問題を修正 diff --git a/locales/index.d.ts b/locales/index.d.ts index 042c7750e1..6e9fe311f1 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1943,6 +1943,7 @@ export interface Locale { "notification": string; "antenna": string; "channel": string; + "reaction": string; }; "_ago": { "future": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 58e0dd0b19..0b051b6190 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1848,6 +1848,7 @@ _sfx: notification: "通知" antenna: "アンテナ受信" channel: "チャンネル通知" + reaction: "リアクション選択時" _ago: future: "未来" diff --git a/packages/frontend/assets/sounds/syuilo/bubble1.mp3 b/packages/frontend/assets/sounds/syuilo/bubble1.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..05b8ef8b10056c66a6e1a9b401d86530ecdc3296 GIT binary patch literal 19328 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 DcMQD( literal 0 HcmV?d00001 diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 6349df2e30..d047495dc9 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -163,6 +163,7 @@ import { focusPrev, focusNext } from '@/scripts/focus.js'; import { checkWordMute } from '@/scripts/check-word-mute.js'; import { userPage } from '@/filters/user.js'; import * as os from '@/os.js'; +import * as sound from '@/scripts/sound.js'; import { defaultStore, noteViewInterruptors } from '@/store.js'; import { reactionPicker } from '@/scripts/reaction-picker.js'; import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; @@ -336,6 +337,8 @@ function react(viaKeyboard = false): void { pleaseLogin(); showMovedDialog(); if (appearNote.reactionAcceptance === 'likeOnly') { + sound.play('reaction'); + if (props.mock) { return; } @@ -354,6 +357,8 @@ function react(viaKeyboard = false): void { } else { blur(); reactionPicker.show(reactButton.value, reaction => { + sound.play('reaction'); + if (props.mock) { emit('reaction', reaction); return; diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index d1bc3f676f..d8089ac36f 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -210,6 +210,7 @@ import { checkWordMute } from '@/scripts/check-word-mute.js'; import { userPage } from '@/filters/user.js'; import { notePage } from '@/filters/note.js'; import * as os from '@/os.js'; +import * as sound from '@/scripts/sound.js'; import { defaultStore, noteViewInterruptors } from '@/store.js'; import { reactionPicker } from '@/scripts/reaction-picker.js'; import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; @@ -369,6 +370,8 @@ function react(viaKeyboard = false): void { pleaseLogin(); showMovedDialog(); if (appearNote.reactionAcceptance === 'likeOnly') { + sound.play('reaction'); + os.api('notes/reactions/create', { noteId: appearNote.id, reaction: '❤️', @@ -383,6 +386,8 @@ function react(viaKeyboard = false): void { } else { blur(); reactionPicker.show(reactButton.value, reaction => { + sound.play('reaction'); + os.api('notes/reactions/create', { noteId: appearNote.id, reaction: reaction, diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index 9a107c3674..65a5c2374e 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -28,6 +28,7 @@ import MkReactionEffect from '@/components/MkReactionEffect.vue'; import { claimAchievement } from '@/scripts/achievements.js'; import { defaultStore } from '@/store.js'; import { i18n } from '@/i18n.js'; +import * as sound from '@/scripts/sound.js'; const props = defineProps<{ reaction: string; @@ -59,6 +60,10 @@ async function toggleReaction() { }); if (confirm.canceled) return; + if (oldReaction !== props.reaction) { + sound.play('reaction'); + } + if (mock) { emit('reactionToggled', props.reaction, (props.count - 1)); return; @@ -75,6 +80,8 @@ async function toggleReaction() { } }); } else { + sound.play('reaction'); + if (mock) { emit('reactionToggled', props.reaction, (props.count + 1)); return; diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue index cd1707a594..244bb1e0e2 100644 --- a/packages/frontend/src/pages/settings/sounds.vue +++ b/packages/frontend/src/pages/settings/sounds.vue @@ -38,7 +38,7 @@ import { defaultStore } from '@/store.js'; const masterVolume = computed(defaultStore.makeGetterSetter('sound_masterVolume')); -const soundsKeys = ['note', 'noteMy', 'notification', 'antenna', 'channel'] as const; +const soundsKeys = ['note', 'noteMy', 'notification', 'antenna', 'channel', 'reaction'] as const; const sounds = ref>>({ note: defaultStore.reactiveState.sound_note, @@ -46,6 +46,7 @@ const sounds = ref>>({ notification: defaultStore.reactiveState.sound_notification, antenna: defaultStore.reactiveState.sound_antenna, channel: defaultStore.reactiveState.sound_channel, + reaction: defaultStore.reactiveState.sound_reaction, }); async function updated(type: keyof typeof sounds.value, sound) { diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts index 2b604bd98a..4d7ef9bdee 100644 --- a/packages/frontend/src/scripts/sound.ts +++ b/packages/frontend/src/scripts/sound.ts @@ -38,6 +38,8 @@ export const soundsTypes = [ 'syuilo/waon', 'syuilo/popo', 'syuilo/triple', + 'syuilo/bubble1', + 'syuilo/bubble2', 'syuilo/poi1', 'syuilo/poi2', 'syuilo/pirori', @@ -77,7 +79,7 @@ export async function loadAudio(file: string, useCache = true) { return audioBuffer; } -export function play(type: 'noteMy' | 'note' | 'antenna' | 'channel' | 'notification') { +export function play(type: 'noteMy' | 'note' | 'antenna' | 'channel' | 'notification' | 'reaction') { const sound = defaultStore.state[`sound_${type}`]; if (_DEV_) console.log('play', type, sound); if (sound.type == null) return; diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 12660e9e8d..f2ed4e7c0b 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -411,6 +411,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'device', default: { type: 'syuilo/square-pico', volume: 1 }, }, + sound_reaction: { + where: 'device', + default: { type: 'syuilo/bubble2', volume: 1 }, + }, })); // TODO: 他のタブと永続化されたstateを同期