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

Merge branch 'develop' into emoji-re

Browse source
This commit is contained in:
tamaina 2023-01-25 14:22:26 +00:00
commit 605b0f27e4
55 changed files with 824 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/global/MkEmoji.vue
View file

@ -33,7 +33,7 @@ const url = computed(() => {
return char2path(char.value);
} else if (props.host == null && !customEmojiName.value.includes('@')) {
const found = customEmojis.value.find(x => x.name === customEmojiName.value);
return found ? found.url : null;
return found ? defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(found.url) : found.url : null;
} else {
const rawUrl = props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
return defaultStore.state.disableShowingAnimatedImages