yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Type toFormattedJSON

Browse source
This commit is contained in:
Chocobozzz 2019-08-20 19:05:31 +02:00
parent 0283eaac2a
commit 1ca9f7c3f7
No known key found for this signature in database
GPG key ID: 583A612D890159BE
54 changed files with 401 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/controllers/api/videos/import.ts
View file

@ -1,6 +1,5 @@
import * as express from 'express'
import * as magnetUtil from 'magnet-uri'
import 'multer'
import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger'
import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares'
import { MIMETYPES } from '../../../initializers/constants'
@ -28,11 +27,12 @@ import {
MChannelAccountDefault,
MThumbnail,
MUser,
MVideoAccountDefault,
MVideoTag,
MVideoThumbnailAccountDefault,
MVideoWithBlacklistLight
} from '@server/typings/models'
import { MVideoImport, MVideoImportVideo } from '@server/typings/models/video/video-import'
import { MVideoImport, MVideoImportFormattable } from '@server/typings/models/video/video-import'
const auditLogger = auditLoggerFactory('video-imports')
const videoImportsRouter = express.Router()
@ -238,14 +238,14 @@ function insertIntoDB (parameters: {
tags: string[],
videoImportAttributes: Partial<MVideoImport>,
user: MUser
}): Bluebird<MVideoImportVideo> {
}): Bluebird<MVideoImportFormattable> {
const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters
return sequelizeTypescript.transaction(async t => {
const sequelizeOptions = { transaction: t }
// Save video object in database
const videoCreated = await video.save(sequelizeOptions) as (MVideoThumbnailAccountDefault & MVideoWithBlacklistLight & MVideoTag)
const videoCreated = await video.save(sequelizeOptions) as (MVideoAccountDefault & MVideoWithBlacklistLight & MVideoTag)
videoCreated.VideoChannel = videoChannel
if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
@ -274,7 +274,7 @@ function insertIntoDB (parameters: {
const videoImport = await VideoImportModel.create(
Object.assign({ videoId: videoCreated.id }, videoImportAttributes),
sequelizeOptions
) as MVideoImportVideo
) as MVideoImportFormattable
videoImport.Video = videoCreated
return videoImport