From 8bc47baf4f47d29afb1c25e2ec3807384d06f812 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 12 Jun 2018 18:54:36 +0900
Subject: [PATCH] #1710

---
 src/models/note.ts                      |  2 +-
 src/server/api/stream/home.ts           | 10 +++++++++-
 src/server/api/stream/local-timeline.ts |  8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/models/note.ts b/src/models/note.ts
index 359d95373..3bbfec010 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -289,7 +289,7 @@ export const pack = async (
 
 		// Poll
 		if (meId && _note.poll && !hide) {
-			_note.poll = (async (poll) => {
+			_note.poll = (async poll => {
 				const vote = await PollVote
 					.findOne({
 						userId: meId,
diff --git a/src/server/api/stream/home.ts b/src/server/api/stream/home.ts
index 54fde2d77..d9b8f7fb9 100644
--- a/src/server/api/stream/home.ts
+++ b/src/server/api/stream/home.ts
@@ -4,7 +4,7 @@ import * as debug from 'debug';
 
 import User, { IUser } from '../../../models/user';
 import Mute from '../../../models/mute';
-import { pack as packNote } from '../../../models/note';
+import { pack as packNote, pack } from '../../../models/note';
 import readNotification from '../common/read-notification';
 import call from '../call';
 import { IApp } from '../../../models/app';
@@ -48,6 +48,14 @@ export default async function(
 					}
 					//#endregion
 
+					// Renoteなら再pack
+					if (x.type == 'note' && x.body.renoteId != null) {
+						x.body.renote = await pack(x.body.renoteId, user, {
+							detail: true
+						});
+						data = JSON.stringify(x);
+					}
+
 					connection.send(data);
 				} catch (e) {
 					connection.send(data);
diff --git a/src/server/api/stream/local-timeline.ts b/src/server/api/stream/local-timeline.ts
index a790ba878..8f6a445be 100644
--- a/src/server/api/stream/local-timeline.ts
+++ b/src/server/api/stream/local-timeline.ts
@@ -3,6 +3,7 @@ import * as redis from 'redis';
 
 import { IUser } from '../../../models/user';
 import Mute from '../../../models/mute';
+import { pack } from '../../../models/note';
 
 export default async function(
 	request: websocket.request,
@@ -31,6 +32,13 @@ export default async function(
 		}
 		//#endregion
 
+		// Renoteなら再pack
+		if (note.renoteId != null) {
+			note.renote = await pack(note.renoteId, user, {
+				detail: true
+			});
+		}
+
 		connection.send(JSON.stringify({
 			type: 'note',
 			body: note