kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

merge: upstream

Browse Source
This commit is contained in:
Marie
2024-01-09 10:35:10 +01:00
parent fbddcc559a 14aedc17ae
commit d974b30e56
23 changed files with 325 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/components/MkNote.vue
+3 -3
View File
@@ -563,7 +563,7 @@ function reply(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
return;
}
@@ -584,7 +584,7 @@ function react(viaKeyboard = false): void {
pleaseLogin();
showMovedDialog();
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
return;
@@ -604,7 +604,7 @@ function react(viaKeyboard = false): void {
} else {
blur();
reactionPicker.show(reactButton.value, reaction => {
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
emit('reaction', reaction);
packages/frontend/src/components/MkNoteDetailed.vue
+4 -2
View File
@@ -597,6 +597,8 @@ function react(viaKeyboard = false): void {
pleaseLogin();
showMovedDialog();
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
@@ -611,7 +613,7 @@ function react(viaKeyboard = false): void {
} else {
blur();
reactionPicker.show(reactButton.value, reaction => {
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/reactions/create', {
noteId: appearNote.value.id,
@@ -629,7 +631,7 @@ function react(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
packages/frontend/src/components/MkNoteSub.vue
+2 -2
View File
@@ -195,7 +195,7 @@ function reply(viaKeyboard = false): void {
function react(viaKeyboard = false): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.note.reactionAcceptance === 'likeOnly') {
misskeyApi('notes/like', {
noteId: props.note.id,
@@ -227,7 +227,7 @@ function react(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: props.note.id,
override: defaultLike.value,
packages/frontend/src/components/MkRange.vue
+2
View File
@@ -43,6 +43,7 @@ const props = withDefaults(defineProps<{
const emit = defineEmits<{
(ev: 'update:modelValue', value: number): void;
(ev: 'dragEnded', value: number): void;
}>();
const containerEl = shallowRef<HTMLElement>();
@@ -143,6 +144,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
// 値が変わってたら通知
if (beforeValue !== finalValue.value) {
emit('update:modelValue', finalValue.value);
emit('dragEnded', finalValue.value);
}
};
packages/frontend/src/components/MkReactionsViewer.reaction.vue
+2 -2
View File
@@ -62,7 +62,7 @@ async function toggleReaction() {
if (confirm.canceled) return;
if (oldReaction !== props.reaction) {
sound.play('reaction');
sound.playMisskeySfx('reaction');
}
if (mock) {
@@ -81,7 +81,7 @@ async function toggleReaction() {
}
});
} else {
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (mock) {
emit('reactionToggled', props.reaction, (props.count + 1));
packages/frontend/src/components/MkTimeline.vue
+1 -1
View File
@@ -84,7 +84,7 @@ function prepend(note) {
emit('note');
if (props.sound) {
sound.play($i && (note.userId === $i.id) ? 'noteMy' : 'note');
sound.playMisskeySfx($i && (note.userId === $i.id) ? 'noteMy' : 'note');
}
}
packages/frontend/src/components/SkNote.vue
+3 -3
View File
@@ -564,7 +564,7 @@ function reply(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
return;
}
@@ -585,7 +585,7 @@ function react(viaKeyboard = false): void {
pleaseLogin();
showMovedDialog();
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
return;
@@ -605,7 +605,7 @@ function react(viaKeyboard = false): void {
} else {
blur();
reactionPicker.show(reactButton.value, reaction => {
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.mock) {
emit('reaction', reaction);
packages/frontend/src/components/SkNoteDetailed.vue
+2 -2
View File
@@ -620,7 +620,7 @@ function react(viaKeyboard = false): void {
} else {
blur();
reactionPicker.show(reactButton.value, reaction => {
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/reactions/create', {
noteId: appearNote.value.id,
@@ -638,7 +638,7 @@ function react(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
packages/frontend/src/components/SkNoteSub.vue
+2 -2
View File
@@ -204,7 +204,7 @@ function reply(viaKeyboard = false): void {
function react(viaKeyboard = false): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
if (props.note.reactionAcceptance === 'likeOnly') {
misskeyApi('notes/like', {
noteId: props.note.id,
@@ -236,7 +236,7 @@ function react(viaKeyboard = false): void {
function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
sound.playMisskeySfx('reaction');
misskeyApi('notes/like', {
noteId: props.note.id,
override: defaultLike.value,
packages/frontend/src/components/global/MkCustomEmoji.vue
+1 -1
View File
@@ -91,7 +91,7 @@ function onClick(ev: MouseEvent) {
icon: 'ph-smiley ph-bold ph-lg',
action: () => {
react(`:${props.name}:`);
sound.play('reaction');
sound.playMisskeySfx('reaction');
},
}] : [])], ev.currentTarget ?? ev.target);
}
packages/frontend/src/components/global/MkEmoji.vue
+1 -1
View File
@@ -55,7 +55,7 @@ function onClick(ev: MouseEvent) {
icon: 'ph-smiley ph-bold ph-lg',
action: () => {
react(props.emoji);
sound.play('reaction');
sound.playMisskeySfx('reaction');
},
}] : [])], ev.currentTarget ?? ev.target);
}