From 961ed969dbfd439b951e20a22b92b8626bcc9a5b Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 6 Nov 2018 03:57:02 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=A7=E3=81=AE=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E7=B5=B5?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/common/views/components/misskey-flavored-markdown.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 } })]; }