import { getServerActor } from '@server/models/application/application'
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 { ActorImageType, HttpStatusCode, VideoChannelCreate, VideoChannelUpdate, VideosImportInChannelCreate } 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'
asyncRetryTransactionMiddleware,
authenticate,
commonVideosFiltersValidator,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
videoPlaylistsSortValidator
} from '../../middlewares'
import {
+ ensureChannelOwnerCanUpload,
ensureIsLocalChannel,
+ videoChannelImportVideosValidator,
videoChannelsFollowersSortValidator,
videoChannelsListValidator,
videoChannelsNameWithHostValidator,
reqAvatarFile,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
updateAvatarValidator,
asyncMiddleware(updateVideoChannelAvatar)
)
reqBannerFile,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
updateBannerValidator,
asyncMiddleware(updateVideoChannelBanner)
)
authenticate,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
asyncMiddleware(deleteVideoChannelAvatar)
)
authenticate,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
asyncMiddleware(deleteVideoChannelBanner)
)
authenticate,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
videoChannelsUpdateValidator,
asyncRetryTransactionMiddleware(updateVideoChannel)
)
authenticate,
asyncMiddleware(videoChannelsNameWithHostValidator),
ensureIsLocalChannel,
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
asyncMiddleware(videoChannelsRemoveValidator),
asyncRetryTransactionMiddleware(removeVideoChannel)
)
videoChannelRouter.get('/:nameWithHost',
asyncMiddleware(videoChannelsNameWithHostValidator),
- getVideoChannel
+ asyncMiddleware(getVideoChannel)
)
videoChannelRouter.get('/:nameWithHost/video-playlists',
videoChannelRouter.get('/:nameWithHost/followers',
authenticate,
asyncMiddleware(videoChannelsNameWithHostValidator),
- ensureCanManageChannel,
+ ensureCanManageChannelOrAccount,
paginationValidator,
videoChannelsFollowersSortValidator,
setDefaultSort,
asyncMiddleware(listVideoChannelFollowers)
)
+videoChannelRouter.post('/:nameWithHost/import-videos',
+ authenticate,
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ asyncMiddleware(videoChannelImportVideosValidator),
+ ensureIsLocalChannel,
+ ensureCanManageChannelOrAccount,
+ asyncMiddleware(ensureChannelOwnerCanUpload),
+ asyncMiddleware(importVideosInChannel)
+)
+
// ---------------------------------------------------------------------------
export {
async function listVideoChannels (req: express.Request, res: express.Response) {
const serverActor = await getServerActor()
- const resultList = await VideoChannelModel.listForApi({
+
+ const apiOptions = await Hooks.wrapObject({
actorId: serverActor.id,
start: req.query.start,
count: req.query.count,
sort: req.query.sort
- })
+ }, 'filter:api.video-channels.list.params')
+
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoChannelModel.listForApi,
+ apiOptions,
+ 'filter:api.video-channels.list.result'
+ )
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
})
const payload = { actorId: videoChannelCreated.actorId }
- await JobQueue.Instance.createJobWithPromise({ type: 'actor-keys', payload })
+ await JobQueue.Instance.createJob({ type: 'actor-keys', payload })
auditLogger.create(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannelCreated.toFormattedJSON()))
logger.info('Video channel %s created.', videoChannelCreated.Actor.url)
+ Hooks.runAction('action:api.video-channel.created', { videoChannel: videoChannelCreated, req, res })
+
return res.json({
videoChannel: {
id: videoChannelCreated.id
oldVideoChannelAuditKeys
)
+ Hooks.runAction('action:api.video-channel.updated', { videoChannel: videoChannelInstanceUpdated, req, res })
+
logger.info('Video channel %s updated.', videoChannelInstance.Actor.url)
})
} catch (err) {
await videoChannelInstance.destroy({ transaction: t })
+ Hooks.runAction('action:api.video-channel.deleted', { videoChannel: videoChannelInstance, req, res })
+
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()
}
-function getVideoChannel (req: express.Request, res: express.Response) {
- const videoChannel = res.locals.videoChannel
+async function getVideoChannel (req: express.Request, res: express.Response) {
+ const id = res.locals.videoChannel.id
+ const videoChannel = await Hooks.wrapObject(res.locals.videoChannel, 'filter:api.video-channel.get.result', { id })
if (videoChannel.isOutdated()) {
- JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannel.Actor.url } })
+ JobQueue.Instance.createJobAsync({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannel.Actor.url } })
}
return res.json(videoChannel.toFormattedJSON())
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
+
+async function importVideosInChannel (req: express.Request, res: express.Response) {
+ const { externalChannelUrl } = req.body as VideosImportInChannelCreate
+
+ await JobQueue.Instance.createJob({
+ type: 'video-channel-import',
+ payload: {
+ externalChannelUrl,
+ videoChannelId: res.locals.videoChannel.id,
+ partOfChannelSyncId: res.locals.videoChannelSync?.id
+ }
+ })
+
+ logger.info('Video import job for channel "%s" with url "%s" created.', res.locals.videoChannel.name, externalChannelUrl)
+
+ return res.type('json').status(HttpStatusCode.NO_CONTENT_204).end()
+}