Fix thumbnail when listing my videos

pull/1813/head
Chocobozzz 2019-04-26 10:20:58 +02:00
parent c342726ad4
commit a18f275d30
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 11 additions and 12 deletions

View File

@ -1126,15 +1126,11 @@ export class VideoModel extends Model<VideoModel> {
const countQuery = buildBaseQuery()
const findQuery = buildBaseQuery()
findQuery.include.push({
model: ScheduleVideoUpdateModel,
required: false
})
findQuery.include.push({
model: VideoBlacklistModel,
required: false
})
const findScopes = [
ScopeNames.WITH_SCHEDULED_UPDATE,
ScopeNames.WITH_BLACKLISTED,
ScopeNames.WITH_THUMBNAILS
]
if (withFiles === true) {
findQuery.include.push({
@ -1145,7 +1141,7 @@ export class VideoModel extends Model<VideoModel> {
return Promise.all([
VideoModel.count(countQuery),
VideoModel.findAll(findQuery)
VideoModel.scope(findScopes).findAll(findQuery)
]).then(([ count, rows ]) => {
return {
data: rows,

View File

@ -2,7 +2,7 @@
import * as chai from 'chai'
import 'mocha'
import { User, UserRole } from '../../../../shared/index'
import { User, UserRole, Video } from '../../../../shared/index'
import {
blockUser,
cleanupTests,
@ -290,7 +290,10 @@ describe('Test users', function () {
const videos = res.body.data
expect(videos).to.have.lengthOf(1)
expect(videos[ 0 ].name).to.equal('super user video')
const video: Video = videos[ 0 ]
expect(video.name).to.equal('super user video')
expect(video.thumbnailPath).to.not.be.null
expect(video.previewPath).to.not.be.null
})
})