mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-27 19:13:08 +02:00
fix(client): カスタム絵文字にアニメーション画像を再生しない設定が適用されていない問題を修正
This commit is contained in:
parent
0d148bd23b
commit
d78e15cc1a
2 changed files with 16 additions and 9 deletions
|
@ -18,6 +18,9 @@ You should also include the user name that made the change.
|
|||
### Improvements
|
||||
- ロールで広告の非表示が有効になっている場合は最初から広告を非表示にするように
|
||||
|
||||
### Bugfixes
|
||||
- Client: カスタム絵文字にアニメーション画像を再生しない設定が適用されていない問題を修正
|
||||
|
||||
## 13.2.6 (2023/02/01)
|
||||
### Changes
|
||||
- docker-compose.ymlをdocker-compose.yml.exampleにしました。docker-compose.ymlとしてコピーしてから使用してください。
|
||||
|
|
|
@ -18,19 +18,23 @@ const props = defineProps<{
|
|||
}>();
|
||||
|
||||
const customEmojiName = computed(() => (props.name[0] === ':' ? props.name.substr(1, props.name.length - 2) : props.name).replace('@.', ''));
|
||||
const url = computed(() => {
|
||||
|
||||
const rawUrl = computed(() => {
|
||||
if (props.url) {
|
||||
return props.url;
|
||||
} else if (props.host == null && !customEmojiName.value.includes('@')) {
|
||||
const found = customEmojis.value.find(x => x.name === customEmojiName.value);
|
||||
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
|
||||
? getStaticImageUrl(rawUrl)
|
||||
: rawUrl;
|
||||
}
|
||||
if (props.host == null && !customEmojiName.value.includes('@')) {
|
||||
return customEmojis.value.find(x => x.name === customEmojiName.value)?.url || null;
|
||||
}
|
||||
return props.host ? `/emoji/${customEmojiName.value}@${props.host}.webp` : `/emoji/${customEmojiName.value}.webp`;
|
||||
});
|
||||
|
||||
const url = computed(() =>
|
||||
defaultStore.reactiveState.disableShowingAnimatedImages.value && rawUrl.value
|
||||
? getStaticImageUrl(rawUrl.value)
|
||||
: rawUrl.value
|
||||
);
|
||||
|
||||
const alt = computed(() => `:${customEmojiName.value}:`);
|
||||
let errored = $ref(url.value == null);
|
||||
</script>
|
||||
|
|
Loading…
Reference in a new issue