-import * as express from 'express'
-import * as cors from 'cors'
+import cors from 'cors'
+import express from 'express'
+import { activityPubCollectionPagination } from '@server/lib/activitypub/collection'
+import { activityPubContextify } from '@server/lib/activitypub/context'
+import { getServerActor } from '@server/models/application/application'
+import { MAccountId, MActorId, MChannelId, MVideoId } from '@server/types/models'
import { VideoPrivacy, VideoRateType } from '../../../shared/models/videos'
-import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
+import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model'
import { ROUTE_CACHE_LIFETIME, WEBSERVER } from '../../initializers/constants'
-import { buildAnnounceWithVideoAudience, buildLikeActivity } from '../../lib/activitypub/send'
import { audiencify, getAudience } from '../../lib/activitypub/audience'
+import { buildAnnounceWithVideoAudience, buildLikeActivity } from '../../lib/activitypub/send'
import { buildCreateActivity } from '../../lib/activitypub/send/send-create'
+import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike'
+import {
+ getLocalVideoCommentsActivityPubUrl,
+ getLocalVideoDislikesActivityPubUrl,
+ getLocalVideoLikesActivityPubUrl,
+ getLocalVideoSharesActivityPubUrl
+} from '../../lib/activitypub/url'
import {
asyncMiddleware,
+ ensureIsLocalChannel,
executeIfActivityPub,
localAccountValidator,
- localVideoChannelValidator,
+ videoChannelsNameWithHostValidator,
videosCustomGetValidator,
videosShareValidator
} from '../../middlewares'
-import { getAccountVideoRateValidatorFactory, videoCommentGetValidator } from '../../middlewares/validators'
+import { cacheRoute } from '../../middlewares/cache/cache'
+import { getAccountVideoRateValidatorFactory, getVideoLocalViewerValidator, videoCommentGetValidator } from '../../middlewares/validators'
+import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy'
+import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists'
import { AccountModel } from '../../models/account/account'
-import { ActorFollowModel } from '../../models/activitypub/actor-follow'
-import { VideoModel } from '../../models/video/video'
-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/url'
+import { ActorFollowModel } from '../../models/actor/actor-follow'
import { VideoCaptionModel } from '../../models/video/video-caption'
-import { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator } from '../../middlewares/validators/redundancy'
-import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike'
-import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists'
+import { VideoCommentModel } from '../../models/video/video-comment'
import { VideoPlaylistModel } from '../../models/video/video-playlist'
-import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model'
-import { MAccountId, MActorId, MVideoAPWithoutCaption, MVideoId, MChannelId } from '@server/types/models'
-import { getServerActor } from '@server/models/application/application'
-import { getRateUrl } from '@server/lib/activitypub/video-rates'
+import { VideoShareModel } from '../../models/video/video-share'
+import { activityPubResponse } from './utils'
const activityPubClientRouter = express.Router()
activityPubClientRouter.use(cors())
// Intercept ActivityPub client requests
-activityPubClientRouter.get('/accounts?/:name',
+activityPubClientRouter.get(
+ [ '/accounts?/:name', '/accounts?/:name/video-channels', '/a/:name', '/a/:name/video-channels' ],
executeIfActivityPub,
asyncMiddleware(localAccountValidator),
accountController
)
activityPubClientRouter.get('/accounts?/:name/likes/:videoId',
executeIfActivityPub,
+ cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS),
asyncMiddleware(getAccountVideoRateValidatorFactory('like')),
getAccountVideoRateFactory('like')
)
activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId',
executeIfActivityPub,
+ cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS),
asyncMiddleware(getAccountVideoRateValidatorFactory('dislike')),
getAccountVideoRateFactory('dislike')
)
-activityPubClientRouter.get('/videos/watch/:id',
+activityPubClientRouter.get(
+ [ '/videos/watch/:id', '/w/:id' ],
executeIfActivityPub,
- asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS)),
- asyncMiddleware(videosCustomGetValidator('only-video-with-rights')),
+ cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS),
+ asyncMiddleware(videosCustomGetValidator('all')),
asyncMiddleware(videoController)
)
activityPubClientRouter.get('/videos/watch/:id/activity',
executeIfActivityPub,
- asyncMiddleware(videosCustomGetValidator('only-video-with-rights')),
+ asyncMiddleware(videosCustomGetValidator('all')),
asyncMiddleware(videoController)
)
activityPubClientRouter.get('/videos/watch/:id/announces',
asyncMiddleware(videoCommentController)
)
-activityPubClientRouter.get('/video-channels/:name',
+activityPubClientRouter.get(
+ [ '/video-channels/:nameWithHost', '/video-channels/:nameWithHost/videos', '/c/:nameWithHost', '/c/:nameWithHost/videos' ],
executeIfActivityPub,
- asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
videoChannelController
)
-activityPubClientRouter.get('/video-channels/:name/followers',
+activityPubClientRouter.get('/video-channels/:nameWithHost/followers',
executeIfActivityPub,
- asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
asyncMiddleware(videoChannelFollowersController)
)
-activityPubClientRouter.get('/video-channels/:name/following',
+activityPubClientRouter.get('/video-channels/:nameWithHost/following',
executeIfActivityPub,
- asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
asyncMiddleware(videoChannelFollowingController)
)
-activityPubClientRouter.get('/video-channels/:name/playlists',
+activityPubClientRouter.get('/video-channels/:nameWithHost/playlists',
executeIfActivityPub,
- asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
asyncMiddleware(videoChannelPlaylistsController)
)
asyncMiddleware(videoRedundancyController)
)
-activityPubClientRouter.get('/video-playlists/:playlistId',
+activityPubClientRouter.get(
+ [ '/video-playlists/:playlistId', '/videos/watch/playlist/:playlistId', '/w/p/:playlistId' ],
executeIfActivityPub,
asyncMiddleware(videoPlaylistsGetValidator('all')),
asyncMiddleware(videoPlaylistController)
videoPlaylistElementController
)
+activityPubClientRouter.get('/videos/local-viewer/:localViewerId',
+ executeIfActivityPub,
+ asyncMiddleware(getVideoLocalViewerValidator),
+ getVideoLocalViewerController
+)
+
// ---------------------------------------------------------------------------
export {
function accountController (req: express.Request, res: express.Response) {
const account = res.locals.account
- return activityPubResponse(activityPubContextify(account.toActivityPubObject()), res)
+ return activityPubResponse(activityPubContextify(account.toActivityPubObject(), 'Actor'), res)
}
async function accountFollowersController (req: express.Request, res: express.Response) {
const account = res.locals.account
const activityPubResult = await actorFollowers(req, account.Actor)
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
async function accountFollowingController (req: express.Request, res: express.Response) {
const account = res.locals.account
const activityPubResult = await actorFollowing(req, account.Actor)
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
async function accountPlaylistsController (req: express.Request, res: express.Response) {
const account = res.locals.account
const activityPubResult = await actorPlaylists(req, { account })
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
async function videoChannelPlaylistsController (req: express.Request, res: express.Response) {
const channel = res.locals.videoChannel
const activityPubResult = await actorPlaylists(req, { channel })
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
function getAccountVideoRateFactory (rateType: VideoRateType) {
const accountVideoRate = res.locals.accountVideoRate
const byActor = accountVideoRate.Account.Actor
- const url = getRateUrl(rateType, byActor, accountVideoRate.Video)
const APObject = rateType === 'like'
- ? buildLikeActivity(url, byActor, accountVideoRate.Video)
- : buildDislikeActivity(url, byActor, accountVideoRate.Video)
+ ? buildLikeActivity(accountVideoRate.url, byActor, accountVideoRate.Video)
+ : buildDislikeActivity(accountVideoRate.url, byActor, accountVideoRate.Video)
- return activityPubResponse(activityPubContextify(APObject), res)
+ return activityPubResponse(activityPubContextify(APObject, 'Rate'), res)
}
}
async function videoController (req: express.Request, res: express.Response) {
- // We need more attributes
- const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(res.locals.onlyVideoWithRights.id)
+ const video = res.locals.videoAll
- if (video.url.startsWith(WEBSERVER.URL) === false) return res.redirect(video.url)
+ if (redirectIfNotOwned(video.url, res)) return
// We need captions to render AP object
const captions = await VideoCaptionModel.listVideoCaptions(video.id)
if (req.path.endsWith('/activity')) {
const data = buildCreateActivity(videoWithCaptions.url, video.VideoChannel.Account.Actor, videoObject, audience)
- return activityPubResponse(activityPubContextify(data), res)
+ return activityPubResponse(activityPubContextify(data, 'Video'), res)
}
- return activityPubResponse(activityPubContextify(videoObject), res)
+ return activityPubResponse(activityPubContextify(videoObject, 'Video'), res)
}
async function videoAnnounceController (req: express.Request, res: express.Response) {
const share = res.locals.videoShare
- if (share.url.startsWith(WEBSERVER.URL) === false) return res.redirect(share.url)
+ if (redirectIfNotOwned(share.url, res)) return
const { activity } = await buildAnnounceWithVideoAudience(share.Actor, share, res.locals.videoAll, undefined)
async function videoAnnouncesController (req: express.Request, res: express.Response) {
const video = res.locals.onlyImmutableVideo
+ if (redirectIfNotOwned(video.url, res)) return
+
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)
+ total: result.total,
+ data: result.data.map(r => r.url)
}
}
- const json = await activityPubCollectionPagination(getVideoSharesActivityPubUrl(video), handler, req.query.page)
+ const json = await activityPubCollectionPagination(getLocalVideoSharesActivityPubUrl(video), handler, req.query.page)
- return activityPubResponse(activityPubContextify(json), res)
+ return activityPubResponse(activityPubContextify(json, 'Collection'), res)
}
async function videoLikesController (req: express.Request, res: express.Response) {
const video = res.locals.onlyImmutableVideo
- const json = await videoRates(req, 'like', video, getVideoLikesActivityPubUrl(video))
- return activityPubResponse(activityPubContextify(json), res)
+ if (redirectIfNotOwned(video.url, res)) return
+
+ const json = await videoRates(req, 'like', video, getLocalVideoLikesActivityPubUrl(video))
+
+ return activityPubResponse(activityPubContextify(json, 'Collection'), res)
}
async function videoDislikesController (req: express.Request, res: express.Response) {
const video = res.locals.onlyImmutableVideo
- const json = await videoRates(req, 'dislike', video, getVideoDislikesActivityPubUrl(video))
- return activityPubResponse(activityPubContextify(json), res)
+ if (redirectIfNotOwned(video.url, res)) return
+
+ const json = await videoRates(req, 'dislike', video, getLocalVideoDislikesActivityPubUrl(video))
+
+ return activityPubResponse(activityPubContextify(json, 'Collection'), res)
}
async function videoCommentsController (req: express.Request, res: express.Response) {
const video = res.locals.onlyImmutableVideo
+ if (redirectIfNotOwned(video.url, res)) return
+
const handler = async (start: number, count: number) => {
const result = await VideoCommentModel.listAndCountByVideoForAP(video, start, count)
+
return {
- total: result.count,
- data: result.rows.map(r => r.url)
+ total: result.total,
+ data: result.data.map(r => r.url)
}
}
- const json = await activityPubCollectionPagination(getVideoCommentsActivityPubUrl(video), handler, req.query.page)
+ const json = await activityPubCollectionPagination(getLocalVideoCommentsActivityPubUrl(video), handler, req.query.page)
- return activityPubResponse(activityPubContextify(json), res)
+ return activityPubResponse(activityPubContextify(json, 'Collection'), res)
}
function videoChannelController (req: express.Request, res: express.Response) {
const videoChannel = res.locals.videoChannel
- return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject()), res)
+ return activityPubResponse(activityPubContextify(videoChannel.toActivityPubObject(), 'Actor'), res)
}
async function videoChannelFollowersController (req: express.Request, res: express.Response) {
const videoChannel = res.locals.videoChannel
const activityPubResult = await actorFollowers(req, videoChannel.Actor)
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
async function videoChannelFollowingController (req: express.Request, res: express.Response) {
const videoChannel = res.locals.videoChannel
const activityPubResult = await actorFollowing(req, videoChannel.Actor)
- return activityPubResponse(activityPubContextify(activityPubResult), res)
+ return activityPubResponse(activityPubContextify(activityPubResult, 'Collection'), res)
}
async function videoCommentController (req: express.Request, res: express.Response) {
const videoComment = res.locals.videoCommentFull
- if (videoComment.url.startsWith(WEBSERVER.URL) === false) return res.redirect(videoComment.url)
+ if (redirectIfNotOwned(videoComment.url, res)) return
const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined)
const isPublic = true // Comments are always public
if (req.path.endsWith('/activity')) {
const data = buildCreateActivity(videoComment.url, videoComment.Account.Actor, videoCommentObject, audience)
- return activityPubResponse(activityPubContextify(data), res)
+ return activityPubResponse(activityPubContextify(data, 'Comment'), res)
}
}
- return activityPubResponse(activityPubContextify(videoCommentObject), res)
+ return activityPubResponse(activityPubContextify(videoCommentObject, 'Comment'), res)
}
async function videoRedundancyController (req: express.Request, res: express.Response) {
const videoRedundancy = res.locals.videoRedundancy
- if (videoRedundancy.url.startsWith(WEBSERVER.URL) === false) return res.redirect(videoRedundancy.url)
+
+ if (redirectIfNotOwned(videoRedundancy.url, res)) return
const serverActor = await getServerActor()
async function videoPlaylistController (req: express.Request, res: express.Response) {
const playlist = res.locals.videoPlaylistFull
+ if (redirectIfNotOwned(playlist.url, res)) return
+
// We need more attributes
playlist.OwnerAccount = await AccountModel.load(playlist.ownerAccountId)
const audience = getAudience(playlist.OwnerAccount.Actor, playlist.privacy === VideoPlaylistPrivacy.PUBLIC)
const object = audiencify(json, audience)
- return activityPubResponse(activityPubContextify(object), res)
+ return activityPubResponse(activityPubContextify(object, 'Playlist'), res)
}
function videoPlaylistElementController (req: express.Request, res: express.Response) {
const videoPlaylistElement = res.locals.videoPlaylistElementAP
+ if (redirectIfNotOwned(videoPlaylistElement.url, res)) return
+
const json = videoPlaylistElement.toActivityPubObject()
- return activityPubResponse(activityPubContextify(json), res)
+ return activityPubResponse(activityPubContextify(json, 'Playlist'), res)
+}
+
+function getVideoLocalViewerController (req: express.Request, res: express.Response) {
+ const localViewer = res.locals.localViewerFull
+
+ return activityPubResponse(activityPubContextify(localViewer.toActivityPubObject(), 'WatchAction'), res)
}
// ---------------------------------------------------------------------------
-async function actorFollowing (req: express.Request, actor: MActorId) {
+function actorFollowing (req: express.Request, actor: MActorId) {
const handler = (start: number, count: number) => {
return ActorFollowModel.listAcceptedFollowingUrlsForApi([ actor.id ], undefined, start, count)
}
return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page)
}
-async function actorFollowers (req: express.Request, actor: MActorId) {
+function actorFollowers (req: express.Request, actor: MActorId) {
const handler = (start: number, count: number) => {
return ActorFollowModel.listAcceptedFollowerUrlsForAP([ actor.id ], undefined, start, count)
}
return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page)
}
-async function actorPlaylists (req: express.Request, options: { account: MAccountId } | { channel: MChannelId }) {
+function actorPlaylists (req: express.Request, options: { account: MAccountId } | { channel: MChannelId }) {
const handler = (start: number, count: number) => {
return VideoPlaylistModel.listPublicUrlsOfForAP(options, start, count)
}
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.url)
+ total: result.total,
+ data: result.data.map(r => r.url)
}
}
return activityPubCollectionPagination(url, handler, req.query.page)
}
+
+function redirectIfNotOwned (url: string, res: express.Response) {
+ if (url.startsWith(WEBSERVER.URL) === false) {
+ res.redirect(url)
+ return true
+ }
+
+ return false
+}
projects / github / Chocobozzz / PeerTube.git / blobdiff