From c9112b29499f50d975a9d6e6e7811ac0e3b22706 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Tue, 28 Nov 2023 17:49:50 +0100 Subject: [PATCH] upd: use `null` as default on user like setting --- packages/frontend/src/components/MkNote.vue | 2 +- packages/frontend/src/components/MkNoteDetailed.vue | 2 +- packages/frontend/src/components/MkNoteSub.vue | 2 +- packages/frontend/src/pages/settings/reaction.vue | 7 ++++--- packages/frontend/src/store.ts | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 80fd4fc45c..108e78eb07 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -288,7 +288,7 @@ const translating = ref(false); const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || (appearNote.visibility === 'followers' && appearNote.userId === $i.id)); let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId || $i.id === appearNote.userId)) || (appearNote.myReaction != null))); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); +const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null); const keymap = { 'r': () => reply(true), diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index fba81f58be..8fbf6f30a7 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -323,7 +323,7 @@ const conversation = ref([]); const replies = ref([]); const quotes = ref([]); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); +const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null); watch(() => props.expandAllCws, (expandAllCws) => { if (expandAllCws !== showContent.value) showContent.value = expandAllCws; diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index f61fc608d9..f9d1767ee5 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -133,7 +133,7 @@ const menuButton = shallowRef(); const likeButton = shallowRef(); let appearNote = $computed(() => isRenote ? props.note.renote as Misskey.entities.Note : props.note); -const defaultLike = computed(() => defaultStore.state.like !== '❤️' ? defaultStore.state.like : null); +const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null); const isRenote = ( props.note.renote != null && diff --git a/packages/frontend/src/pages/settings/reaction.vue b/packages/frontend/src/pages/settings/reaction.vue index 74d1b108ee..9dd5ee9eeb 100644 --- a/packages/frontend/src/pages/settings/reaction.vue +++ b/packages/frontend/src/pages/settings/reaction.vue @@ -25,8 +25,9 @@ SPDX-License-Identifier: AGPL-3.0-only - - + + + Not Set
Change Reset @@ -140,7 +141,7 @@ function chooseNewLike(ev: MouseEvent) { } function resetLike() { - defaultStore.set('like', '❤️'); + defaultStore.set('like', null); } watch($$(reactions), () => { diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index a655d3542b..b4c48620b0 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -112,7 +112,7 @@ export const defaultStore = markRaw(new Storage('base', { }, like: { where: 'account', - default: '❤️', + default: null as string | null, }, mutedAds: { where: 'account',