sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
こけっち 2022-09-18 14:06:47 +09:00
parent 167a7201c2
commit e0cea2facc
No known key found for this signature in database
GPG Key ID: 21460619C5FC4DD1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/global/MkEmoji.vue
View File

@ -39,7 +39,7 @@ const url = computed(() => {
const alt = computed(() => customEmoji.value ? `:${customEmoji.value.name}:` : char.value); const alt = computed(() => customEmoji.value ? `:${customEmoji.value.name}:` : char.value);
const onContextmenu = (e: MouseEvent) => { const onContextmenu = (e: MouseEvent) => {
openReactionImportMenu(e, props.emoji); openReactionImportMenu(e, customEmoji.value?.id ?? props.emoji);
}; };
</script> </script>

6
packages/client/src/scripts/reactionImportMenu.ts
View File

@ -90,7 +90,7 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string) {
}); });
}, },
}]; }];
const emojiId = await getEmojiId(reaction); const emojiId = await getEmojiId(reaction)? await getEmojiId(reaction) : reaction;
if (reaction.startsWith(':') && emojiId) { if (reaction.startsWith(':') && emojiId) {
menuItems.push({ menuItems.push({
type: 'button', type: 'button',
@ -99,7 +99,9 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string) {
action: async () => { action: async () => {
const duplication: boolean = await os.api('meta').then(meta => { const duplication: boolean = await os.api('meta').then(meta => {
const emojis = meta.emojis; const emojis = meta.emojis;
return emojis.some(emoji => emoji.name === reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]); return emojis.some((emoji) => {
return (emoji.name === reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]);
});
}); });
console.log(await duplication); console.log(await duplication);