diff options
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/activitypub/client.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/pods.ts | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 5cfbc2f1d..461a619dd 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts | |||
@@ -46,7 +46,7 @@ async function accountFollowersController (req: express.Request, res: express.Re | |||
46 | const page = req.params.page || 1 | 46 | const page = req.params.page || 1 |
47 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 47 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) |
48 | 48 | ||
49 | const result = await db.Account.listFollowerUrlsForApi(account.id, start, count) | 49 | const result = await db.Account.listAcceptedFollowerUrlsForApi(account.id, start, count) |
50 | const activityPubResult = activityPubCollectionPagination(req.url, page, result) | 50 | const activityPubResult = activityPubCollectionPagination(req.url, page, result) |
51 | 51 | ||
52 | return res.json(activityPubResult) | 52 | return res.json(activityPubResult) |
@@ -58,7 +58,7 @@ async function accountFollowingController (req: express.Request, res: express.Re | |||
58 | const page = req.params.page || 1 | 58 | const page = req.params.page || 1 |
59 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) | 59 | const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) |
60 | 60 | ||
61 | const result = await db.Account.listFollowingUrlsForApi(account.id, start, count) | 61 | const result = await db.Account.listAcceptedFollowingUrlsForApi(account.id, start, count) |
62 | const activityPubResult = activityPubCollectionPagination(req.url, page, result) | 62 | const activityPubResult = activityPubCollectionPagination(req.url, page, result) |
63 | 63 | ||
64 | return res.json(activityPubResult) | 64 | return res.json(activityPubResult) |
diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts index f662f1c03..2231a05fa 100644 --- a/server/controllers/api/pods.ts +++ b/server/controllers/api/pods.ts | |||
@@ -11,6 +11,9 @@ import { setFollowingSort } from '../../middlewares/sort' | |||
11 | import { followValidator } from '../../middlewares/validators/pods' | 11 | import { followValidator } from '../../middlewares/validators/pods' |
12 | import { followersSortValidator, followingSortValidator } from '../../middlewares/validators/sort' | 12 | import { followersSortValidator, followingSortValidator } from '../../middlewares/validators/sort' |
13 | import { sendFollow } from '../../lib/activitypub/send-request' | 13 | import { sendFollow } from '../../lib/activitypub/send-request' |
14 | import { authenticate } from '../../middlewares/oauth' | ||
15 | import { ensureUserHasRight } from '../../middlewares/user-right' | ||
16 | import { UserRight } from '../../../shared/models/users/user-right.enum' | ||
14 | 17 | ||
15 | const podsRouter = express.Router() | 18 | const podsRouter = express.Router() |
16 | 19 | ||
@@ -23,6 +26,8 @@ podsRouter.get('/following', | |||
23 | ) | 26 | ) |
24 | 27 | ||
25 | podsRouter.post('/follow', | 28 | podsRouter.post('/follow', |
29 | authenticate, | ||
30 | ensureUserHasRight(UserRight.MANAGE_PEERTUBE_FOLLOW), | ||
26 | followValidator, | 31 | followValidator, |
27 | setBodyHostsPort, | 32 | setBodyHostsPort, |
28 | asyncMiddleware(follow) | 33 | asyncMiddleware(follow) |