Refactoring & 設定でTwemojiを使うかどうか切り替えられるように

2 files changed, 2 insertions, 5 deletions

diff --git a/src/remote/activitypub/misc/get-emoji-names.ts b/src/remote/activitypub/misc/get-emoji-names.ts
index f744d02fed..7dd634a65e 100644
--- a/src/remote/activitypub/misc/get-emoji-names.ts
+++ b/src/remote/activitypub/misc/get-emoji-names.ts
@@ -2,5 +2,5 @@ import parse from '../../../mfm/parse';
 
 export default function(text: string) {
 	if (!text) return [];
-	return parse(text).filter(t => t.type === 'emoji').map(t => (t as any).emoji);
+	return parse(text).filter(t => t.type === 'emoji' && t.name).map(t => (t as any).name);
 }
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index a2c591de2e..b38d47130a 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -8,9 +8,7 @@ import Note, { INote } from '../../../models/note';
 import User from '../../../models/user';
 import toHtml from '../misc/get-note-html';
 import parseMfm from '../../../mfm/parse';
-import getEmojiNames from '../misc/get-emoji-names';
 import Emoji, { IEmoji } from '../../../models/emoji';
-import { unique } from '../../../prelude/array';
 
 export default async function renderNote(note: INote, dive = true): Promise<any> {
 	const promisedFiles: Promise<IDriveFile[]> = note.fileIds
@@ -110,8 +108,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 
 	const content = toHtml(Object.assign({}, note, { text }));
 
-	const emojiNames = unique(getEmojiNames(content));
-	const emojis = await getEmojis(emojiNames);
+	const emojis = await getEmojis(note.emojis);
 	const apemojis = emojis.map(emoji => renderEmoji(emoji));
 
 	const tag = [