diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-01 18:05:14 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-01 18:05:14 +0900 |
| commit | 895cf53ee1fda2a5322505d4b106590ae78af6f9 (patch) | |
| tree | 648e942f707bfa83ceaa870d93a9af83622d706c | |
| parent | 10.37.0 (diff) | |
| download | misskey-895cf53ee1fda2a5322505d4b106590ae78af6f9.tar.gz misskey-895cf53ee1fda2a5322505d4b106590ae78af6f9.tar.bz2 misskey-895cf53ee1fda2a5322505d4b106590ae78af6f9.zip | |
Fix bug
| -rw-r--r-- | src/client/app/common/views/components/autocomplete.vue | 2 | ||||
| -rw-r--r-- | src/client/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 d46d536659..ea91655b2f 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 c45bb1022e..6397767cec 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', { |