From 20e77196f28178c869402985761bd4c2fa74bf0a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 22 Apr 2018 10:44:17 +0900
Subject: AP: 投票をレンダリング
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/remote/activitypub/kernel/delete/note.ts |  1 -
 src/remote/activitypub/misc/get-note-html.ts | 18 ++++++++++++++++++
 src/remote/activitypub/renderer/note.ts      |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/remote/activitypub/misc/get-note-html.ts

(limited to 'src/remote')

diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts
index 64c342d39b..b2868f69a3 100644
--- a/src/remote/activitypub/kernel/delete/note.ts
+++ b/src/remote/activitypub/kernel/delete/note.ts
@@ -22,7 +22,6 @@ export default async function(actor: IRemoteUser, uri: string): Promise<void> {
 		$set: {
 			deletedAt: new Date(),
 			text: null,
-			textHtml: null,
 			mediaIds: [],
 			poll: null
 		}
diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts
new file mode 100644
index 0000000000..a63059a38d
--- /dev/null
+++ b/src/remote/activitypub/misc/get-note-html.ts
@@ -0,0 +1,18 @@
+import { INote } from "../../../models/note";
+import toHtml from '../../../text/html';
+import parse from '../../../text/parse';
+import config from '../../../config';
+
+export default function(note: INote) {
+	if (note.text == null) return null;
+
+	let html = toHtml(parse(note.text));
+
+	if (note.poll != null) {
+		const url = `${config.url}/notes/${note._id}`;
+		// TODO: i18n
+		html += `<p>【投票】<br />${url}</p>`;
+	}
+
+	return html;
+}
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index c364b13249..a05c12b388 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -4,6 +4,7 @@ import config from '../../../config';
 import DriveFile from '../../../models/drive-file';
 import Note, { INote } from '../../../models/note';
 import User from '../../../models/user';
+import toHtml from '../misc/get-note-html';
 
 export default async function renderNote(note: INote, dive = true) {
 	const promisedFiles = note.mediaIds
@@ -48,7 +49,7 @@ export default async function renderNote(note: INote, dive = true) {
 		id: `${config.url}/notes/${note._id}`,
 		type: 'Note',
 		attributedTo,
-		content: note.textHtml,
+		content: toHtml(note),
 		published: note.createdAt.toISOString(),
 		to: 'https://www.w3.org/ns/activitystreams#Public',
 		cc: `${attributedTo}/followers`,
-- 
cgit v1.2.3-freya