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

1 files changed, 5 insertions, 6 deletions

diff --git a/src/mfm/parse/elements/emoji.ts b/src/mfm/parse/elements/emoji.ts
index 12e0a64b6f..a213b2dacf 100644
--- a/src/mfm/parse/elements/emoji.ts
+++ b/src/mfm/parse/elements/emoji.ts
@@ -8,26 +8,25 @@ export type TextElementEmoji = {
 	type: 'emoji';
 	content: string;
 	emoji?: string;
-	raw?: string;
+	name?: string;
 };
 
 export default function(text: string) {
 	const name = text.match(/^:([a-zA-Z0-9+_-]+):/);
 	if (name) {
-		const [content, emoji] = name;
 		return {
 			type: 'emoji',
-			content,
-			emoji
+			content: name[0],
+			name: name[1]
 		} as TextElementEmoji;
 	}
 	const unicode = text.match(emojiRegex);
 	if (unicode) {
-		const [content, raw] = unicode;
+		const [content, emoji] = unicode;
 		return {
 			type: 'emoji',
 			content,
-			raw
+			emoji
 		} as TextElementEmoji;
 	}
 	return null;