-import express = require('express')
-import fs = require('fs')
-import multer = require('multer')
-import path = require('path')
-import { waterfall } from 'async'
-
-const db = require('../../../initializers/database')
+import * as express from 'express'
+import { extname, join } from 'path'
+import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared'
+import { renamePromise } from '../../../helpers/core-utils'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
+import { processImage } from '../../../helpers/image-utils'
+import { logger } from '../../../helpers/logger'
+import { createReqFiles, getFormattedObjects, getServerActor, resetSequelizeInstance } from '../../../helpers/utils'
import {
CONFIG,
- REQUEST_VIDEO_QADU_TYPES,
- REQUEST_VIDEO_EVENT_TYPES,
+ IMAGE_MIMETYPE_EXT,
+ PREVIEWS_SIZE,
+ sequelizeTypescript,
+ THUMBNAILS_SIZE,
VIDEO_CATEGORIES,
+ VIDEO_LANGUAGES,
VIDEO_LICENCES,
- VIDEO_LANGUAGES
+ VIDEO_MIMETYPE_EXT,
+ VIDEO_PRIVACIES
} from '../../../initializers'
import {
- addEventToRemoteVideo,
- quickAndDirtyUpdateVideoToFriends,
- addVideoToFriends,
- updateVideoToFriends
-} from '../../../lib'
+ 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 {
+ asyncMiddleware,
authenticate,
+ optionalAuthenticate,
paginationValidator,
- videosSortValidator,
- setVideosSort,
- setPagination,
- setVideosSearch,
- videosUpdateValidator,
- videosSearchValidator,
+ setDefaultPagination,
+ setDefaultSort,
videosAddValidator,
videosGetValidator,
- videosRemoveValidator
+ videosRemoveValidator,
+ videosSearchValidator,
+ videosSortValidator,
+ videosUpdateValidator
} from '../../../middlewares'
-import {
- logger,
- commitTransaction,
- retryTransactionWrapper,
- rollbackTransaction,
- startSerializableTransaction,
- generateRandomString,
- getFormatedObjects
-} from '../../../helpers'
-
+import { TagModel } from '../../../models/video/tag'
+import { VideoModel } from '../../../models/video/video'
+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 { User } from '../../../../shared/models/users'
+import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
+import { VideoSortField } from '../../../../client/src/app/shared/video/sort-field.type'
const videosRouter = express.Router()
-// multer configuration
-const storage = multer.diskStorage({
- destination: function (req, file, cb) {
- cb(null, CONFIG.STORAGE.VIDEOS_DIR)
- },
-
- filename: function (req, file, cb) {
- let extension = ''
- if (file.mimetype === 'video/webm') extension = 'webm'
- else if (file.mimetype === 'video/mp4') extension = 'mp4'
- else if (file.mimetype === 'video/ogg') extension = 'ogv'
- generateRandomString(16, function (err, randomString) {
- const fieldname = err ? undefined : randomString
- cb(null, fieldname + '.' + extension)
- })
+const reqVideoFileAdd = createReqFiles(
+ [ 'videofile', 'thumbnailfile', 'previewfile' ],
+ Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT),
+ {
+ videofile: CONFIG.STORAGE.VIDEOS_DIR,
+ thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR,
+ previewfile: CONFIG.STORAGE.PREVIEWS_DIR
}
-})
-
-const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
+)
+const reqVideoFileUpdate = createReqFiles(
+ [ 'thumbnailfile', 'previewfile' ],
+ IMAGE_MIMETYPE_EXT,
+ {
+ thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR,
+ previewfile: CONFIG.STORAGE.PREVIEWS_DIR
+ }
+)
videosRouter.use('/', abuseVideoRouter)
videosRouter.use('/', blacklistRouter)
videosRouter.use('/', rateVideoRouter)
+videosRouter.use('/', videoChannelRouter)
+videosRouter.use('/', videoCommentRouter)
videosRouter.get('/categories', listVideoCategories)
videosRouter.get('/licences', listVideoLicences)
videosRouter.get('/languages', listVideoLanguages)
+videosRouter.get('/privacies', listVideoPrivacies)
videosRouter.get('/',
paginationValidator,
videosSortValidator,
- setVideosSort,
- setPagination,
- listVideos
+ setDefaultSort,
+ setDefaultPagination,
+ optionalAuthenticate,
+ asyncMiddleware(listVideos)
+)
+videosRouter.get('/search',
+ videosSearchValidator,
+ paginationValidator,
+ videosSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ optionalAuthenticate,
+ asyncMiddleware(searchVideos)
)
videosRouter.put('/:id',
authenticate,
- reqFiles,
- videosUpdateValidator,
- updateVideoRetryWrapper
+ reqVideoFileUpdate,
+ asyncMiddleware(videosUpdateValidator),
+ asyncMiddleware(updateVideoRetryWrapper)
)
-videosRouter.post('/',
+videosRouter.post('/upload',
authenticate,
- reqFiles,
- videosAddValidator,
- addVideoRetryWrapper
+ reqVideoFileAdd,
+ asyncMiddleware(videosAddValidator),
+ asyncMiddleware(addVideoRetryWrapper)
+)
+
+videosRouter.get('/:id/description',
+ asyncMiddleware(videosGetValidator),
+ asyncMiddleware(getVideoDescription)
)
videosRouter.get('/:id',
- videosGetValidator,
+ asyncMiddleware(videosGetValidator),
getVideo
)
+videosRouter.post('/:id/views',
+ asyncMiddleware(videosGetValidator),
+ asyncMiddleware(viewVideo)
+)
videosRouter.delete('/:id',
authenticate,
- videosRemoveValidator,
- removeVideo
-)
-
-videosRouter.get('/search/:value',
- videosSearchValidator,
- paginationValidator,
- videosSortValidator,
- setVideosSort,
- setPagination,
- setVideosSearch,
- searchVideos
+ asyncMiddleware(videosRemoveValidator),
+ asyncMiddleware(removeVideoRetryWrapper)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function listVideoCategories (req, res, next) {
+function listVideoCategories (req: express.Request, res: express.Response) {
res.json(VIDEO_CATEGORIES)
}
-function listVideoLicences (req, res, next) {
+function listVideoLicences (req: express.Request, res: express.Response) {
res.json(VIDEO_LICENCES)
}
-function listVideoLanguages (req, res, next) {
+function listVideoLanguages (req: express.Request, res: express.Response) {
res.json(VIDEO_LANGUAGES)
}
+function listVideoPrivacies (req: express.Request, res: express.Response) {
+ res.json(VIDEO_PRIVACIES)
+}
+
// Wrapper to video add that retry the function if there is a database error
// We need this because we run the transaction in SERIALIZABLE isolation that can fail
-function addVideoRetryWrapper (req, res, next) {
+async function addVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
const options = {
- arguments: [ req, res, req.files.videofile[0] ],
+ arguments: [ req, res, req.files['videofile'][0] ],
errorMessage: 'Cannot insert the video with many retries.'
}
- retryTransactionWrapper(addVideo, options, function (err) {
- if (err) return next(err)
+ const video = await retryTransactionWrapper(addVideo, options)
- // TODO : include Location of the new video -> 201
- return res.type('json').status(204).end()
- })
+ res.json({
+ video: {
+ id: video.id,
+ uuid: video.uuid
+ }
+ }).end()
}
-function addVideo (req, res, videoFile, finalCallback) {
- const videoInfos = req.body
-
- waterfall([
-
- startSerializableTransaction,
-
- function findOrCreateAuthor (t, callback) {
- const user = res.locals.oauth.token.User
-
- const name = user.username
- // null because it is OUR pod
- const podId = null
- const userId = user.id
-
- db.Author.findOrCreateAuthor(name, podId, userId, t, function (err, authorInstance) {
- return callback(err, t, authorInstance)
- })
- },
-
- function findOrCreateTags (t, author, callback) {
- const tags = videoInfos.tags
-
- db.Tag.findOrCreateTags(tags, t, function (err, tagInstances) {
- return callback(err, t, author, tagInstances)
- })
- },
-
- function createVideoObject (t, author, tagInstances, callback) {
- const videoData = {
- name: videoInfos.name,
- remoteId: null,
- extname: path.extname(videoFile.filename),
- category: videoInfos.category,
- licence: videoInfos.licence,
- language: videoInfos.language,
- nsfw: videoInfos.nsfw,
- description: videoInfos.description,
- duration: videoFile.duration,
- authorId: author.id
- }
-
- const video = db.Video.build(videoData)
-
- return callback(null, t, author, tagInstances, video)
- },
+async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) {
+ const videoInfo: VideoCreate = req.body
+
+ // Prepare data so we don't block the transaction
+ const videoData = {
+ name: videoInfo.name,
+ remote: false,
+ extname: extname(videoPhysicalFile.filename),
+ category: videoInfo.category,
+ licence: videoInfo.licence,
+ language: videoInfo.language,
+ commentsEnabled: videoInfo.commentsEnabled,
+ nsfw: videoInfo.nsfw,
+ description: videoInfo.description,
+ support: videoInfo.support,
+ privacy: videoInfo.privacy,
+ duration: videoPhysicalFile['duration'], // duration was added by a previous middleware
+ channelId: res.locals.videoChannel.id
+ }
+ const video = new VideoModel(videoData)
+ video.url = getVideoActivityPubUrl(video)
- // Set the videoname the same as the id
- function renameVideoFile (t, author, tagInstances, video, callback) {
- const videoDir = CONFIG.STORAGE.VIDEOS_DIR
- const source = path.join(videoDir, videoFile.filename)
- const destination = path.join(videoDir, video.getVideoFilename())
+ const { videoFileResolution } = await getVideoFileResolution(videoPhysicalFile.path)
- fs.rename(source, destination, function (err) {
- if (err) return callback(err)
+ const videoFileData = {
+ extname: extname(videoPhysicalFile.filename),
+ resolution: videoFileResolution,
+ size: videoPhysicalFile.size
+ }
+ const videoFile = new VideoFileModel(videoFileData)
+ const videoDir = CONFIG.STORAGE.VIDEOS_DIR
+ const destination = join(videoDir, video.getVideoFilename(videoFile))
+
+ await renamePromise(videoPhysicalFile.path, destination)
+ // This is important in case if there is another attempt in the retry process
+ videoPhysicalFile.filename = video.getVideoFilename(videoFile)
+ videoPhysicalFile.path = destination
+
+ // Process thumbnail or create it from the video
+ const thumbnailField = req.files['thumbnailfile']
+ if (thumbnailField) {
+ const thumbnailPhysicalFile = thumbnailField[0]
+ await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE)
+ } else {
+ await video.createThumbnail(videoFile)
+ }
- // This is important in case if there is another attempt
- videoFile.filename = video.getVideoFilename()
- return callback(null, t, author, tagInstances, video)
- })
- },
+ // Process preview or create it from the video
+ const previewField = req.files['previewfile']
+ if (previewField) {
+ const previewPhysicalFile = previewField[0]
+ await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE)
+ } else {
+ await video.createPreview(videoFile)
+ }
- function insertVideoIntoDB (t, author, tagInstances, video, callback) {
- const options = { transaction: t }
+ await video.createTorrentAndSetInfoHash(videoFile)
- // Add tags association
- video.save(options).asCallback(function (err, videoCreated) {
- if (err) return callback(err)
+ const videoCreated = await sequelizeTypescript.transaction(async t => {
+ const sequelizeOptions = { transaction: t }
- // Do not forget to add Author informations to the created video
- videoCreated.Author = author
+ const videoCreated = await video.save(sequelizeOptions)
+ // Do not forget to add video channel information to the created video
+ videoCreated.VideoChannel = res.locals.videoChannel
- return callback(err, t, tagInstances, videoCreated)
- })
- },
+ videoFile.videoId = video.id
+ await videoFile.save(sequelizeOptions)
- function associateTagsToVideo (t, tagInstances, video, callback) {
- const options = { transaction: t }
+ video.VideoFiles = [ videoFile ]
- video.setTags(tagInstances, options).asCallback(function (err) {
- video.Tags = tagInstances
+ if (videoInfo.tags) {
+ const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t)
- return callback(err, t, video)
- })
- },
+ await video.$set('Tags', tagInstances, sequelizeOptions)
+ video.Tags = tagInstances
+ }
- function sendToFriends (t, video, callback) {
- // Let transcoding job send the video to friends because the videofile extension might change
- if (CONFIG.TRANSCODING.ENABLED === true) return callback(null, t)
+ // Let transcoding job send the video to friends because the video file extension might change
+ if (CONFIG.TRANSCODING.ENABLED === true) return videoCreated
+ // Don't send video to remote servers, it is private
+ if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated
- video.toAddRemoteJSON(function (err, remoteVideo) {
- if (err) return callback(err)
+ await sendCreateVideo(video, t)
+ await shareVideoByServerAndChannel(video, t)
- // Now we'll add the video's meta data to our friends
- addVideoToFriends(remoteVideo, t, function (err) {
- return callback(err, t)
- })
- })
- },
+ logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid)
- commitTransaction
+ return videoCreated
+ })
- ], function andFinally (err, t) {
- if (err) {
- // This is just a debug because we will retry the insert
- logger.debug('Cannot insert the video.', { error: err })
- return rollbackTransaction(err, t, finalCallback)
+ if (CONFIG.TRANSCODING.ENABLED === true) {
+ // Put uuid because we don't have id auto incremented for now
+ const dataInput = {
+ videoUUID: videoCreated.uuid
}
- logger.info('Video with name %s created.', videoInfos.name)
- return finalCallback(null)
- })
+ await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput })
+ }
+
+ return videoCreated
}
-function updateVideoRetryWrapper (req, res, next) {
+async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
const options = {
arguments: [ req, res ],
errorMessage: 'Cannot update the video with many retries.'
}
- retryTransactionWrapper(updateVideo, options, function (err) {
- if (err) return next(err)
+ await retryTransactionWrapper(updateVideo, options)
- // TODO : include Location of the new video -> 201
- return res.type('json').status(204).end()
- })
+ return res.type('json').status(204).end()
}
-function updateVideo (req, res, finalCallback) {
- const videoInstance = res.locals.video
+async function updateVideo (req: express.Request, res: express.Response) {
+ const videoInstance: VideoModel = res.locals.video
const videoFieldsSave = videoInstance.toJSON()
- const videoInfosToUpdate = req.body
-
- waterfall([
+ const videoInfoToUpdate: VideoUpdate = req.body
+ const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
- startSerializableTransaction,
+ // Process thumbnail or create it from the video
+ if (req.files && req.files['thumbnailfile']) {
+ const thumbnailPhysicalFile = req.files['thumbnailfile'][0]
+ await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, videoInstance.getThumbnailName()), THUMBNAILS_SIZE)
+ }
- function findOrCreateTags (t, callback) {
- if (videoInfosToUpdate.tags) {
- db.Tag.findOrCreateTags(videoInfosToUpdate.tags, t, function (err, tagInstances) {
- return callback(err, t, tagInstances)
- })
- } else {
- return callback(null, t, null)
- }
- },
+ // Process preview or create it from the video
+ if (req.files && req.files['previewfile']) {
+ const previewPhysicalFile = req.files['previewfile'][0]
+ await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, videoInstance.getPreviewName()), PREVIEWS_SIZE)
+ }
- function updateVideoIntoDB (t, tagInstances, callback) {
- const options = {
+ try {
+ await sequelizeTypescript.transaction(async t => {
+ const sequelizeOptions = {
transaction: t
}
- if (videoInfosToUpdate.name !== undefined) videoInstance.set('name', videoInfosToUpdate.name)
- if (videoInfosToUpdate.category !== undefined) videoInstance.set('category', videoInfosToUpdate.category)
- if (videoInfosToUpdate.licence !== undefined) videoInstance.set('licence', videoInfosToUpdate.licence)
- if (videoInfosToUpdate.language !== undefined) videoInstance.set('language', videoInfosToUpdate.language)
- if (videoInfosToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfosToUpdate.nsfw)
- if (videoInfosToUpdate.description !== undefined) videoInstance.set('description', videoInfosToUpdate.description)
-
- videoInstance.save(options).asCallback(function (err) {
- return callback(err, t, tagInstances)
- })
- },
-
- function associateTagsToVideo (t, tagInstances, callback) {
- if (tagInstances) {
- const options = { transaction: t }
-
- videoInstance.setTags(tagInstances, options).asCallback(function (err) {
- videoInstance.Tags = tagInstances
-
- return callback(err, t)
- })
- } else {
- return callback(null, t)
+ if (videoInfoToUpdate.name !== undefined) videoInstance.set('name', videoInfoToUpdate.name)
+ if (videoInfoToUpdate.category !== undefined) videoInstance.set('category', videoInfoToUpdate.category)
+ if (videoInfoToUpdate.licence !== undefined) videoInstance.set('licence', videoInfoToUpdate.licence)
+ if (videoInfoToUpdate.language !== undefined) videoInstance.set('language', videoInfoToUpdate.language)
+ if (videoInfoToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfoToUpdate.nsfw)
+ if (videoInfoToUpdate.support !== undefined) videoInstance.set('support', videoInfoToUpdate.support)
+ if (videoInfoToUpdate.description !== undefined) videoInstance.set('description', videoInfoToUpdate.description)
+ if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.set('commentsEnabled', videoInfoToUpdate.commentsEnabled)
+ if (videoInfoToUpdate.privacy !== undefined) {
+ const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10)
+ videoInstance.set('privacy', newPrivacy)
+
+ if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) {
+ videoInstance.set('publishedAt', new Date())
+ }
}
- },
- function sendToFriends (t, callback) {
- const json = videoInstance.toUpdateRemoteJSON()
+ const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
+
+ if (videoInfoToUpdate.tags) {
+ const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t)
+
+ await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
+ videoInstance.Tags = tagInstances
+ }
// Now we'll update the video's meta data to our friends
- updateVideoToFriends(json, t, function (err) {
- return callback(err, t)
- })
- },
-
- commitTransaction
-
- ], function andFinally (err, t) {
- if (err) {
- logger.debug('Cannot update the video.', { error: err })
-
- // Force fields we want to update
- // If the transaction is retried, sequelize will think the object has not changed
- // So it will skip the SQL request, even if the last one was ROLLBACKed!
- Object.keys(videoFieldsSave).forEach(function (key) {
- const value = videoFieldsSave[key]
- videoInstance.set(key, value)
- })
-
- return rollbackTransaction(err, t, finalCallback)
- }
+ if (wasPrivateVideo === false) {
+ await sendUpdateVideo(videoInstanceUpdated, t)
+ }
- logger.info('Video with name %s updated.', videoInfosToUpdate.name)
- return finalCallback(null)
- })
+ // Video is not private anymore, send a create action to remote servers
+ if (wasPrivateVideo === true && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE) {
+ await sendCreateVideo(videoInstanceUpdated, t)
+ await shareVideoByServerAndChannel(videoInstanceUpdated, t)
+ }
+ })
+
+ logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid)
+ } catch (err) {
+ // Force fields we want to update
+ // If the transaction is retried, sequelize will think the object has not changed
+ // So it will skip the SQL request, even if the last one was ROLLBACKed!
+ resetSequelizeInstance(videoInstance, videoFieldsSave)
+
+ throw err
+ }
}
-function getVideo (req, res, next) {
+function getVideo (req: express.Request, res: express.Response) {
const videoInstance = res.locals.video
- if (videoInstance.isOwned()) {
- // The increment is done directly in the database, not using the instance value
- videoInstance.increment('views').asCallback(function (err) {
- if (err) {
- logger.error('Cannot add view to video %d.', videoInstance.id)
- return
- }
+ return res.json(videoInstance.toFormattedDetailsJSON())
+}
- // FIXME: make a real view system
- // For example, only add a view when a user watch a video during 30s etc
- const qaduParams = {
- videoId: videoInstance.id,
- type: REQUEST_VIDEO_QADU_TYPES.VIEWS
- }
- quickAndDirtyUpdateVideoToFriends(qaduParams)
- })
+async function viewVideo (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.video
+
+ const ip = req.ip
+ const exists = await Redis.Instance.isViewExists(ip, videoInstance.uuid)
+ if (exists) {
+ logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid)
+ return res.status(204).end()
+ }
+
+ await videoInstance.increment('views')
+ await Redis.Instance.setView(ip, videoInstance.uuid)
+
+ const serverAccount = await getServerActor()
+
+ await sendCreateView(serverAccount, videoInstance, undefined)
+
+ return res.status(204).end()
+}
+
+async function getVideoDescription (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.video
+ let description = ''
+
+ if (videoInstance.isOwned()) {
+ description = videoInstance.description
} else {
- // Just send the event to our friends
- const eventParams = {
- videoId: videoInstance.id,
- type: REQUEST_VIDEO_EVENT_TYPES.VIEWS
- }
- addEventToRemoteVideo(eventParams)
+ description = await fetchRemoteVideoDescription(videoInstance)
}
- // Do not wait the view system
- res.json(videoInstance.toFormatedJSON())
+ return res.json({ description })
}
-function listVideos (req, res, next) {
- db.Video.listForApi(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
- if (err) return next(err)
+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
+ )
- res.json(getFormatedObjects(videosList, videosTotal))
- })
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-function removeVideo (req, res, next) {
- const videoInstance = res.locals.video
+async function removeVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const options = {
+ arguments: [ req, res ],
+ errorMessage: 'Cannot remove the video with many retries.'
+ }
- videoInstance.destroy().asCallback(function (err) {
- if (err) {
- logger.error('Errors when removed the video.', { error: err })
- return next(err)
- }
+ await retryTransactionWrapper(removeVideo, options)
- return res.type('json').status(204).end()
- })
+ return res.type('json').status(204).end()
}
-function searchVideos (req, res, next) {
- db.Video.searchAndPopulateAuthorAndPodAndTags(
- req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort,
- function (err, videosList, videosTotal) {
- if (err) return next(err)
+async function removeVideo (req: express.Request, res: express.Response) {
+ const videoInstance: VideoModel = res.locals.video
- res.json(getFormatedObjects(videosList, videosTotal))
- }
+ await sequelizeTypescript.transaction(async t => {
+ await videoInstance.destroy({ transaction: t })
+ })
+
+ logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid)
+}
+
+async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const resultList = await VideoModel.searchAndPopulateAccountAndServer(
+ req.query.search as string,
+ req.query.start as number,
+ req.query.count as number,
+ req.query.sort as VideoSortField,
+ isNSFWHidden(res)
)
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+function isNSFWHidden (res: express.Response) {
+ if (res.locals.oauth) {
+ const user: User = res.locals.oauth.token.User
+ if (user) return user.nsfwPolicy === 'do_not_list'
+ }
+
+ return CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
}
projects / github / Chocobozzz / PeerTube.git / blobdiff