// Intercept ActivityPub client requests
import * as express from 'express'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
+import { VideoPrivacy } from '../../../shared/models/videos'
+import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
import { pageToStartAndCount } from '../../helpers/core-utils'
import { ACTIVITY_PUB, CONFIG } from '../../initializers'
-import { buildVideoAnnounceToFollowers } from '../../lib/activitypub/send'
+import { buildVideoAnnounce } from '../../lib/activitypub/send'
+import { audiencify, getAudience } from '../../lib/activitypub/send/misc'
+import { createActivityData } from '../../lib/activitypub/send/send-create'
import { asyncMiddleware, executeIfActivityPub, localAccountValidator } from '../../middlewares'
import { videoChannelsGetValidator, videosGetValidator, videosShareValidator } from '../../middlewares/validators'
import { videoCommentGetValidator } from '../../middlewares/validators/video-comments'
import { AccountModel } from '../../models/account/account'
+import { ActorModel } from '../../models/activitypub/actor'
import { ActorFollowModel } from '../../models/activitypub/actor-follow'
import { VideoModel } from '../../models/video/video'
import { VideoChannelModel } from '../../models/video/video-channel'
const activityPubClientRouter = express.Router()
-activityPubClientRouter.get('/accounts/:name',
+activityPubClientRouter.get('/accounts?/:name',
executeIfActivityPub(asyncMiddleware(localAccountValidator)),
executeIfActivityPub(accountController)
)
-
-activityPubClientRouter.get('/accounts/:name/followers',
+activityPubClientRouter.get('/accounts?/:name/followers',
executeIfActivityPub(asyncMiddleware(localAccountValidator)),
executeIfActivityPub(asyncMiddleware(accountFollowersController))
)
-
-activityPubClientRouter.get('/accounts/:name/following',
+activityPubClientRouter.get('/accounts?/:name/following',
executeIfActivityPub(asyncMiddleware(localAccountValidator)),
executeIfActivityPub(asyncMiddleware(accountFollowingController))
)
executeIfActivityPub(asyncMiddleware(videosGetValidator)),
executeIfActivityPub(asyncMiddleware(videoController))
)
-
+activityPubClientRouter.get('/videos/watch/:id/activity',
+ executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoController))
+)
+activityPubClientRouter.get('/videos/watch/:id/announces',
+ executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoAnnouncesController))
+)
activityPubClientRouter.get('/videos/watch/:id/announces/:accountId',
executeIfActivityPub(asyncMiddleware(videosShareValidator)),
executeIfActivityPub(asyncMiddleware(videoAnnounceController))
)
-
+activityPubClientRouter.get('/videos/watch/:id/likes',
+ executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoLikesController))
+)
+activityPubClientRouter.get('/videos/watch/:id/dislikes',
+ executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoDislikesController))
+)
+activityPubClientRouter.get('/videos/watch/:id/comments',
+ executeIfActivityPub(asyncMiddleware(videosGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoCommentsController))
+)
activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId',
executeIfActivityPub(asyncMiddleware(videoCommentGetValidator)),
executeIfActivityPub(asyncMiddleware(videoCommentController))
)
+activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity',
+ executeIfActivityPub(asyncMiddleware(videoCommentGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoCommentController))
+)
activityPubClientRouter.get('/video-channels/:id',
executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)),
executeIfActivityPub(asyncMiddleware(videoChannelController))
)
+activityPubClientRouter.get('/video-channels/:id/followers',
+ executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoChannelFollowersController))
+)
+activityPubClientRouter.get('/video-channels/:id/following',
+ executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)),
+ executeIfActivityPub(asyncMiddleware(videoChannelFollowingController))
+)
// ---------------------------------------------------------------------------
function accountController (req: express.Request, res: express.Response, next: express.NextFunction) {
const account: AccountModel = res.locals.account
- return res.json(account.toActivityPubObject())
- .end()
+ return activityPubResponse(activityPubContextify(account.toActivityPubObject()), res)
}
async function accountFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
const account: AccountModel = res.locals.account
+ const activityPubResult = await actorFollowers(req, account.Actor)
- const page = req.query.page || 1
- const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
-
- const result = await ActorFollowModel.listAcceptedFollowerUrlsForApi([ account.Actor.id ], undefined, start, count)
- const activityPubResult = activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
-
- return res.json(activityPubResult)
+ return activityPubResponse(activityPubContextify(activityPubResult), res)
}
async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
const account: AccountModel = res.locals.account
+ const activityPubResult = await actorFollowing(req, account.Actor)
- const page = req.query.page || 1
- const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
-
- const result = await ActorFollowModel.listAcceptedFollowingUrlsForApi([ account.Actor.id ], undefined, start, count)
- const activityPubResult = activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
-
- return res.json(activityPubResult)
+ return activityPubResponse(activityPubContextify(activityPubResult), res)
}
async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
// We need more attributes
const videoAll = await VideoModel.loadAndPopulateAll(video.id)
- return res.json(videoAll.toActivityPubObject())
+ const audience = await getAudience(video.VideoChannel.Account.Actor, undefined, video.privacy === VideoPrivacy.PUBLIC)
+ const videoObject = audiencify(videoAll.toActivityPubObject(), audience)
+
+ if (req.path.endsWith('/activity')) {
+ const data = await createActivityData(video.url, video.VideoChannel.Account.Actor, videoObject, undefined, audience)
+ return activityPubResponse(activityPubContextify(data), res)
+ }
+
+ return activityPubResponse(activityPubContextify(videoObject), res)
}
async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
const share = res.locals.videoShare as VideoShareModel
- const object = await buildVideoAnnounceToFollowers(share.Actor, res.locals.video, undefined)
+ const object = await buildVideoAnnounce(share.Actor, share, res.locals.video, undefined)
- return res.json(object)
+ return activityPubResponse(activityPubContextify(object), res)
+}
+
+async function videoAnnouncesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const video: VideoModel = res.locals.video
+
+ // We need more attributes
+ const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+ const object = videoAll.toAnnouncesActivityPubObject()
+
+ return activityPubResponse(activityPubContextify(object), res)
+}
+
+async function videoLikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const video: VideoModel = res.locals.video
+
+ // We need more attributes
+ const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+ const { likesObject } = videoAll.toRatesActivityPubObjects()
+
+ return activityPubResponse(activityPubContextify(likesObject), res)
+}
+
+async function videoDislikesController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const video: VideoModel = res.locals.video
+
+ // We need more attributes
+ const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+ const { dislikesObject } = videoAll.toRatesActivityPubObjects()
+
+ return activityPubResponse(activityPubContextify(dislikesObject), res)
+}
+
+async function videoCommentsController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const video: VideoModel = res.locals.video
+
+ // We need more attributes
+ const videoAll = await VideoModel.loadAndPopulateAll(video.id)
+ const commentsObject = videoAll.toCommentsActivityPubObject()
+
+ return activityPubResponse(activityPubContextify(commentsObject), res)
}
async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoChannel: VideoChannelModel = res.locals.videoChannel
- return res.json(videoChannel.toActivityPubObject())
+ return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject()), res)
+}
+
+async function videoChannelFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const videoChannel: VideoChannelModel = res.locals.videoChannel
+ const activityPubResult = await actorFollowers(req, videoChannel.Actor)
+
+ return activityPubResponse(activityPubContextify(activityPubResult), res)
+}
+
+async function videoChannelFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const videoChannel: VideoChannelModel = res.locals.videoChannel
+ const activityPubResult = await actorFollowing(req, videoChannel.Actor)
+
+ return activityPubResponse(activityPubContextify(activityPubResult), res)
}
async function videoCommentController (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoComment: VideoCommentModel = res.locals.videoComment
- return res.json(videoComment.toActivityPubObject())
+ const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined)
+ const isPublic = true // Comments are always public
+ const audience = await getAudience(videoComment.Account.Actor, undefined, isPublic)
+
+ const videoCommentObject = audiencify(videoComment.toActivityPubObject(threadParentComments), audience)
+
+ if (req.path.endsWith('/activity')) {
+ const data = await createActivityData(videoComment.url, videoComment.Account.Actor, videoCommentObject, undefined, audience)
+ return activityPubResponse(activityPubContextify(data), res)
+ }
+
+ return activityPubResponse(activityPubContextify(videoCommentObject), res)
+}
+
+// ---------------------------------------------------------------------------
+
+async function actorFollowing (req: express.Request, actor: ActorModel) {
+ const page = req.query.page || 1
+ const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
+
+ const result = await ActorFollowModel.listAcceptedFollowingUrlsForApi([ actor.id ], undefined, start, count)
+ return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
+}
+
+async function actorFollowers (req: express.Request, actor: ActorModel) {
+ const page = req.query.page || 1
+ const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
+
+ const result = await ActorFollowModel.listAcceptedFollowerUrlsForApi([ actor.id ], undefined, start, count)
+ return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
+}
+
+function activityPubResponse (data: any, res: express.Response) {
+ return res.type('application/activity+json; charset=utf-8')
+ .json(data)
+ .end()
}
projects / github / Chocobozzz / PeerTube.git / blobdiff