Merge branch 'develop'
This commit is contained in:
commit
1217d6fbb4
@ -9,6 +9,11 @@
|
|||||||
You should also include the user name that made the change.
|
You should also include the user name that made the change.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
## 13.1.2 (2023/01/22)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- Client: リアクションのカスタム絵文字の表示の問題を修正
|
||||||
|
|
||||||
## 13.1.1 (2023/01/22)
|
## 13.1.1 (2023/01/22)
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "13.1.0",
|
"version": "13.1.2",
|
||||||
"codename": "nasubi",
|
"codename": "nasubi",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -25,7 +25,7 @@ const props = defineProps<{
|
|||||||
const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
|
const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath;
|
||||||
|
|
||||||
const isCustom = computed(() => props.emoji.startsWith(':'));
|
const isCustom = computed(() => props.emoji.startsWith(':'));
|
||||||
const customEmojiName = props.emoji.substr(1, props.emoji.length - 2);
|
const customEmojiName = props.emoji.substr(1, props.emoji.length - 2).replace('@.', '');
|
||||||
const char = computed(() => isCustom.value ? undefined : props.emoji);
|
const char = computed(() => isCustom.value ? undefined : props.emoji);
|
||||||
const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native' && !props.isReaction);
|
const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'native' && !props.isReaction);
|
||||||
const url = computed(() => {
|
const url = computed(() => {
|
||||||
@ -35,7 +35,7 @@ const url = computed(() => {
|
|||||||
const found = customEmojis.find(x => x.name === customEmojiName);
|
const found = customEmojis.find(x => x.name === customEmojiName);
|
||||||
return found ? found.url : null;
|
return found ? found.url : null;
|
||||||
} else {
|
} else {
|
||||||
const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`;
|
const rawUrl = `/emoji/${customEmojiName}@${props.host}.webp`;
|
||||||
return defaultStore.state.disableShowingAnimatedImages
|
return defaultStore.state.disableShowingAnimatedImages
|
||||||
? getStaticImageUrl(rawUrl)
|
? getStaticImageUrl(rawUrl)
|
||||||
: rawUrl;
|
: rawUrl;
|
||||||
|
Loading…
Reference in New Issue
Block a user