diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-27 11:44:14 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-27 11:44:14 +0900 |
| commit | f4bee24ccf7fd1ceaf9184a6d6dd62d4a285f812 (patch) | |
| tree | 19ae57b7388a7a9d87851ccadd0cd1c29d7c0709 /packages/frontend/src/scripts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 13.2.4 (diff) | |
| download | misskey-f4bee24ccf7fd1ceaf9184a6d6dd62d4a285f812.tar.gz misskey-f4bee24ccf7fd1ceaf9184a6d6dd62d4a285f812.tar.bz2 misskey-f4bee24ccf7fd1ceaf9184a6d6dd62d4a285f812.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/device-kind.ts | 2 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/use-note-capture.ts | 7 |
2 files changed, 3 insertions, 6 deletions
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'; 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プロパティがない場合ってあったっけ？ なければ || {} は消せる |