oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

fix(frontend): MkEmojiPickerとMkReactionsViewerで一部のUnicode絵文字を正常に扱えない問題を修正 (MisskeyIO#488)

Browse source 
This reverts commit e3dd3f6b63 partially.
This commit is contained in:
まっちゃとーにゅ 2024-02-27 23:56:50 +09:00 • committed by GitHub
parent 9fe29b5e8e
commit d0d94b00d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/frontend/src/components/MkReactionsViewer.reaction.vue
View file

@ -34,7 +34,6 @@ import { i18n } from '@/i18n.js';
import * as sound from '@/scripts/sound.js';
import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js';
import { customEmojisMap } from '@/custom-emojis.js';
import { unicodeEmojisMap } from '@/scripts/emojilist.js';
const props = defineProps<{
reaction: string;
@ -45,19 +44,24 @@ const props = defineProps<{
const mock = inject<boolean>('mock', false);
const emit = defineEmits<{
(ev: 'reactionToggled', emoji: string, newCount: number): void;
}>();
const emit = defineEmits<
(ev: 'reactionToggled', emoji: string, newCount: number) => void
>();
const buttonEl = shallowRef<HTMLElement>();
const remoteReactionRegExp = /@\w/;
const isCustomEmoji = computed(() => props.reaction.includes(':'));
const emojiName = computed(() => props.reaction.replace(/:/g, '').replace(/@\./, ''));
const emoji = computed(() => customEmojisMap.get(emojiName.value) ?? unicodeEmojisMap.get(props.reaction));
const emoji = computed(() => isCustomEmoji.value ? customEmojisMap.get(emojiName.value) : null);
const canToggle = computed(() => {
return !props.reaction.match(/@\w/) && $i && emoji.value && checkReactionPermissions($i, props.note, emoji.value);
return !RegExp(remoteReactionRegExp).exec(props.reaction) && $i && (
!isCustomEmoji.value
|| (emoji.value && checkReactionPermissions($i, props.note, emoji.value))
);
});
const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':'));
const canGetInfo = computed(() => !RegExp(remoteReactionRegExp).exec(props.reaction) && props.reaction.includes(':'));
async function toggleReaction() {
if (!canToggle.value) return;