From 864b6ad1bd59d86364b9f108bd875d17ffd1e2d9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 2 Dec 2018 07:02:08 +0900
Subject: [PATCH] Resolve #1826

---
 src/client/app/desktop/views/components/note-detail.vue  | 2 +-
 src/client/app/desktop/views/components/note-preview.vue | 2 +-
 src/client/app/desktop/views/components/note.sub.vue     | 2 +-
 src/client/app/desktop/views/components/note.vue         | 2 +-
 src/client/app/mobile/views/components/note-detail.vue   | 2 +-
 src/client/app/mobile/views/components/note.sub.vue      | 2 +-
 src/client/app/mobile/views/components/note.vue          | 2 +-
 src/services/note/create.ts                              | 8 +++++---
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index 01cde7636..093586651 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -39,7 +39,7 @@
 		</header>
 		<div class="body">
 			<p v-if="appearNote.cw != null" class="cw">
-				<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+				<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="appearNote.cw == null || showContent">
diff --git a/src/client/app/desktop/views/components/note-preview.vue b/src/client/app/desktop/views/components/note-preview.vue
index 4c1c7e7b2..ee4068dd3 100644
--- a/src/client/app/desktop/views/components/note-preview.vue
+++ b/src/client/app/desktop/views/components/note-preview.vue
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note" :mini="true"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<span class="text" v-if="note.cw != ''">{{ note.cw }}</span>
+				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
diff --git a/src/client/app/desktop/views/components/note.sub.vue b/src/client/app/desktop/views/components/note.sub.vue
index 5ba22fc76..05059f200 100644
--- a/src/client/app/desktop/views/components/note.sub.vue
+++ b/src/client/app/desktop/views/components/note.sub.vue
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<span class="text" v-if="note.cw != ''">{{ note.cw }}</span>
+				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue
index 025d489c0..b87aa5b04 100644
--- a/src/client/app/desktop/views/components/note.vue
+++ b/src/client/app/desktop/views/components/note.vue
@@ -20,7 +20,7 @@
 			<mk-note-header class="header" :note="appearNote" :mini="mini"/>
 			<div class="body" v-if="appearNote.deletedAt == null">
 				<p v-if="appearNote.cw != null" class="cw">
-					<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+					<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 					<mk-cw-button v-model="showContent"/>
 				</p>
 				<div class="content" v-show="appearNote.cw == null || showContent">
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 70676c04e..79eb24189 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -26,7 +26,7 @@
 		</header>
 		<div class="body">
 			<p v-if="appearNote.cw != null" class="cw">
-				<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+				<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="appearNote.cw == null || showContent">
diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue
index 24f5be160..37d2879ea 100644
--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note" :mini="true"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<span class="text" v-if="note.cw != ''">{{ note.cw }}</span>
+				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index 5cfcdc0f3..b4c98987d 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -16,7 +16,7 @@
 			<mk-note-header class="header" :note="appearNote" :mini="true"/>
 			<div class="body" v-if="appearNote.deletedAt == null">
 				<p v-if="appearNote.cw != null" class="cw">
-					<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+				<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 					<mk-cw-button v-model="showContent"/>
 				</p>
 				<div class="content" v-show="appearNote.cw == null || showContent">
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 99cf14ecf..a35e4fe18 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 }));