misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge: fix reaction sound in NoteSub - fixes #1224 (!1246)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1246

Closes #1224

Approved-by: bunnybeam <mailbunnybeam@gmail.com>
Approved-by: Tess K <me@thvxl.se>
This commit is contained in:
dakkar 2025-12-17 12:12:11 +00:00
commit 34525cfb8e
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/frontend/src/components/MkNoteSub.vue
View file

@ -202,8 +202,9 @@ async function reply(viaKeyboard = false): Promise<void> {
function react(): void {
pleaseLogin({ openOnRemote: pleaseLoginContext.value });
showMovedDialog();
sound.playMisskeySfx('reaction');
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
@ -219,7 +220,18 @@ function react(): void {
}
} else {
blur();
reactionPicker.show(reactButton.value ?? null, appearNote.value, reaction => {
reactionPicker.show(reactButton.value ?? null, note.value, async (reaction) => {
if (prefer.s.confirmOnReact) {
const confirm = await os.confirm({
type: 'question',
text: i18n.tsx.reactAreYouSure({ emoji: reaction.replace('@.', '') }),
});
if (confirm.canceled) return;
}
sound.playMisskeySfx('reaction');
misskeyApi('notes/reactions/create', {
noteId: appearNote.value.id,
reaction: reaction,

16
packages/frontend/src/components/SkNoteSub.vue
View file

@ -219,8 +219,9 @@ async function reply(viaKeyboard = false): Promise<void> {
function react(): void {
pleaseLogin({ openOnRemote: pleaseLoginContext.value });
showMovedDialog();
sound.playMisskeySfx('reaction');
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
@ -236,7 +237,18 @@ function react(): void {
}
} else {
blur();
reactionPicker.show(reactButton.value ?? null, appearNote.value, reaction => {
reactionPicker.show(reactButton.value ?? null, note.value, async (reaction) => {
if (prefer.s.confirmOnReact) {
const confirm = await os.confirm({
type: 'question',
text: i18n.tsx.reactAreYouSure({ emoji: reaction.replace('@.', '') }),
});
if (confirm.canceled) return;
}
sound.playMisskeySfx('reaction');
misskeyApi('notes/reactions/create', {
noteId: appearNote.value.id,
reaction: reaction,