X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideo-channel.ts;h=a755d7e5724fa13df0a019fec068b65c0e26faa4;hb=c7027c06e9a73dad99d3f9bd9937a41a763850ce;hp=6241aaa5cbac730e98b3cb34839f615e89947e5d;hpb=cc918ac3f45e32f031cce7b6e0473e5c2c34b8ae;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 6241aaa5c..a755d7e57 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -1,30 +1,48 @@ import * as express from 'express' -import { getFormattedObjects, resetSequelizeInstance } from '../../helpers/utils' +import { Hooks } from '@server/lib/plugins/hooks' +import { getServerActor } from '@server/models/application/application' +import { MChannelBannerAccountDefault } from '@server/types/models' +import { ActorImageType, VideoChannelCreate, VideoChannelUpdate, VideosCommonQuery } from '../../../shared' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' +import { auditLoggerFactory, getAuditIdFromRes, VideoChannelAuditView } from '../../helpers/audit-logger' +import { resetSequelizeInstance } from '../../helpers/database-utils' +import { buildNSFWFilter, createReqFiles, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils' +import { logger } from '../../helpers/logger' +import { getFormattedObjects } from '../../helpers/utils' +import { CONFIG } from '../../initializers/config' +import { MIMETYPES } from '../../initializers/constants' +import { sequelizeTypescript } from '../../initializers/database' +import { sendUpdateActor } from '../../lib/activitypub/send' +import { deleteLocalActorImageFile, updateLocalActorImageFile } from '../../lib/actor-image' +import { JobQueue } from '../../lib/job-queue' +import { createLocalVideoChannel, federateAllVideosOfChannel } from '../../lib/video-channel' import { asyncMiddleware, + asyncRetryTransactionMiddleware, authenticate, + commonVideosFiltersValidator, optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort, + setDefaultVideosSort, videoChannelsAddValidator, - videoChannelsGetValidator, videoChannelsRemoveValidator, videoChannelsSortValidator, - videoChannelsUpdateValidator + videoChannelsUpdateValidator, + videoPlaylistsSortValidator } from '../../middlewares' -import { VideoChannelModel } from '../../models/video/video-channel' -import { videosSortValidator } from '../../middlewares/validators' -import { sendUpdateActor } from '../../lib/activitypub/send' -import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared' -import { createVideoChannel } from '../../lib/video-channel' -import { isNSFWHidden } from '../../helpers/express-utils' -import { setAsyncActorKeys } from '../../lib/activitypub' -import { retryTransactionWrapper } from '../../helpers/database-utils' +import { videoChannelsNameWithHostValidator, videoChannelsOwnSearchValidator, 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 { sequelizeTypescript } from '../../initializers' -import { logger } from '../../helpers/logger' import { VideoModel } from '../../models/video/video' +import { VideoChannelModel } from '../../models/video/video-channel' +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() @@ -33,39 +51,83 @@ videoChannelRouter.get('/', videoChannelsSortValidator, setDefaultSort, setDefaultPagination, + videoChannelsOwnSearchValidator, asyncMiddleware(listVideoChannels) ) videoChannelRouter.post('/', authenticate, - videoChannelsAddValidator, - asyncMiddleware(addVideoChannelRetryWrapper) + asyncMiddleware(videoChannelsAddValidator), + asyncRetryTransactionMiddleware(addVideoChannel) +) + +videoChannelRouter.post('/:nameWithHost/avatar/pick', + authenticate, + reqAvatarFile, + // Check the rights + asyncMiddleware(videoChannelsUpdateValidator), + updateAvatarValidator, + asyncMiddleware(updateVideoChannelAvatar) +) + +videoChannelRouter.post('/:nameWithHost/banner/pick', + authenticate, + reqBannerFile, + // Check the rights + asyncMiddleware(videoChannelsUpdateValidator), + updateBannerValidator, + asyncMiddleware(updateVideoChannelBanner) +) + +videoChannelRouter.delete('/:nameWithHost/avatar', + authenticate, + // Check the rights + asyncMiddleware(videoChannelsUpdateValidator), + asyncMiddleware(deleteVideoChannelAvatar) ) -videoChannelRouter.put('/:id', +videoChannelRouter.delete('/:nameWithHost/banner', authenticate, + // Check the rights asyncMiddleware(videoChannelsUpdateValidator), - updateVideoChannelRetryWrapper + asyncMiddleware(deleteVideoChannelBanner) ) -videoChannelRouter.delete('/:id', +videoChannelRouter.put('/:nameWithHost', + authenticate, + asyncMiddleware(videoChannelsUpdateValidator), + asyncRetryTransactionMiddleware(updateVideoChannel) +) + +videoChannelRouter.delete('/:nameWithHost', authenticate, asyncMiddleware(videoChannelsRemoveValidator), - asyncMiddleware(removeVideoChannelRetryWrapper) + asyncRetryTransactionMiddleware(removeVideoChannel) ) -videoChannelRouter.get('/:id', - asyncMiddleware(videoChannelsGetValidator), +videoChannelRouter.get('/:nameWithHost', + asyncMiddleware(videoChannelsNameWithHostValidator), asyncMiddleware(getVideoChannel) ) -videoChannelRouter.get('/:id/videos', - asyncMiddleware(videoChannelsGetValidator), +videoChannelRouter.get('/:nameWithHost/video-playlists', + asyncMiddleware(videoChannelsNameWithHostValidator), paginationValidator, - videosSortValidator, + videoPlaylistsSortValidator, setDefaultSort, setDefaultPagination, + commonVideoPlaylistFiltersValidator, + asyncMiddleware(listVideoChannelPlaylists) +) + +videoChannelRouter.get('/:nameWithHost/videos', + asyncMiddleware(videoChannelsNameWithHostValidator), + paginationValidator, + videosSortValidator, + setDefaultVideosSort, + setDefaultPagination, optionalAuthenticate, + commonVideosFiltersValidator, asyncMiddleware(listVideoChannelVideos) ) @@ -77,60 +139,85 @@ export { // --------------------------------------------------------------------------- -async function listVideoChannels (req: express.Request, res: express.Response, next: express.NextFunction) { - const resultList = await VideoChannelModel.listForApi(req.query.start, req.query.count, req.query.sort) +async function listVideoChannels (req: express.Request, res: express.Response) { + const serverActor = await getServerActor() + const resultList = await VideoChannelModel.listForApi({ + actorId: serverActor.id, + start: req.query.start, + count: req.query.count, + sort: req.query.sort + }) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -// Wrapper to video channel add that retry the async function if there is a database error -// We need this because we run the transaction in SERIALIZABLE isolation that can fail -async function addVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res ], - errorMessage: 'Cannot insert the video video channel with many retries.' - } +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 videoChannel = await retryTransactionWrapper(addVideoChannel, options) - return res.json({ - videoChannel: { - id: videoChannel.id, - uuid: videoChannel.Actor.uuid - } - }).end() + const banner = await updateLocalActorImageFile(videoChannel, bannerPhysicalFile, ActorImageType.BANNER) + + auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) + + return res.json({ banner: banner.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()) -async function addVideoChannel (req: express.Request, res: express.Response) { - const videoChannelInfo: VideoChannelCreate = req.body - const account: AccountModel = res.locals.oauth.token.User.Account + const avatar = await updateLocalActorImageFile(videoChannel, avatarPhysicalFile, ActorImageType.AVATAR) - const videoChannelCreated: VideoChannelModel = await sequelizeTypescript.transaction(async t => { - return createVideoChannel(videoChannelInfo, account, t) - }) + auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) + + return res.json({ avatar: avatar.toFormattedJSON() }) +} - setAsyncActorKeys(videoChannelCreated.Actor) - .catch(err => logger.error('Cannot set async actor keys for account %s.', videoChannelCreated.Actor.uuid, { err })) +async function deleteVideoChannelAvatar (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel - logger.info('Video channel with uuid %s created.', videoChannelCreated.Actor.uuid) + await deleteLocalActorImageFile(videoChannel, ActorImageType.AVATAR) - return videoChannelCreated + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } -async function updateVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res ], - errorMessage: 'Cannot update the video with many retries.' - } +async function deleteVideoChannelBanner (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel + + await deleteLocalActorImageFile(videoChannel, ActorImageType.BANNER) + + return res.sendStatus(HttpStatusCode.NO_CONTENT_204) +} + +async function addVideoChannel (req: express.Request, res: express.Response) { + const videoChannelInfo: VideoChannelCreate = req.body + + const videoChannelCreated = await sequelizeTypescript.transaction(async t => { + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) + + return createLocalVideoChannel(videoChannelInfo, account, t) + }) - await retryTransactionWrapper(updateVideoChannel, options) + const payload = { actorId: videoChannelCreated.actorId } + await JobQueue.Instance.createJobWithPromise({ type: 'actor-keys', payload }) - return res.type('json').status(204).end() + auditLogger.create(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannelCreated.toFormattedJSON())) + logger.info('Video channel %s created.', videoChannelCreated.Actor.url) + + return res.json({ + videoChannel: { + id: videoChannelCreated.id + } + }) } async function updateVideoChannel (req: express.Request, res: express.Response) { - const videoChannelInstance = res.locals.videoChannel as VideoChannelModel + const videoChannelInstance = res.locals.videoChannel const videoChannelFieldsSave = videoChannelInstance.toJSON() + const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannelInstance.toFormattedJSON()) const videoChannelInfoToUpdate = req.body as VideoChannelUpdate + let doBulkVideoUpdate = false try { await sequelizeTypescript.transaction(async t => { @@ -138,15 +225,30 @@ async function updateVideoChannel (req: express.Request, res: express.Response) transaction: t } - if (videoChannelInfoToUpdate.name !== undefined) videoChannelInstance.set('name', videoChannelInfoToUpdate.name) - if (videoChannelInfoToUpdate.description !== undefined) videoChannelInstance.set('description', videoChannelInfoToUpdate.description) - if (videoChannelInfoToUpdate.support !== undefined) videoChannelInstance.set('support', videoChannelInfoToUpdate.support) + if (videoChannelInfoToUpdate.displayName !== undefined) videoChannelInstance.name = videoChannelInfoToUpdate.displayName + if (videoChannelInfoToUpdate.description !== undefined) videoChannelInstance.description = videoChannelInfoToUpdate.description - const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions) + if (videoChannelInfoToUpdate.support !== undefined) { + const oldSupportField = videoChannelInstance.support + videoChannelInstance.support = videoChannelInfoToUpdate.support + + if (videoChannelInfoToUpdate.bulkVideosSupportUpdate === true && oldSupportField !== videoChannelInfoToUpdate.support) { + doBulkVideoUpdate = true + await VideoModel.bulkUpdateSupportField(videoChannelInstance, t) + } + } + + const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions) as MChannelBannerAccountDefault await sendUpdateActor(videoChannelInstanceUpdated, t) - }) - logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.Actor.uuid) + auditLogger.update( + getAuditIdFromRes(res), + new VideoChannelAuditView(videoChannelInstanceUpdated.toFormattedJSON()), + oldVideoChannelAuditKeys + ) + + logger.info('Video channel %s updated.', videoChannelInstance.Actor.url) + }) } catch (err) { logger.debug('Cannot update the video channel.', { err }) @@ -157,47 +259,85 @@ async function updateVideoChannel (req: express.Request, res: express.Response) throw err } -} -async function removeVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { - const options = { - arguments: [ req, res ], - errorMessage: 'Cannot remove the video channel with many retries.' - } + res.type('json').status(HttpStatusCode.NO_CONTENT_204).end() - await retryTransactionWrapper(removeVideoChannel, options) - - return res.type('json').status(204).end() + // Don't process in a transaction, and after the response because it could be long + if (doBulkVideoUpdate) { + await federateAllVideosOfChannel(videoChannelInstance) + } } async function removeVideoChannel (req: express.Request, res: express.Response) { - const videoChannelInstance: VideoChannelModel = res.locals.videoChannel + const videoChannelInstance = res.locals.videoChannel + + await sequelizeTypescript.transaction(async t => { + await VideoPlaylistModel.resetPlaylistsOfChannel(videoChannelInstance.id, t) - return sequelizeTypescript.transaction(async t => { await videoChannelInstance.destroy({ transaction: t }) - logger.info('Video channel with name %s and uuid %s deleted.', videoChannelInstance.name, videoChannelInstance.Actor.uuid) + auditLogger.delete(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannelInstance.toFormattedJSON())) + logger.info('Video channel %s deleted.', videoChannelInstance.Actor.url) }) + return res.type('json').status(HttpStatusCode.NO_CONTENT_204).end() } -async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id) +async function getVideoChannel (req: express.Request, res: express.Response) { + const videoChannel = res.locals.videoChannel + + 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 listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const videoChannelInstance: VideoChannelModel = res.locals.videoChannel +async function listVideoChannelPlaylists (req: express.Request, res: express.Response) { + const serverActor = await getServerActor() - const resultList = await VideoModel.listForApi({ + const resultList = await VideoPlaylistModel.listForApi({ + followerActorId: serverActor.id, start: req.query.start, count: req.query.count, sort: req.query.sort, - hideNSFW: isNSFWHidden(res), - withFiles: false, - videoChannelId: videoChannelInstance.id + videoChannelId: res.locals.videoChannel.id, + type: req.query.playlistType }) return res.json(getFormattedObjects(resultList.data, resultList.total)) } + +async function listVideoChannelVideos (req: express.Request, res: express.Response) { + const videoChannelInstance = res.locals.videoChannel + const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined + const countVideos = getCountVideos(req) + const query = req.query as VideosCommonQuery + + const apiOptions = await Hooks.wrapObject({ + followerActorId, + start: query.start, + count: query.count, + sort: query.sort, + includeLocalVideos: true, + categoryOneOf: query.categoryOneOf, + licenceOneOf: query.licenceOneOf, + languageOneOf: query.languageOneOf, + tagsOneOf: query.tagsOneOf, + tagsAllOf: query.tagsAllOf, + filter: query.filter, + nsfw: buildNSFWFilter(res, query.nsfw), + withFiles: false, + 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)) +}