X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideo-channel.ts;h=2f869d9b3d84e3cf1b47dec08e14282c71846b51;hb=d0800f7661f13fabe7bb6f4aa0ea50764f106405;hp=45c936978779fec268e67eb83a444d6e8919c6b9;hpb=1e7eb457eda647b4fa22a0ae8e59c0a618f662f8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 45c936978..2f869d9b3 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -1,7 +1,12 @@ -import * as express from 'express' +import express from 'express' +import { pickCommonVideoQuery } from '@server/helpers/query' +import { getBiggestActorImage } from '@server/lib/actor-image' +import { Hooks } from '@server/lib/plugins/hooks' +import { ActorFollowModel } from '@server/models/actor/actor-follow' import { getServerActor } from '@server/models/application/application' -import { MChannelAccountDefault } from '@server/types/models' -import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared' +import { guessAdditionalAttributesFromQuery } from '@server/models/video/formatter/video-format-utils' +import { MChannelBannerAccountDefault } from '@server/types/models' +import { ActorImageType, HttpStatusCode, VideoChannelCreate, VideoChannelUpdate } from '@shared/models' import { auditLoggerFactory, getAuditIdFromRes, VideoChannelAuditView } from '../../helpers/audit-logger' import { resetSequelizeInstance } from '../../helpers/database-utils' import { buildNSFWFilter, createReqFiles, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils' @@ -10,16 +15,16 @@ import { getFormattedObjects } from '../../helpers/utils' import { CONFIG } from '../../initializers/config' import { MIMETYPES } from '../../initializers/constants' import { sequelizeTypescript } from '../../initializers/database' -import { setAsyncActorKeys } from '../../lib/activitypub/actor' import { sendUpdateActor } from '../../lib/activitypub/send' -import { updateActorAvatarFile } from '../../lib/avatar' import { JobQueue } from '../../lib/job-queue' +import { deleteLocalActorImageFile, updateLocalActorImageFiles } from '../../lib/local-actor' import { createLocalVideoChannel, federateAllVideosOfChannel } from '../../lib/video-channel' import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, commonVideosFiltersValidator, + ensureCanManageChannel, optionalAuthenticate, paginationValidator, setDefaultPagination, @@ -31,8 +36,14 @@ import { videoChannelsUpdateValidator, videoPlaylistsSortValidator } from '../../middlewares' -import { videoChannelsNameWithHostValidator, videoChannelsOwnSearchValidator, videosSortValidator } from '../../middlewares/validators' -import { updateAvatarValidator } from '../../middlewares/validators/avatar' +import { + ensureIsLocalChannel, + videoChannelsFollowersSortValidator, + videoChannelsListValidator, + videoChannelsNameWithHostValidator, + videosSortValidator +} from '../../middlewares/validators' +import { updateAvatarValidator, updateBannerValidator } from '../../middlewares/validators/actor-image' import { commonVideoPlaylistFiltersValidator } from '../../middlewares/validators/videos/video-playlists' import { AccountModel } from '../../models/account/account' import { VideoModel } from '../../models/video/video' @@ -41,6 +52,7 @@ import { VideoPlaylistModel } from '../../models/video/video-playlist' const auditLogger = auditLoggerFactory('channels') const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) +const reqBannerFile = createReqFiles([ 'bannerfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { bannerfile: CONFIG.STORAGE.TMP_DIR }) const videoChannelRouter = express.Router() @@ -49,7 +61,7 @@ videoChannelRouter.get('/', videoChannelsSortValidator, setDefaultSort, setDefaultPagination, - videoChannelsOwnSearchValidator, + videoChannelsListValidator, asyncMiddleware(listVideoChannels) ) @@ -62,27 +74,60 @@ videoChannelRouter.post('/', videoChannelRouter.post('/:nameWithHost/avatar/pick', authenticate, reqAvatarFile, - // Check the rights - asyncMiddleware(videoChannelsUpdateValidator), + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, updateAvatarValidator, asyncMiddleware(updateVideoChannelAvatar) ) +videoChannelRouter.post('/:nameWithHost/banner/pick', + authenticate, + reqBannerFile, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, + updateBannerValidator, + asyncMiddleware(updateVideoChannelBanner) +) + +videoChannelRouter.delete('/:nameWithHost/avatar', + authenticate, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, + asyncMiddleware(deleteVideoChannelAvatar) +) + +videoChannelRouter.delete('/:nameWithHost/banner', + authenticate, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, + asyncMiddleware(deleteVideoChannelBanner) +) + videoChannelRouter.put('/:nameWithHost', authenticate, - asyncMiddleware(videoChannelsUpdateValidator), + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, + videoChannelsUpdateValidator, asyncRetryTransactionMiddleware(updateVideoChannel) ) videoChannelRouter.delete('/:nameWithHost', authenticate, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureIsLocalChannel, + ensureCanManageChannel, asyncMiddleware(videoChannelsRemoveValidator), asyncRetryTransactionMiddleware(removeVideoChannel) ) videoChannelRouter.get('/:nameWithHost', asyncMiddleware(videoChannelsNameWithHostValidator), - asyncMiddleware(getVideoChannel) + getVideoChannel ) videoChannelRouter.get('/:nameWithHost/video-playlists', @@ -106,6 +151,17 @@ videoChannelRouter.get('/:nameWithHost/videos', asyncMiddleware(listVideoChannelVideos) ) +videoChannelRouter.get('/:nameWithHost/followers', + authenticate, + asyncMiddleware(videoChannelsNameWithHostValidator), + ensureCanManageChannel, + paginationValidator, + videoChannelsFollowersSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(listVideoChannelFollowers) +) + // --------------------------------------------------------------------------- export { @@ -126,20 +182,51 @@ async function listVideoChannels (req: express.Request, res: express.Response) { return res.json(getFormattedObjects(resultList.data, resultList.total)) } +async function updateVideoChannelBanner (req: express.Request, res: express.Response) { + const bannerPhysicalFile = req.files['bannerfile'][0] + const videoChannel = res.locals.videoChannel + const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON()) + + const banners = await updateLocalActorImageFiles(videoChannel, bannerPhysicalFile, ActorImageType.BANNER) + + auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) + + return res.json({ + // TODO: remove, deprecated in 4.2 + banner: getBiggestActorImage(banners).toFormattedJSON(), + banners: banners.map(b => b.toFormattedJSON()) + }) +} + async function updateVideoChannelAvatar (req: express.Request, res: express.Response) { const avatarPhysicalFile = req.files['avatarfile'][0] const videoChannel = res.locals.videoChannel const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON()) - const avatar = await updateActorAvatarFile(avatarPhysicalFile, videoChannel) - + const avatars = await updateLocalActorImageFiles(videoChannel, avatarPhysicalFile, ActorImageType.AVATAR) auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) - return res - .json({ - avatar: avatar.toFormattedJSON() - }) - .end() + return res.json({ + // TODO: remove, deprecated in 4.2 + avatar: getBiggestActorImage(avatars).toFormattedJSON(), + avatars: avatars.map(a => a.toFormattedJSON()) + }) +} + +async function deleteVideoChannelAvatar (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel + + await deleteLocalActorImageFile(videoChannel, ActorImageType.AVATAR) + + return res.status(HttpStatusCode.NO_CONTENT_204).end() +} + +async function deleteVideoChannelBanner (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel + + await deleteLocalActorImageFile(videoChannel, ActorImageType.BANNER) + + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function addVideoChannel (req: express.Request, res: express.Response) { @@ -151,8 +238,8 @@ async function addVideoChannel (req: express.Request, res: express.Response) { return createLocalVideoChannel(videoChannelInfo, account, t) }) - setAsyncActorKeys(videoChannelCreated.Actor) - .catch(err => logger.error('Cannot set async actor keys for account %s.', videoChannelCreated.Actor.url, { err })) + const payload = { actorId: videoChannelCreated.actorId } + await JobQueue.Instance.createJobWithPromise({ type: 'actor-keys', payload }) auditLogger.create(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannelCreated.toFormattedJSON())) logger.info('Video channel %s created.', videoChannelCreated.Actor.url) @@ -161,7 +248,7 @@ async function addVideoChannel (req: express.Request, res: express.Response) { videoChannel: { id: videoChannelCreated.id } - }).end() + }) } async function updateVideoChannel (req: express.Request, res: express.Response) { @@ -173,10 +260,6 @@ async function updateVideoChannel (req: express.Request, res: express.Response) try { await sequelizeTypescript.transaction(async t => { - const sequelizeOptions = { - transaction: t - } - if (videoChannelInfoToUpdate.displayName !== undefined) videoChannelInstance.name = videoChannelInfoToUpdate.displayName if (videoChannelInfoToUpdate.description !== undefined) videoChannelInstance.description = videoChannelInfoToUpdate.description @@ -190,7 +273,7 @@ async function updateVideoChannel (req: express.Request, res: express.Response) } } - const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions) as MChannelAccountDefault + const videoChannelInstanceUpdated = await videoChannelInstance.save({ transaction: t }) as MChannelBannerAccountDefault await sendUpdateActor(videoChannelInstanceUpdated, t) auditLogger.update( @@ -212,7 +295,7 @@ async function updateVideoChannel (req: express.Request, res: express.Response) throw err } - res.type('json').status(204).end() + res.type('json').status(HttpStatusCode.NO_CONTENT_204).end() // Don't process in a transaction, and after the response because it could be long if (doBulkVideoUpdate) { @@ -232,17 +315,17 @@ async function removeVideoChannel (req: express.Request, res: express.Response) logger.info('Video channel %s deleted.', videoChannelInstance.Actor.url) }) - return res.type('json').status(204).end() + return res.type('json').status(HttpStatusCode.NO_CONTENT_204).end() } -async function getVideoChannel (req: express.Request, res: express.Response) { - const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id) +function getVideoChannel (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel - if (videoChannelWithVideos.isOutdated()) { - JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannelWithVideos.Actor.url } }) + if (videoChannel.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannel.Actor.url } }) } - return res.json(videoChannelWithVideos.toFormattedJSON()) + return res.json(videoChannel.toFormattedJSON()) } async function listVideoChannelPlaylists (req: express.Request, res: express.Response) { @@ -261,27 +344,49 @@ async function listVideoChannelPlaylists (req: express.Request, res: express.Res } async function listVideoChannelVideos (req: express.Request, res: express.Response) { + const serverActor = await getServerActor() + const videoChannelInstance = res.locals.videoChannel - const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined + + const displayOnlyForFollower = isUserAbleToSearchRemoteURI(res) + ? null + : { + actorId: serverActor.id, + orLocalVideos: true + } + const countVideos = getCountVideos(req) + const query = pickCommonVideoQuery(req.query) - const resultList = await VideoModel.listForApi({ - followerActorId, - start: req.query.start, - count: req.query.count, - sort: req.query.sort, - includeLocalVideos: true, - categoryOneOf: req.query.categoryOneOf, - licenceOneOf: req.query.licenceOneOf, - languageOneOf: req.query.languageOneOf, - tagsOneOf: req.query.tagsOneOf, - tagsAllOf: req.query.tagsAllOf, - filter: req.query.filter, - nsfw: buildNSFWFilter(res, req.query.nsfw), - withFiles: false, + const apiOptions = await Hooks.wrapObject({ + ...query, + + displayOnlyForFollower, + nsfw: buildNSFWFilter(res, query.nsfw), videoChannelId: videoChannelInstance.id, user: res.locals.oauth ? res.locals.oauth.token.User : undefined, countVideos + }, 'filter:api.video-channels.videos.list.params') + + const resultList = await Hooks.wrapPromiseFun( + VideoModel.listForApi, + apiOptions, + 'filter:api.video-channels.videos.list.result' + ) + + return res.json(getFormattedObjects(resultList.data, resultList.total, guessAdditionalAttributesFromQuery(query))) +} + +async function listVideoChannelFollowers (req: express.Request, res: express.Response) { + const channel = res.locals.videoChannel + + const resultList = await ActorFollowModel.listFollowersForApi({ + actorIds: [ channel.actorId ], + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + search: req.query.search, + state: 'accepted' }) return res.json(getFormattedObjects(resultList.data, resultList.total))