mirror of https://github.com/Chocobozzz/PeerTube
Fix thumbnail when listing my videos
parent
c342726ad4
commit
a18f275d30
|
@ -1126,15 +1126,11 @@ export class VideoModel extends Model<VideoModel> {
|
||||||
const countQuery = buildBaseQuery()
|
const countQuery = buildBaseQuery()
|
||||||
const findQuery = buildBaseQuery()
|
const findQuery = buildBaseQuery()
|
||||||
|
|
||||||
findQuery.include.push({
|
const findScopes = [
|
||||||
model: ScheduleVideoUpdateModel,
|
ScopeNames.WITH_SCHEDULED_UPDATE,
|
||||||
required: false
|
ScopeNames.WITH_BLACKLISTED,
|
||||||
})
|
ScopeNames.WITH_THUMBNAILS
|
||||||
|
]
|
||||||
findQuery.include.push({
|
|
||||||
model: VideoBlacklistModel,
|
|
||||||
required: false
|
|
||||||
})
|
|
||||||
|
|
||||||
if (withFiles === true) {
|
if (withFiles === true) {
|
||||||
findQuery.include.push({
|
findQuery.include.push({
|
||||||
|
@ -1145,7 +1141,7 @@ export class VideoModel extends Model<VideoModel> {
|
||||||
|
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
VideoModel.count(countQuery),
|
VideoModel.count(countQuery),
|
||||||
VideoModel.findAll(findQuery)
|
VideoModel.scope(findScopes).findAll(findQuery)
|
||||||
]).then(([ count, rows ]) => {
|
]).then(([ count, rows ]) => {
|
||||||
return {
|
return {
|
||||||
data: rows,
|
data: rows,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import * as chai from 'chai'
|
import * as chai from 'chai'
|
||||||
import 'mocha'
|
import 'mocha'
|
||||||
import { User, UserRole } from '../../../../shared/index'
|
import { User, UserRole, Video } from '../../../../shared/index'
|
||||||
import {
|
import {
|
||||||
blockUser,
|
blockUser,
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
|
@ -290,7 +290,10 @@ describe('Test users', function () {
|
||||||
const videos = res.body.data
|
const videos = res.body.data
|
||||||
expect(videos).to.have.lengthOf(1)
|
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
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue