OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix video comments feed SQL query

pull/2815/head
Chocobozzz 2020-06-05 10:42:36 +02:00
parent 0f32d49915
commit b84d4c809f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/models/video/video-comment.ts
View File

@ -144,6 +144,11 @@ enum ScopeNames {
}, },
{ {
fields: [ 'accountId' ] fields: [ 'accountId' ]
},
{
fields: [
{ name: 'createdAt', order: 'DESC' }
]
} }
] ]
}) })

4
server/models/video/video.ts
View File

@ -23,7 +23,7 @@ import {
Table, Table,
UpdatedAt UpdatedAt
} from 'sequelize-typescript' } from 'sequelize-typescript'
import { UserRight, VideoPrivacy, VideoState } from '../../../shared' import { UserRight, VideoPrivacy, VideoState, ResultList } from '../../../shared'
import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
import { Video, VideoDetails } from '../../../shared/models/videos' import { Video, VideoDetails } from '../../../shared/models/videos'
import { VideoFilter } from '../../../shared/models/videos/video-query.type' import { VideoFilter } from '../../../shared/models/videos/video-query.type'
@ -1442,7 +1442,7 @@ export class VideoModel extends Model<VideoModel> {
private static async getAvailableForApi ( private static async getAvailableForApi (
options: BuildVideosQueryOptions, options: BuildVideosQueryOptions,
countVideos = true countVideos = true
) { ): Promise<ResultList<VideoModel>> {
function getCount () { function getCount () {
if (countVideos !== true) return Promise.resolve(undefined) if (countVideos !== true) return Promise.resolve(undefined)