From 864b6ad1bd59d86364b9f108bd875d17ffd1e2d9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 2 Dec 2018 07:02:08 +0900 Subject: Resolve #1826 --- src/services/note/create.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/services/note') diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 99cf14ecfa..a35e4fe18d 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -155,12 +155,14 @@ export default async (user: IUser, data: Option, silent = false) => new Promise< // Parse MFM const tokens = data.text ? parse(data.text) : []; + const cwTokens = data.cw ? parse(data.cw) : []; + const combinedTokens = tokens.concat(cwTokens); - const tags = extractHashtags(tokens); + const tags = extractHashtags(combinedTokens); - const emojis = extractEmojis(tokens); + const emojis = extractEmojis(combinedTokens); - const mentionedUsers = data.apMentions || await extractMentionedUsers(user, tokens); + const mentionedUsers = data.apMentions || await extractMentionedUsers(user, combinedTokens); if (data.reply && !user._id.equals(data.reply.userId) && !mentionedUsers.some(u => u._id.equals(data.reply.userId))) { mentionedUsers.push(await User.findOne({ _id: data.reply.userId })); -- cgit v1.3.1-freya