From 6670c72f8bfd9cd1c076fe85acdf126fb132d026 Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 26 Jan 2023 08:46:21 +0000 Subject: fix(client): note reacted reflection failed Fix #9730 --- packages/frontend/src/scripts/use-note-capture.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packages/frontend/src/scripts') diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts index 389ee12561..ffe33cccc0 100644 --- a/packages/frontend/src/scripts/use-note-capture.ts +++ b/packages/frontend/src/scripts/use-note-capture.ts @@ -20,11 +20,8 @@ export function useNoteCapture(props: { case 'reacted': { const reaction = body.reaction; - if (body.emoji) { - const emojis = note.value.emojis || []; - if (!emojis.includes(body.emoji)) { - note.value.emojis = [...emojis, body.emoji]; - } + if (body.emoji && !(body.emoji.name in note.value.reactionEmojis)) { + note.value.reactionEmojis[body.emoji.name] = body.emoji.url; } // TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる -- cgit v1.2.3-freya From 67d64c936506aa43760fe696d78d5cb60d17a61c Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 27 Jan 2023 11:16:22 +0900 Subject: refactor --- packages/frontend/src/scripts/device-kind.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/frontend/src/scripts') diff --git a/packages/frontend/src/scripts/device-kind.ts b/packages/frontend/src/scripts/device-kind.ts index 544cac0604..6bb349c554 100644 --- a/packages/frontend/src/scripts/device-kind.ts +++ b/packages/frontend/src/scripts/device-kind.ts @@ -4,7 +4,7 @@ const ua = navigator.userAgent.toLowerCase(); const isTablet = /ipad/.test(ua) || (/mobile|iphone|android/.test(ua) && window.innerWidth > 700); const isSmartphone = !isTablet && /mobile|iphone|android/.test(ua); -export const deviceKind = defaultStore.state.overridedDeviceKind ? defaultStore.state.overridedDeviceKind +export const deviceKind: 'smartphone' | 'tablet' | 'desktop' = defaultStore.state.overridedDeviceKind ? defaultStore.state.overridedDeviceKind : isSmartphone ? 'smartphone' : isTablet ? 'tablet' : 'desktop'; -- cgit v1.2.3-freya