diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-10-23 11:04:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-23 11:04:27 +0900 |
| commit | d203e1a446898bb867705d4191507f1fa196fa88 (patch) | |
| tree | 3454103198f3103096ca8dff7d6cb6b159b1f2c7 /packages/frontend/src/components/MkReactionsViewer.reaction.vue | |
| parent | Bump version to 2025.10.1-beta.2 (diff) | |
| download | misskey-d203e1a446898bb867705d4191507f1fa196fa88.tar.gz misskey-d203e1a446898bb867705d4191507f1fa196fa88.tar.bz2 misskey-d203e1a446898bb867705d4191507f1fa196fa88.zip | |
refactor(frontend): フロントエンドの型エラー解消 (#16694)
Diffstat (limited to 'packages/frontend/src/components/MkReactionsViewer.reaction.vue')
| -rw-r--r-- | packages/frontend/src/components/MkReactionsViewer.reaction.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index d96f0e2420..7c60288883 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, inject, onMounted, useTemplateRef, watch } from 'vue'; import * as Misskey from 'misskey-js'; -import { getUnicodeEmoji } from '@@/js/emojilist.js'; +import { getUnicodeEmojiOrNull } from '@@/js/emojilist.js'; import MkCustomEmojiDetailedDialog from './MkCustomEmojiDetailedDialog.vue'; import type { MenuItem } from '@/types/menu'; import XDetails from '@/components/MkReactionsViewer.details.vue'; @@ -60,11 +60,11 @@ const buttonEl = useTemplateRef('buttonEl'); const emojiName = computed(() => props.reaction.replace(/:/g, '').replace(/@\./, '')); const canToggle = computed(() => { - const emoji = customEmojisMap.get(emojiName.value) ?? getUnicodeEmoji(props.reaction); + const emoji = customEmojisMap.get(emojiName.value) ?? getUnicodeEmojiOrNull(props.reaction); // TODO //return !props.reaction.match(/@\w/) && $i && emoji && checkReactionPermissions($i, props.note, emoji); - return !props.reaction.match(/@\w/) && $i && emoji; + return props.reaction.match(/@\w/) == null && $i != null && emoji != null; }); const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':')); const isLocalCustomEmoji = props.reaction[0] === ':' && props.reaction.includes('@.'); |