Do not import as pack from AP renderer (#4048)

* Do not import as pack from AP renderer

* rename

6 files changed, 20 insertions, 20 deletions

diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index ac8d3d4e26..30dc6395e0 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -4,7 +4,7 @@ const json = require('koa-json-body');
 const httpSignature = require('http-signature');
 
 import { createHttpJob } from '../queue';
-import pack from '../remote/activitypub/renderer';
+import { renderActivity } from '../remote/activitypub/renderer';
 import Note from '../models/note';
 import User, { isLocalUser, ILocalUser, IUser } from '../models/user';
 import Emoji from '../models/emoji';
@@ -83,7 +83,7 @@ router.get('/notes/:note', async (ctx, next) => {
 		return;
 	}
 
-	ctx.body = pack(await renderNote(note, false));
+	ctx.body = renderActivity(await renderNote(note, false));
 	ctx.set('Cache-Control', 'public, max-age=180');
 	setResponseType(ctx);
 });
@@ -106,7 +106,7 @@ router.get('/notes/:note/activity', async ctx => {
 		return;
 	}
 
-	ctx.body = pack(await packActivity(note));
+	ctx.body = renderActivity(await packActivity(note));
 	ctx.set('Cache-Control', 'public, max-age=180');
 	setResponseType(ctx);
 });
@@ -137,7 +137,7 @@ router.get('/questions/:question', async (ctx, next) => {
 			_id: poll.userId
 	});
 
-	ctx.body = pack(await renderQuestion(user as ILocalUser, poll));
+	ctx.body = renderActivity(await renderQuestion(user as ILocalUser, poll));
 	setResponseType(ctx);
 });
 
@@ -173,7 +173,7 @@ router.get('/users/:user/publickey', async ctx => {
 	}
 
 	if (isLocalUser(user)) {
-		ctx.body = pack(renderKey(user));
+		ctx.body = renderActivity(renderKey(user));
 		ctx.set('Cache-Control', 'public, max-age=180');
 		setResponseType(ctx);
 	} else {
@@ -188,7 +188,7 @@ async function userInfo(ctx: Router.IRouterContext, user: IUser) {
 		return;
 	}
 
-	ctx.body = pack(await renderPerson(user as ILocalUser));
+	ctx.body = renderActivity(await renderPerson(user as ILocalUser));
 	ctx.set('Cache-Control', 'public, max-age=180');
 	setResponseType(ctx);
 }
@@ -235,7 +235,7 @@ router.get('/emojis/:emoji', async ctx => {
 		return;
 	}
 
-	ctx.body = pack(await renderEmoji(emoji));
+	ctx.body = renderActivity(await renderEmoji(emoji));
 	ctx.set('Cache-Control', 'public, max-age=180');
 	setResponseType(ctx);
 });
diff --git a/src/server/activitypub/featured.ts b/src/server/activitypub/featured.ts
index 12613b3ecf..fc6150902b 100644
--- a/src/server/activitypub/featured.ts
+++ b/src/server/activitypub/featured.ts
@@ -2,7 +2,7 @@ import { ObjectID } from 'mongodb';
 import * as Router from 'koa-router';
 import config from '../../config';
 import User from '../../models/user';
-import pack from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import { setResponseType } from '../activitypub';
 import Note from '../../models/note';
@@ -38,7 +38,7 @@ export default async (ctx: Router.IRouterContext) => {
 		renderedNotes.length, null, null, renderedNotes
 	);
 
-	ctx.body = pack(rendered);
+	ctx.body = renderActivity(rendered);
 	ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 	setResponseType(ctx);
 };
diff --git a/src/server/activitypub/followers.ts b/src/server/activitypub/followers.ts
index 9c28c98cd8..0db451bb30 100644
--- a/src/server/activitypub/followers.ts
+++ b/src/server/activitypub/followers.ts
@@ -4,7 +4,7 @@ import config from '../../config';
 import $ from 'cafy'; import ID, { transform } from '../../misc/cafy-id';
 import User from '../../models/user';
 import Following from '../../models/following';
-import pack from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
 import renderFollowUser from '../../remote/activitypub/renderer/follow-user';
@@ -77,12 +77,12 @@ export default async (ctx: Router.IRouterContext) => {
 			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
 		);
 
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		setResponseType(ctx);
 	} else {
 		// index page
 		const rendered = renderOrderedCollection(partOf, user.followersCount, `${partOf}?page=true`, null);
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 		setResponseType(ctx);
 	}
diff --git a/src/server/activitypub/following.ts b/src/server/activitypub/following.ts
index 97245245ad..da65ee79fa 100644
--- a/src/server/activitypub/following.ts
+++ b/src/server/activitypub/following.ts
@@ -5,7 +5,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../misc/cafy-id';
 import User from '../../models/user';
 import Following from '../../models/following';
-import pack from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
 import renderFollowUser from '../../remote/activitypub/renderer/follow-user';
@@ -78,12 +78,12 @@ export default async (ctx: Router.IRouterContext) => {
 			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
 		);
 
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		setResponseType(ctx);
 	} else {
 		// index page
 		const rendered = renderOrderedCollection(partOf, user.followingCount, `${partOf}?page=true`, null);
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 		setResponseType(ctx);
 	}
diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index c35298e3a8..41f832aefa 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -4,7 +4,7 @@ import config from '../../config';
 import $ from 'cafy';
 import ID, { transform } from '../../misc/cafy-id';
 import User from '../../models/user';
-import pack from '../../remote/activitypub/renderer';
+import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
 import { setResponseType } from '../activitypub';
@@ -94,7 +94,7 @@ export default async (ctx: Router.IRouterContext) => {
 			notes.length > 0 ? `${partOf}?page=true&until_id=${notes[notes.length - 1]._id}` : null
 		);
 
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 		setResponseType(ctx);
 	} else {
@@ -103,7 +103,7 @@ export default async (ctx: Router.IRouterContext) => {
 			`${partOf}?page=true`,
 			`${partOf}?page=true&since_id=000000000000000000000000`
 		);
-		ctx.body = pack(rendered);
+		ctx.body = renderActivity(rendered);
 		ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
 		setResponseType(ctx);
 	}
diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts
index 5612ff1665..828d9e0215 100644
--- a/src/server/api/endpoints/users/lists/push.ts
+++ b/src/server/api/endpoints/users/lists/push.ts
@@ -2,7 +2,7 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id
 import UserList from '../../../../../models/user-list';
 import User, { pack as packUser, isRemoteUser, fetchProxyAccount } from '../../../../../models/user';
 import { publishUserListStream } from '../../../../../stream';
-import ap from '../../../../../remote/activitypub/renderer';
+import { renderActivity } from '../../../../../remote/activitypub/renderer';
 import renderFollow from '../../../../../remote/activitypub/renderer/follow';
 import { deliver } from '../../../../../queue';
 import define from '../../../define';
@@ -72,7 +72,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 	// このインスタンス内にこのリモートユーザーをフォローしているユーザーがいなくても投稿を受け取るためにダミーのユーザーがフォローしたということにする
 	if (isRemoteUser(user)) {
 		const proxy = await fetchProxyAccount();
-		const content = ap(renderFollow(proxy, user));
+		const content = renderActivity(renderFollow(proxy, user));
 		deliver(proxy, content, user.inbox);
 	}
 }));