summaryrefslogtreecommitdiff
path: root/src/server/activitypub
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-01-31 02:29:36 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-01-31 02:29:35 +0900
commitb8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a (patch)
treef375d88039a6bfeb9a29f8a6422f0e45cb936c57 /src/server/activitypub
parentRe-fix path (diff)
downloadsharkey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.gz
sharkey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.tar.bz2
sharkey-b8a7468c4a7b0bca76cfe89bd7fd7527c4c9199a.zip
Do not import as pack from AP renderer (#4048)
* Do not import as pack from AP renderer * rename
Diffstat (limited to 'src/server/activitypub')
-rw-r--r--src/server/activitypub/featured.ts4
-rw-r--r--src/server/activitypub/followers.ts6
-rw-r--r--src/server/activitypub/following.ts6
-rw-r--r--src/server/activitypub/outbox.ts6
4 files changed, 11 insertions, 11 deletions
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);
}