X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fapi%2Fvideos%2Findex.ts;h=1dfd7c7a0d4321d69950a8e33d269ea78064df37;hb=583eb04b541175035d6d452ca626a96ebf2b7437;hp=8048c568c78b69f179fe88ac0d1cd4dbb3e23c27;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 8048c568c..1dfd7c7a0 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -58,7 +58,7 @@ import { sequelizeTypescript } from '../../../initializers/database' import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../../lib/thumbnail' import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' import { Hooks } from '../../../lib/plugins/hooks' -import { MVideoDetails, MVideoFullLight } from '@server/typings/models' +import { MVideoDetails, MVideoFullLight } from '@server/types/models' import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' import { getVideoFilePath } from '@server/lib/video-paths' import toInt from 'validator/lib/toInt' @@ -317,11 +317,11 @@ async function updateVideo (req: express.Request, res: express.Response) { const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation() // Process thumbnail or create it from the video - const thumbnailModel = req.files && req.files['thumbnailfile'] + const thumbnailModel = req.files?.['thumbnailfile'] ? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE, false) : undefined - const previewModel = req.files && req.files['previewfile'] + const previewModel = req.files?.['previewfile'] ? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW, false) : undefined @@ -482,6 +482,7 @@ async function getVideoDescription (req: express.Request, res: express.Response) async function getVideoFileMetadata (req: express.Request, res: express.Response) { const videoFile = await VideoFileModel.loadWithMetadata(toInt(req.params.videoFileId)) + return res.json(videoFile.metadata) }