メッセージでのカスタム絵文字対応

2018-11-06 03:57:02 +09:00 · 2018-11-06 03:57:02 +09:00 · 961ed969db
commit 961ed969db
parent e9a3495225
1 changed files with 2 additions and 1 deletions
--- 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
 						}
 					})];
 				}