import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
- authenticate,
+ authenticate, commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
import { sendUpdateActor } from '../../lib/activitypub/send'
import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared'
import { createVideoChannel } from '../../lib/video-channel'
-import { isNSFWHidden } from '../../helpers/express-utils'
+import { createReqFiles, buildNSFWFilter } from '../../helpers/express-utils'
import { setAsyncActorKeys } from '../../lib/activitypub'
import { AccountModel } from '../../models/account/account'
-import { sequelizeTypescript } from '../../initializers'
+import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers'
import { logger } from '../../helpers/logger'
import { VideoModel } from '../../models/video/video'
+import { updateAvatarValidator } from '../../middlewares/validators/avatar'
+import { updateActorAvatarFile } from '../../lib/avatar'
+import { auditLoggerFactory, VideoChannelAuditView } from '../../helpers/audit-logger'
+
+const auditLogger = auditLoggerFactory('channels')
+const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.AVATARS_DIR })
const videoChannelRouter = express.Router()
asyncRetryTransactionMiddleware(addVideoChannel)
)
+videoChannelRouter.post('/:id/avatar/pick',
+ authenticate,
+ reqAvatarFile,
+ // Check the rights
+ asyncMiddleware(videoChannelsUpdateValidator),
+ updateAvatarValidator,
+ asyncMiddleware(updateVideoChannelAvatar)
+)
+
videoChannelRouter.put('/:id',
authenticate,
asyncMiddleware(videoChannelsUpdateValidator),
setDefaultSort,
setDefaultPagination,
optionalAuthenticate,
+ commonVideosFiltersValidator,
asyncMiddleware(listVideoChannelVideos)
)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
+async function updateVideoChannelAvatar (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const avatarPhysicalFile = req.files[ 'avatarfile' ][ 0 ]
+ const videoChannel = res.locals.videoChannel as VideoChannelModel
+ const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON())
+
+ const avatar = await updateActorAvatarFile(avatarPhysicalFile, videoChannel.Actor, videoChannel)
+
+ auditLogger.update(
+ res.locals.oauth.token.User.Account.Actor.getIdentifier(),
+ new VideoChannelAuditView(videoChannel.toFormattedJSON()),
+ oldVideoChannelAuditKeys
+ )
+
+ return res
+ .json({
+ avatar: avatar.toFormattedJSON()
+ })
+ .end()
+}
+
async function addVideoChannel (req: express.Request, res: express.Response) {
const videoChannelInfo: VideoChannelCreate = req.body
const account: AccountModel = res.locals.oauth.token.User.Account
setAsyncActorKeys(videoChannelCreated.Actor)
.catch(err => logger.error('Cannot set async actor keys for account %s.', videoChannelCreated.Actor.uuid, { err }))
+ auditLogger.create(
+ res.locals.oauth.token.User.Account.Actor.getIdentifier(),
+ new VideoChannelAuditView(videoChannelCreated.toFormattedJSON())
+ )
logger.info('Video channel with uuid %s created.', videoChannelCreated.Actor.uuid)
return res.json({
async function updateVideoChannel (req: express.Request, res: express.Response) {
const videoChannelInstance = res.locals.videoChannel as VideoChannelModel
const videoChannelFieldsSave = videoChannelInstance.toJSON()
+ const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannelInstance.toFormattedJSON())
const videoChannelInfoToUpdate = req.body as VideoChannelUpdate
try {
const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions)
await sendUpdateActor(videoChannelInstanceUpdated, t)
- })
- logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
+ auditLogger.update(
+ res.locals.oauth.token.User.Account.Actor.getIdentifier(),
+ new VideoChannelAuditView(videoChannelInstanceUpdated.toFormattedJSON()),
+ oldVideoChannelAuditKeys
+ )
+ logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
+ })
} catch (err) {
logger.debug('Cannot update the video channel.', { err })
await sequelizeTypescript.transaction(async t => {
await videoChannelInstance.destroy({ transaction: t })
+ auditLogger.delete(
+ res.locals.oauth.token.User.Account.Actor.getIdentifier(),
+ new VideoChannelAuditView(videoChannelInstance.toFormattedJSON())
+ )
logger.info('Video channel with name %s and uuid %s deleted.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
})
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
- hideNSFW: isNSFWHidden(res),
+ categoryOneOf: req.query.categoryOneOf,
+ licenceOneOf: req.query.licenceOneOf,
+ languageOneOf: req.query.languageOneOf,
+ tagsOneOf: req.query.tagsOneOf,
+ tagsAllOf: req.query.tagsAllOf,
+ nsfw: buildNSFWFilter(res, req.query.nsfw),
withFiles: false,
videoChannelId: videoChannelInstance.id
})