import * as express from 'express'
-import { extname, join } from 'path'
+import { extname } from 'path'
import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared'
import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
import { logger } from '../../../helpers/logger'
import { rateVideoRouter } from './rate'
import { ownershipVideoRouter } from './ownership'
import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
-import { buildNSFWFilter, createReqFiles } from '../../../helpers/express-utils'
+import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils'
import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
import { videoCaptionsRouter } from './captions'
import { videoImportsRouter } from './import'
import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../../lib/thumbnail'
import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-transcoding'
+import { Hooks } from '../../../lib/plugins/hooks'
+import { MVideoDetails, MVideoFullLight } from '@server/typings/models'
+import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
+import { getVideoFilePath } from '@server/lib/video-paths'
const auditLogger = auditLoggerFactory('videos')
const videosRouter = express.Router()
asyncMiddleware(getVideo)
)
videosRouter.post('/:id/views',
- asyncMiddleware(videosGetValidator),
+ asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')),
asyncMiddleware(viewVideo)
)
category: videoInfo.category,
licence: videoInfo.licence,
language: videoInfo.language,
- commentsEnabled: videoInfo.commentsEnabled || false,
- downloadEnabled: videoInfo.downloadEnabled || true,
+ commentsEnabled: videoInfo.commentsEnabled !== false, // If the value is not "false", the default is "true"
+ downloadEnabled: videoInfo.downloadEnabled !== false,
waitTranscoding: videoInfo.waitTranscoding || false,
state: CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED,
nsfw: videoInfo.nsfw || false,
originallyPublishedAt: videoInfo.originallyPublishedAt
}
- const video = new VideoModel(videoData)
+ const video = new VideoModel(videoData) as MVideoDetails
video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
- const videoFileData = {
+ const videoFile = new VideoFileModel({
extname: extname(videoPhysicalFile.filename),
- size: videoPhysicalFile.size
- }
- const videoFile = new VideoFileModel(videoFileData)
+ size: videoPhysicalFile.size,
+ videoStreamingPlaylistId: null
+ })
- if (!videoFile.isAudio()) {
+ if (videoFile.isAudio()) {
+ videoFile.resolution = DEFAULT_AUDIO_RESOLUTION
+ } else {
videoFile.fps = await getVideoFileFPS(videoPhysicalFile.path)
videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).videoFileResolution
- } else {
- videoFile.resolution = DEFAULT_AUDIO_RESOLUTION
}
// Move physical file
- const videoDir = CONFIG.STORAGE.VIDEOS_DIR
- const destination = join(videoDir, video.getVideoFilename(videoFile))
+ const destination = getVideoFilePath(video, videoFile)
await move(videoPhysicalFile.path, destination)
// This is important in case if there is another attempt in the retry process
- videoPhysicalFile.filename = video.getVideoFilename(videoFile)
+ videoPhysicalFile.filename = getVideoFilePath(video, videoFile)
videoPhysicalFile.path = destination
// Process thumbnail or create it from the video
const thumbnailField = req.files['thumbnailfile']
const thumbnailModel = thumbnailField
- ? await createVideoMiniatureFromExisting(thumbnailField[0].path, video, ThumbnailType.MINIATURE)
+ ? await createVideoMiniatureFromExisting(thumbnailField[0].path, video, ThumbnailType.MINIATURE, false)
: await generateVideoMiniature(video, videoFile, ThumbnailType.MINIATURE)
// Process preview or create it from the video
const previewField = req.files['previewfile']
const previewModel = previewField
- ? await createVideoMiniatureFromExisting(previewField[0].path, video, ThumbnailType.PREVIEW)
+ ? await createVideoMiniatureFromExisting(previewField[0].path, video, ThumbnailType.PREVIEW, false)
: await generateVideoMiniature(video, videoFile, ThumbnailType.PREVIEW)
// Create the torrent file
- await video.createTorrentAndSetInfoHash(videoFile)
+ await createTorrentAndSetInfoHash(video, videoFile)
- const { videoCreated, videoWasAutoBlacklisted } = await sequelizeTypescript.transaction(async t => {
+ const { videoCreated } = await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = { transaction: t }
- const videoCreated = await video.save(sequelizeOptions)
+ const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight
await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
await videoCreated.addAndSaveThumbnail(previewModel, t)
}, { transaction: t })
}
- const videoWasAutoBlacklisted = await autoBlacklistVideoIfNeeded(video, res.locals.oauth.token.User, t)
-
- if (!videoWasAutoBlacklisted) {
- await federateVideoIfNeeded(video, true, t)
- }
+ await autoBlacklistVideoIfNeeded({
+ video,
+ user: res.locals.oauth.token.User,
+ isRemote: false,
+ isNew: true,
+ transaction: t
+ })
+ await federateVideoIfNeeded(video, true, t)
auditLogger.create(getAuditIdFromRes(res), new VideoAuditView(videoCreated.toFormattedDetailsJSON()))
logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid)
- return { videoCreated, videoWasAutoBlacklisted }
+ return { videoCreated }
})
- if (videoWasAutoBlacklisted) {
- Notifier.Instance.notifyOnVideoAutoBlacklist(videoCreated)
- } else {
- Notifier.Instance.notifyOnNewVideo(videoCreated)
- }
+ Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated)
if (video.state === VideoState.TO_TRANSCODE) {
// Put uuid because we don't have id auto incremented for now
}
}
- await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
+ await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: dataInput })
}
+ Hooks.runAction('action:api.video.uploaded', { video: videoCreated })
+
return res.json({
video: {
id: videoCreated.id,
}
async function updateVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance = res.locals.videoAll
const videoFieldsSave = videoInstance.toJSON()
const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON())
const videoInfoToUpdate: VideoUpdate = req.body
- const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
- const wasUnlistedVideo = videoInstance.privacy === VideoPrivacy.UNLISTED
+
+ const wasConfidentialVideo = videoInstance.isConfidential()
+ const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation()
// Process thumbnail or create it from the video
const thumbnailModel = req.files && req.files['thumbnailfile']
- ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE)
+ ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE, false)
: undefined
const previewModel = req.files && req.files['previewfile']
- ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW)
+ ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW, false)
: undefined
try {
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)
- 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.waitTranscoding !== undefined) videoInstance.set('waitTranscoding', videoInfoToUpdate.waitTranscoding)
- 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.downloadEnabled !== undefined) videoInstance.set('downloadEnabled', videoInfoToUpdate.downloadEnabled)
+ if (videoInfoToUpdate.name !== undefined) videoInstance.name = videoInfoToUpdate.name
+ if (videoInfoToUpdate.category !== undefined) videoInstance.category = videoInfoToUpdate.category
+ if (videoInfoToUpdate.licence !== undefined) videoInstance.licence = videoInfoToUpdate.licence
+ if (videoInfoToUpdate.language !== undefined) videoInstance.language = videoInfoToUpdate.language
+ if (videoInfoToUpdate.nsfw !== undefined) videoInstance.nsfw = videoInfoToUpdate.nsfw
+ if (videoInfoToUpdate.waitTranscoding !== undefined) videoInstance.waitTranscoding = videoInfoToUpdate.waitTranscoding
+ if (videoInfoToUpdate.support !== undefined) videoInstance.support = videoInfoToUpdate.support
+ if (videoInfoToUpdate.description !== undefined) videoInstance.description = videoInfoToUpdate.description
+ if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.commentsEnabled = videoInfoToUpdate.commentsEnabled
+ if (videoInfoToUpdate.downloadEnabled !== undefined) videoInstance.downloadEnabled = videoInfoToUpdate.downloadEnabled
if (videoInfoToUpdate.originallyPublishedAt !== undefined && videoInfoToUpdate.originallyPublishedAt !== null) {
videoInstance.originallyPublishedAt = new Date(videoInfoToUpdate.originallyPublishedAt)
}
+ let isNewVideo = false
if (videoInfoToUpdate.privacy !== undefined) {
+ isNewVideo = videoInstance.isNewVideo(videoInfoToUpdate.privacy)
+
const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10)
- videoInstance.privacy = newPrivacy
+ videoInstance.setPrivacy(newPrivacy)
- if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) {
- videoInstance.publishedAt = new Date()
+ // Unfederate the video if the new privacy is not compatible with federation
+ if (hadPrivacyForFederation && !videoInstance.hasPrivacyForFederation()) {
+ await VideoModel.sendDelete(videoInstance, { transaction: t })
}
}
- const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
+ const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) as MVideoFullLight
if (thumbnailModel) await videoInstanceUpdated.addAndSaveThumbnail(thumbnailModel, t)
if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t)
await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t })
videoInstanceUpdated.VideoChannel = res.locals.videoChannel
- if (wasPrivateVideo === false) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
+ if (hadPrivacyForFederation === true) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
}
// Schedule an update in the future?
await ScheduleVideoUpdateModel.deleteByVideoId(videoInstanceUpdated.id, t)
}
- const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE
+ await autoBlacklistVideoIfNeeded({
+ video: videoInstanceUpdated,
+ user: res.locals.oauth.token.User,
+ isRemote: false,
+ isNew: false,
+ transaction: t
+ })
- // Don't send update if the video was unfederated
- if (!videoInstanceUpdated.VideoBlacklist || videoInstanceUpdated.VideoBlacklist.unfederated === false) {
- await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t)
- }
+ await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t)
auditLogger.update(
getAuditIdFromRes(res),
return videoInstanceUpdated
})
- if (wasUnlistedVideo || wasPrivateVideo) {
- Notifier.Instance.notifyOnNewVideo(videoInstanceUpdated)
+ if (wasConfidentialVideo) {
+ Notifier.Instance.notifyOnNewVideoIfNeeded(videoInstanceUpdated)
}
+
+ Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated })
} catch (err) {
// Force fields we want to update
// If the transaction is retried, sequelize will think the object has not changed
async function getVideo (req: express.Request, res: express.Response) {
// We need more attributes
const userId: number = res.locals.oauth ? res.locals.oauth.token.User.id : null
- const video = await VideoModel.loadForGetAPI(res.locals.video.id, undefined, userId)
+
+ const video = await Hooks.wrapPromiseFun(
+ VideoModel.loadForGetAPI,
+ { id: res.locals.onlyVideoWithRights.id, userId },
+ 'filter:api.video.get.result'
+ )
if (video.isOutdated()) {
JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: video.url } })
- .catch(err => logger.error('Cannot create AP refresher job for video %s.', video.url, { err }))
}
return res.json(video.toFormattedDetailsJSON())
}
async function viewVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance = res.locals.onlyImmutableVideo
const ip = req.ip
const exists = await Redis.Instance.doesVideoIPViewExist(ip, videoInstance.uuid)
const serverActor = await getServerActor()
await sendView(serverActor, videoInstance, undefined)
+ Hooks.runAction('action:api.video.viewed', { video: videoInstance, ip })
+
return res.status(204).end()
}
async function getVideoDescription (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance = res.locals.videoAll
let description = ''
if (videoInstance.isOwned()) {
}
async function listVideos (req: express.Request, res: express.Response) {
- const resultList = await VideoModel.listForApi({
+ const countVideos = getCountVideos(req)
+
+ const apiOptions = await Hooks.wrapObject({
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
nsfw: buildNSFWFilter(res, req.query.nsfw),
filter: req.query.filter as VideoFilter,
withFiles: false,
- user: res.locals.oauth ? res.locals.oauth.token.User : undefined
- })
+ user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
+ countVideos
+ }, 'filter:api.videos.list.params')
+
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoModel.listForApi,
+ apiOptions,
+ 'filter:api.videos.list.result'
+ )
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function removeVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video
+ const videoInstance = res.locals.videoAll
await sequelizeTypescript.transaction(async t => {
await videoInstance.destroy({ transaction: t })
auditLogger.delete(getAuditIdFromRes(res), new VideoAuditView(videoInstance.toFormattedDetailsJSON()))
logger.info('Video with name %s and uuid %s deleted.', videoInstance.name, videoInstance.uuid)
+ Hooks.runAction('action:api.video.deleted', { video: videoInstance })
+
return res.type('json').status(204).end()
}
projects / github / Chocobozzz / PeerTube.git / blobdiff