VIDEO_MIMETYPE_EXT,
VIDEO_PRIVACIES
} from '../../../initializers'
-import { fetchRemoteVideoDescription, getVideoActivityPubUrl, shareVideoByServerAndChannel } from '../../../lib/activitypub'
+import {
+ changeVideoChannelShare,
+ fetchRemoteVideoDescription,
+ getVideoActivityPubUrl,
+ shareVideoByServerAndChannel
+} from '../../../lib/activitypub'
import { sendCreateVideo, sendCreateView, sendUpdateVideo } from '../../../lib/activitypub/send'
import { JobQueue } from '../../../lib/job-queue'
import { Redis } from '../../../lib/redis'
import { VideoFileModel } from '../../../models/video/video-file'
import { abuseVideoRouter } from './abuse'
import { blacklistRouter } from './blacklist'
-import { videoChannelRouter } from './channel'
import { videoCommentRouter } from './comment'
import { rateVideoRouter } from './rate'
import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
videosRouter.use('/', abuseVideoRouter)
videosRouter.use('/', blacklistRouter)
videosRouter.use('/', rateVideoRouter)
-videosRouter.use('/', videoChannelRouter)
videosRouter.use('/', videoCommentRouter)
videosRouter.get('/categories', listVideoCategories)
video.VideoFiles = [ videoFile ]
- if (videoInfo.tags) {
+ if (videoInfo.tags !== undefined) {
const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t)
await video.$set('Tags', tagInstances, sequelizeOptions)
if (CONFIG.TRANSCODING.ENABLED === true) {
// Put uuid because we don't have id auto incremented for now
const dataInput = {
- videoUUID: videoCreated.uuid
+ videoUUID: videoCreated.uuid,
+ isNewVideo: true
}
await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput })
const sequelizeOptions = {
transaction: t
}
+ const oldVideoChannel = videoInstance.VideoChannel
if (videoInfoToUpdate.name !== undefined) videoInstance.set('name', videoInfoToUpdate.name)
if (videoInfoToUpdate.category !== undefined) videoInstance.set('category', videoInfoToUpdate.category)
const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
- if (videoInfoToUpdate.tags) {
+ // Video tags update?
+ if (videoInfoToUpdate.tags !== undefined) {
const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t)
- await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
- videoInstance.Tags = tagInstances
+ await videoInstanceUpdated.$set('Tags', tagInstances, sequelizeOptions)
+ videoInstanceUpdated.Tags = tagInstances
}
- // Now we'll update the video's meta data to our friends
- if (wasPrivateVideo === false) {
- await sendUpdateVideo(videoInstanceUpdated, t)
+ // Video channel update?
+ if (res.locals.videoChannel && videoInstanceUpdated.channelId !== res.locals.videoChannel.id) {
+ await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t })
+ videoInstance.VideoChannel = res.locals.videoChannel
+
+ if (wasPrivateVideo === false) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
}
+ // Now we'll update the video's meta data to our friends
+ if (wasPrivateVideo === false) await sendUpdateVideo(videoInstanceUpdated, t)
+
// Video is not private anymore, send a create action to remote servers
if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) {
await sendCreateVideo(videoInstanceUpdated, t)
}
async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await VideoModel.listForApi(
- req.query.start as number,
- req.query.count as number,
- req.query.sort as VideoSortField,
- isNSFWHidden(res),
- req.query.filter as VideoFilter
- )
+ const resultList = await VideoModel.listForApi({
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ hideNSFW: isNSFWHidden(res),
+ filter: req.query.filter as VideoFilter,
+ withFiles: false
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}