X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Factivitypub%2Fclient.ts;h=54cf44419f6f0a99b90e26b2387c9593e9bf929b;hb=1d6587aa42ddaa5acdf3a99127797377c7717850;hp=5199b3f8107990352e4710bfff65db49b79c3e8a;hpb=fd4484f19eae8b0a0c30d5d30e98880c8708516a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 5199b3f81..54cf44419 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -1,14 +1,13 @@ // Intercept ActivityPub client requests import * as express from 'express' -import { VideoPrivacy } from '../../../shared/models/videos' +import { VideoPrivacy, VideoRateType } from '../../../shared/models/videos' import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub' -import { pageToStartAndCount } from '../../helpers/core-utils' -import { ACTIVITY_PUB, CONFIG, ROUTE_CACHE_LIFETIME } from '../../initializers' +import { CONFIG, ROUTE_CACHE_LIFETIME } from '../../initializers' import { buildVideoAnnounce } from '../../lib/activitypub/send' -import { audiencify, getAudience } from '../../lib/activitypub/send/misc' +import { audiencify, getAudience } from '../../lib/activitypub/audience' import { createActivityData } from '../../lib/activitypub/send/send-create' -import { asyncMiddleware, executeIfActivityPub, localAccountValidator } from '../../middlewares' -import { videoChannelsGetValidator, videosGetValidator, videosShareValidator } from '../../middlewares/validators' +import { asyncMiddleware, executeIfActivityPub, localAccountValidator, localVideoChannelValidator } from '../../middlewares' +import { videosGetValidator, videosShareValidator } from '../../middlewares/validators' import { videoCommentGetValidator } from '../../middlewares/validators/video-comments' import { AccountModel } from '../../models/account/account' import { ActorModel } from '../../models/activitypub/actor' @@ -18,6 +17,15 @@ import { VideoChannelModel } from '../../models/video/video-channel' import { VideoCommentModel } from '../../models/video/video-comment' import { VideoShareModel } from '../../models/video/video-share' import { cacheRoute } from '../../middlewares/cache' +import { activityPubResponse } from './utils' +import { AccountVideoRateModel } from '../../models/account/account-video-rate' +import { + getVideoCommentsActivityPubUrl, + getVideoDislikesActivityPubUrl, + getVideoLikesActivityPubUrl, + getVideoSharesActivityPubUrl +} from '../../lib/activitypub' +import { VideoCaptionModel } from '../../models/video/video-caption' const activityPubClientRouter = express.Router() @@ -72,16 +80,16 @@ activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity executeIfActivityPub(asyncMiddleware(videoCommentController)) ) -activityPubClientRouter.get('/video-channels/:id', - executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)), +activityPubClientRouter.get('/video-channels/:name', + executeIfActivityPub(asyncMiddleware(localVideoChannelValidator)), executeIfActivityPub(asyncMiddleware(videoChannelController)) ) -activityPubClientRouter.get('/video-channels/:id/followers', - executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)), +activityPubClientRouter.get('/video-channels/:name/followers', + executeIfActivityPub(asyncMiddleware(localVideoChannelValidator)), executeIfActivityPub(asyncMiddleware(videoChannelFollowersController)) ) -activityPubClientRouter.get('/video-channels/:id/following', - executeIfActivityPub(asyncMiddleware(videoChannelsGetValidator)), +activityPubClientRouter.get('/video-channels/:name/following', + executeIfActivityPub(asyncMiddleware(localVideoChannelValidator)), executeIfActivityPub(asyncMiddleware(videoChannelFollowingController)) ) @@ -116,13 +124,14 @@ async function accountFollowingController (req: express.Request, res: express.Re async function videoController (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 audience = await getAudience(video.VideoChannel.Account.Actor, undefined, video.privacy === VideoPrivacy.PUBLIC) - const videoObject = audiencify(videoAll.toActivityPubObject(), audience) + // We need captions to render AP object + video.VideoCaptions = await VideoCaptionModel.listVideoCaptions(video.id) + + const audience = getAudience(video.VideoChannel.Account.Actor, video.privacy === VideoPrivacy.PUBLIC) + const videoObject = audiencify(video.toActivityPubObject(), audience) if (req.path.endsWith('/activity')) { - const data = await createActivityData(video.url, video.VideoChannel.Account.Actor, videoObject, undefined, audience) + const data = createActivityData(video.url, video.VideoChannel.Account.Actor, videoObject, audience) return activityPubResponse(activityPubContextify(data), res) } @@ -139,41 +148,45 @@ async function videoAnnounceController (req: express.Request, res: express.Respo 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() + const handler = async (start: number, count: number) => { + const result = await VideoShareModel.listAndCountByVideoId(video.id, start, count) + return { + total: result.count, + data: result.rows.map(r => r.url) + } + } + const json = await activityPubCollectionPagination(getVideoSharesActivityPubUrl(video), handler, req.query.page) - return activityPubResponse(activityPubContextify(object), res) + return activityPubResponse(activityPubContextify(json), res) } async function videoLikesController (req: express.Request, res: express.Response, next: express.NextFunction) { const video: VideoModel = res.locals.video + const json = await videoRates(req, 'like', video, getVideoLikesActivityPubUrl(video)) - // We need more attributes - const videoAll = await VideoModel.loadAndPopulateAll(video.id) - const { likesObject } = videoAll.toRatesActivityPubObjects() - - return activityPubResponse(activityPubContextify(likesObject), res) + return activityPubResponse(activityPubContextify(json), res) } async function videoDislikesController (req: express.Request, res: express.Response, next: express.NextFunction) { const video: VideoModel = res.locals.video + const json = await videoRates(req, 'dislike', video, getVideoDislikesActivityPubUrl(video)) - // We need more attributes - const videoAll = await VideoModel.loadAndPopulateAll(video.id) - const { dislikesObject } = videoAll.toRatesActivityPubObjects() - - return activityPubResponse(activityPubContextify(dislikesObject), res) + return activityPubResponse(activityPubContextify(json), 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() + const handler = async (start: number, count: number) => { + const result = await VideoCommentModel.listAndCountByVideoId(video.id, start, count) + return { + total: result.count, + data: result.rows.map(r => r.url) + } + } + const json = await activityPubCollectionPagination(getVideoCommentsActivityPubUrl(video), handler, req.query.page) - return activityPubResponse(activityPubContextify(commentsObject), res) + return activityPubResponse(activityPubContextify(json), res) } async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) { @@ -201,12 +214,12 @@ async function videoCommentController (req: express.Request, res: express.Respon const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined) const isPublic = true // Comments are always public - const audience = await getAudience(videoComment.Account.Actor, undefined, isPublic) + const audience = getAudience(videoComment.Account.Actor, 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) + const data = createActivityData(videoComment.url, videoComment.Account.Actor, videoCommentObject, audience) return activityPubResponse(activityPubContextify(data), res) } @@ -216,23 +229,28 @@ async function videoCommentController (req: express.Request, res: express.Respon // --------------------------------------------------------------------------- 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 handler = (start: number, count: number) => { + return ActorFollowModel.listAcceptedFollowingUrlsForApi([ actor.id ], undefined, start, count) + } - const result = await ActorFollowModel.listAcceptedFollowingUrlsForApi([ actor.id ], undefined, start, count) - return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result) + return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, handler, req.query.page) } 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 handler = (start: number, count: number) => { + return ActorFollowModel.listAcceptedFollowerUrlsForApi([ actor.id ], undefined, start, count) + } - const result = await ActorFollowModel.listAcceptedFollowerUrlsForApi([ actor.id ], undefined, start, count) - return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result) + return activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, handler, req.query.page) } -function activityPubResponse (data: any, res: express.Response) { - return res.type('application/activity+json; charset=utf-8') - .json(data) - .end() +function videoRates (req: express.Request, rateType: VideoRateType, video: VideoModel, url: string) { + const handler = async (start: number, count: number) => { + const result = await AccountVideoRateModel.listAndCountAccountUrlsByVideoId(rateType, video.id, start, count) + return { + total: result.count, + data: result.rows.map(r => r.Account.Actor.url) + } + } + return activityPubCollectionPagination(url, handler, req.query.page) }