From 895cf53ee1fda2a5322505d4b106590ae78af6f9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 1 Nov 2018 18:05:14 +0900 Subject: [PATCH] Fix bug --- src/client/app/common/views/components/autocomplete.vue | 2 +- .../app/common/views/components/misskey-flavored-markdown.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index d46d53665..ea91655b2 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -172,7 +172,7 @@ export default Vue.extend({ const matched = []; const max = 30; - const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis; + const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis || []; customEmojis.some(x => { if (x.name.startsWith(this.q)) matched.push({ name: x.name, 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 c45bb1022..6397767ce 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.ts +++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts @@ -186,7 +186,7 @@ export default Vue.component('misskey-flavored-markdown', { case 'emoji': { //#region カスタム絵文字 - const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis; + const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis || []; const customEmoji = customEmojis.find(e => e.name == token.emoji || (e.aliases || []).includes(token.emoji)); if (customEmoji) { return [createElement('img', {