From 34393ef89f79fe946e29cc677a8e839d72ebdd43 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 8 Dec 2018 06:39:15 +0900 Subject: [PATCH] Improve custom emoji parsing (#3539) * Use MFM parser for extracting emoji in name * Fix custom emoji regex * Revert "Fix custom emoji regex" This reverts commit 4c21caf59753e7653c02f81ddf0cde8c44f48008. --- src/server/api/endpoints/i/update.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 0319550109..fbf1dc32e1 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -198,8 +198,8 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => { let emojis = [] as string[]; if (updates.name != null) { - const match = updates.name.match(/:\w{1,100}:/g) as string[]; - if (match) emojis = emojis.concat(match.map(m => m.replace(/:(\w+):/, '$1'))); + const tokens = parse(updates.name, true); + emojis = emojis.concat(extractEmojis(tokens)); } if (updates.description != null) {