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

Fix tests

Browse source
This commit is contained in:
Chocobozzz 2019-08-20 10:22:05 +02:00
parent 453e83ea5d
commit 96ca24f00e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import {
MChannelActorAccountDefault,
MThumbnail,
MUser,
MVideoTag,
MVideoThumbnailAccountDefault,
MVideoWithBlacklistLight
} from '@server/typings/models'
@ -244,7 +245,7 @@ function insertIntoDB (parameters: {
const sequelizeOptions = { transaction: t }
// Save video object in database
const videoCreated = await video.save(sequelizeOptions) as (MVideoThumbnailAccountDefault & MVideoWithBlacklistLight)
const videoCreated = await video.save(sequelizeOptions) as (MVideoThumbnailAccountDefault & MVideoWithBlacklistLight & MVideoTag)
videoCreated.VideoChannel = videoChannel
if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
@ -264,6 +265,9 @@ function insertIntoDB (parameters: {
const tagInstances = await TagModel.findOrCreateTags(tags, t)
await videoCreated.$set('Tags', tagInstances, sequelizeOptions)
videoCreated.Tags = tagInstances
} else {
videoCreated.Tags = []
}
// Create video import object in database

4
server/controllers/api/videos/index.ts
View file

@ -63,7 +63,7 @@ import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../
import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-transcoding'
import { Hooks } from '../../../lib/plugins/hooks'
import { MVideoFullLight } from '@server/typings/models'
import { MVideoDetails, MVideoFullLight } from '@server/typings/models'
const auditLogger = auditLoggerFactory('videos')
const videosRouter = express.Router()
@ -198,7 +198,7 @@ async function addVideo (req: express.Request, res: express.Response) {
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 videoFile = new VideoFileModel({