diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-22 11:27:40 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:53 +0100 |
commit | c46edbc2f6ca310b2f0331f979ac6caf27f6eb92 (patch) | |
tree | 073e32adb1bf93a597a269432e33a8f28365deb5 /server/controllers/activitypub | |
parent | c986175d68a18e96fbd41537a05c7796a2c64f38 (diff) | |
download | PeerTube-c46edbc2f6ca310b2f0331f979ac6caf27f6eb92.tar.gz PeerTube-c46edbc2f6ca310b2f0331f979ac6caf27f6eb92.tar.zst PeerTube-c46edbc2f6ca310b2f0331f979ac6caf27f6eb92.zip |
Fetch outbox to grab old activities tests
Diffstat (limited to 'server/controllers/activitypub')
-rw-r--r-- | server/controllers/activitypub/client.ts | 4 | ||||
-rw-r--r-- | server/controllers/activitypub/outbox.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 24c8665a5..eee89e2fd 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts | |||
@@ -56,7 +56,7 @@ async function accountController (req: express.Request, res: express.Response, n | |||
56 | async function accountFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) { | 56 | async function accountFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) { |
57 | const account: AccountInstance = res.locals.account | 57 | const account: AccountInstance = res.locals.account |
58 | 58 | ||
59 | const page = req.params.page || 1 | 59 | const page = req.query.page || 1 |
60 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 60 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) |
61 | 61 | ||
62 | const result = await db.AccountFollow.listAcceptedFollowerUrlsForApi([ account.id ], start, count) | 62 | const result = await db.AccountFollow.listAcceptedFollowerUrlsForApi([ account.id ], start, count) |
@@ -68,7 +68,7 @@ async function accountFollowersController (req: express.Request, res: express.Re | |||
68 | async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) { | 68 | async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) { |
69 | const account: AccountInstance = res.locals.account | 69 | const account: AccountInstance = res.locals.account |
70 | 70 | ||
71 | const page = req.params.page || 1 | 71 | const page = req.query.page || 1 |
72 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 72 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) |
73 | 73 | ||
74 | const result = await db.AccountFollow.listAcceptedFollowingUrlsForApi([ account.id ], start, count) | 74 | const result = await db.AccountFollow.listAcceptedFollowingUrlsForApi([ account.id ], start, count) |
diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts index 1a74bde33..74d399763 100644 --- a/server/controllers/activitypub/outbox.ts +++ b/server/controllers/activitypub/outbox.ts | |||
@@ -28,7 +28,7 @@ export { | |||
28 | async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) { | 28 | async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) { |
29 | const account: AccountInstance = res.locals.account | 29 | const account: AccountInstance = res.locals.account |
30 | 30 | ||
31 | const page = req.params.page || 1 | 31 | const page = req.query.page || 1 |
32 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 32 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) |
33 | 33 | ||
34 | const data = await db.Video.listAllAndSharedByAccountForOutbox(account.id, start, count) | 34 | const data = await db.Video.listAllAndSharedByAccountForOutbox(account.id, start, count) |