forks
/
peertube
1
0
Fork 0
Code Releases Activity

Add missing channel playlists AP endpoint

This commit is contained in:
Chocobozzz 2020-05-13 14:49:11 +02:00
parent 63748ad005
commit 7405b6ba89
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/controllers/activitypub/client.ts
View File

@ -35,7 +35,7 @@ import { buildDislikeActivity } from '../../lib/activitypub/send/send-dislike'
import { videoPlaylistElementAPGetValidator, videoPlaylistsGetValidator } from '../../middlewares/validators/videos/video-playlists'
import { VideoPlaylistModel } from '../../models/video/video-playlist'
import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model'
import { MAccountId, MActorId, MVideoAPWithoutCaption, MVideoId } from '@server/typings/models'
import { MAccountId, MActorId, MVideoAPWithoutCaption, MVideoId, MChannelId } from '@server/typings/models'
import { getServerActor } from '@server/models/application/application'
import { getRateUrl } from '@server/lib/activitypub/video-rates'
@ -137,6 +137,11 @@ activityPubClientRouter.get('/video-channels/:name/following',
asyncMiddleware(localVideoChannelValidator),
asyncMiddleware(videoChannelFollowingController)
)
activityPubClientRouter.get('/video-channels/:name/playlists',
executeIfActivityPub,
asyncMiddleware(localVideoChannelValidator),
asyncMiddleware(videoChannelPlaylistsController)
)
activityPubClientRouter.get('/redundancy/videos/:videoId/:resolution([0-9]+)(-:fps([0-9]+))?',
executeIfActivityPub,
@ -190,7 +195,14 @@ async function accountFollowingController (req: express.Request, res: express.Re
async function accountPlaylistsController (req: express.Request, res: express.Response) {
const account = res.locals.account
const activityPubResult = await actorPlaylists(req, account)
const activityPubResult = await actorPlaylists(req, { account })
return activityPubResponse(activityPubContextify(activityPubResult), 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)
}
@ -381,9 +393,9 @@ async function actorFollowers (req: express.Request, actor: MActorId) {
return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page)
}
async function actorPlaylists (req: express.Request, account: MAccountId) {
async function actorPlaylists (req: express.Request, options: { account: MAccountId } | { channel: MChannelId }) {
const handler = (start: number, count: number) => {
return VideoPlaylistModel.listPublicUrlsOfForAP(account.id, start, count)
return VideoPlaylistModel.listPublicUrlsOfForAP(options, start, count)
}
return activityPubCollectionPagination(WEBSERVER.URL + req.path, handler, req.query.page)

20
server/models/video/video-playlist.ts
View File

@ -53,6 +53,7 @@ import {
MVideoPlaylistIdWithElements
} from '../../typings/models/video/video-playlist'
import { MThumbnail } from '../../typings/models/video/thumbnail'
import { MAccountId, MChannelId } from '@server/typings/models'
enum ScopeNames {
AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST',
@ -340,15 +341,24 @@ export class VideoPlaylistModel extends Model<VideoPlaylistModel> {
})
}
static listPublicUrlsOfForAP (accountId: number, start: number, count: number) {
static listPublicUrlsOfForAP (options: { account?: MAccountId, channel?: MChannelId }, start: number, count: number) {
const where = {
privacy: VideoPlaylistPrivacy.PUBLIC
}
if (options.account) {
Object.assign(where, { ownerAccountId: options.account.id })
}
if (options.channel) {
Object.assign(where, { videoChannelId: options.channel.id })
}
const query = {
attributes: [ 'url' ],
offset: start,
limit: count,
where: {
ownerAccountId: accountId,
privacy: VideoPlaylistPrivacy.PUBLIC
}
where
}
return VideoPlaylistModel.findAndCountAll(query)