diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/misskey-flavored-markdown.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts index 2a0a2b6f67..1f82fb8f45 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.ts +++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts @@ -187,13 +187,14 @@ export default Vue.component('misskey-flavored-markdown', { } case 'emoji': { + const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis || []; return [createElement('mk-emoji', { attrs: { emoji: token.emoji, name: token.name }, props: { - customEmojis: this.customEmojis + customEmojis: this.customEmojis || customEmojis } })]; } |