From f97cdfaa2099ab4c29b980693d3caa5c828d64a4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 17 Sep 2018 11:59:24 +0900
Subject: [PATCH] Fix #2725

---
 src/remote/activitypub/misc/get-note-html.ts | 12 ------------
 src/remote/activitypub/renderer/note.ts      | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts
index f92e91c34e..0a607bd48c 100644
--- a/src/remote/activitypub/misc/get-note-html.ts
+++ b/src/remote/activitypub/misc/get-note-html.ts
@@ -1,22 +1,10 @@
 import { INote } from '../../../models/note';
 import toHtml from '../../../mfm/html';
 import parse from '../../../mfm/parse';
-import config from '../../../config';
 
 export default function(note: INote) {
 	let html = toHtml(parse(note.text), note.mentionedRemoteUsers);
 	if (html == null) html = '';
 
-	if (note.poll != null) {
-		const url = `${config.url}/notes/${note._id}`;
-		// TODO: i18n
-		html += `<p><a href="${url}">【Misskeyで投票を見る】</a></p>`;
-	}
-
-	if (note.renoteId != null) {
-		const url = `${config.url}/notes/${note.renoteId}`;
-		html += `<p>RE: <a href="${url}">${url}</a></p>`;
-	}
-
 	return html;
 }
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index 5d28e5f450..3ed6a6e16a 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -82,6 +82,20 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 
 	const files = await promisedFiles;
 
+	if (note.poll != null) {
+		if (note.text == null) note.text = '';
+		const url = `${config.url}/notes/${note._id}`;
+		// TODO: i18n
+		note.text += `\n\n[投票を見る](${url})`;
+	}
+
+	if (note.renoteId != null) {
+		if (note.text == null) note.text = '';
+		const url = `${config.url}/notes/${note.renoteId}`;
+		note.text += `\n\nRE: ${url}`;
+	}
+
+	// 省略されたメンションのホストを復元する
 	const text = note.text ? parseMfm(note.text).map(x => {
 		if (x.type == 'mention' && x.host == null) {
 			return `${x.content}@${config.host}`;