Merge branch 'develop' of https://github.com/syuilo/misskey into develop

6 files changed, 26 insertions, 5 deletions

diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index 82d6d267c2..0f0f0bc2bf 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -96,6 +96,13 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	// リプライ
 	const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null;
 
+	// 引用
+	let quote: INote;
+
+	if (note._misskey_quote && typeof note._misskey_quote == 'string') {
+		quote = await resolveNote(note._misskey_quote).catch(() => null);
+	}
+
 	// テキストのパース
 	const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content);
 
@@ -112,7 +119,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 		createdAt: new Date(note.published),
 		files: files,
 		reply,
-		renote: undefined,
+		renote: quote,
 		cw: note.summary,
 		text: text,
 		viaMobile: false,
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index d6e2d612c7..a854ad9f19 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -42,6 +42,18 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		inReplyTo = null;
 	}
 
+	let quote;
+
+	if (note.renoteId) {
+		const renote = await Note.findOne({
+			_id: note.renoteId,
+		});
+
+		if (renote) {
+			quote = renote.uri ? renote.uri : `${config.url}/notes/${renote._id}`;
+		}
+	}
+
 	const user = await User.findOne({
 		_id: note.userId
 	});
@@ -112,6 +124,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		summary: note.cw,
 		content,
 		_misskey_content: text,
+		_misskey_quote: quote,
 		published: note.createdAt.toISOString(),
 		to,
 		cc,
diff --git a/src/remote/activitypub/type.ts b/src/remote/activitypub/type.ts
index 2344035013..530aaa13db 100644
--- a/src/remote/activitypub/type.ts
+++ b/src/remote/activitypub/type.ts
@@ -41,6 +41,7 @@ export interface IOrderedCollection extends IObject {
 export interface INote extends IObject {
 	type: 'Note';
 	_misskey_content: string;
+	_misskey_quote: string;
 }
 
 export interface IPerson extends IObject {
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index 888feb08ce..0d4e244856 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -76,7 +76,7 @@ router.get('/notes/:note', async (ctx, next) => {
 	}
 
 	ctx.body = pack(await renderNote(note, false));
-	ctx.set('Cache-Control', 'public, max-age=180');
+	ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 	setResponseType(ctx);
 });
 
diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts
index 8d44b377fe..3a5ba0ea04 100644
--- a/src/server/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -9,8 +9,8 @@ export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
 		path: '/',
 		domain: config.hostname,
 		// SEE: https://github.com/koajs/koa/issues/974
-		//secure: config.url.startsWith('https'),
-		secure: false,
+		// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
+		secure: config.url.startsWith('https'),
 		httpOnly: false,
 		expires: new Date(Date.now() + expires),
 		maxAge: expires
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 616aaa36bb..42292cd398 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -111,7 +111,7 @@ router.get('/notes/:note', async ctx => {
 			note: _note,
 			summary: getNoteSummary(_note)
 		});
-		ctx.set('Cache-Control', 'public, max-age=180');
+		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 	} else {
 		ctx.status = 404;
 	}