From f87483feb7e52968fab37eee74546d10cbe39e52 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 21 Jan 2024 12:37:41 +0000
Subject: [PATCH] align Sk & Mk variants of components
some whitespace, some types, a missing sound, and a probably wrong API
URL
---
packages/frontend/src/components/MkNote.vue | 2 +-
.../frontend/src/components/MkNoteDetailed.vue | 14 +++++++-------
packages/frontend/src/components/MkNoteSub.vue | 14 +++++++-------
packages/frontend/src/components/SkNote.vue | 2 +-
.../frontend/src/components/SkNoteDetailed.vue | 6 ++++--
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index e16d3c3c0d..f701e4eada 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -606,7 +606,7 @@ function react(viaKeyboard = false): void {
return;
}
- misskeyApi('notes/reactions/create', {
+ misskeyApi('notes/like', {
noteId: appearNote.value.id,
override: defaultLike.value,
});
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 0d972c9170..fa27fa8c92 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -374,16 +374,16 @@ const reactionsPagination = computed(() => ({
}));
async function addReplyTo(replyNote: Misskey.entities.Note) {
- replies.value.unshift(replyNote);
- appearNote.value.repliesCount += 1;
+ replies.value.unshift(replyNote);
+ appearNote.value.repliesCount += 1;
}
async function removeReply(id: Misskey.entities.Note['id']) {
- const replyIdx = replies.value.findIndex(note => note.id === id);
- if (replyIdx >= 0) {
- replies.value.splice(replyIdx, 1);
- appearNote.value.repliesCount -= 1;
- }
+ const replyIdx = replies.value.findIndex(note => note.id === id);
+ if (replyIdx >= 0) {
+ replies.value.splice(replyIdx, 1);
+ appearNote.value.repliesCount -= 1;
+ }
}
useNoteCapture({
diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index fbc7a7f9ea..6deb1b855d 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -145,16 +145,16 @@ const isRenote = (
);
async function addReplyTo(replyNote: Misskey.entities.Note) {
- replies.value.unshift(replyNote);
- appearNote.value.repliesCount += 1;
+ replies.value.unshift(replyNote);
+ appearNote.value.repliesCount += 1;
}
async function removeReply(id: Misskey.entities.Note['id']) {
- const replyIdx = replies.value.findIndex(note => note.id === id);
- if (replyIdx >= 0) {
- replies.value.splice(replyIdx, 1);
- appearNote.value.repliesCount -= 1;
- }
+ const replyIdx = replies.value.findIndex(note => note.id === id);
+ if (replyIdx >= 0) {
+ replies.value.splice(replyIdx, 1);
+ appearNote.value.repliesCount -= 1;
+ }
}
useNoteCapture({
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index c9ac4c11c0..072a938d61 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -299,7 +299,7 @@ const isDeleted = ref(false);
const renoted = ref(false);
const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
-const translation = ref<any>(null);
+const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
const translating = ref(false);
const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i.id));
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index f3a835b0ee..c4af5ae2ac 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -319,7 +319,7 @@ const showContent = ref(defaultStore.state.uncollapseCW);
const isDeleted = ref(false);
const renoted = ref(false);
const muted = ref($i ? checkWordMute(appearNote.value, $i, $i.mutedWords) : false);
-const translation = ref(null);
+const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
const translating = ref(false);
const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null;
const urls = parsed ? extractUrlFromMfm(parsed).filter(u => u !== renoteUrl && u !== renoteUri) : null;
@@ -363,7 +363,7 @@ provide('react', (reaction: string) => {
});
const tab = ref('replies');
-const reactionTabType = ref(null);
+const reactionTabType = ref<string | null>(null);
const renotesPagination = computed(() => ({
endpoint: 'notes/renotes',
@@ -606,6 +606,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,