X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=e6a8d3f9550475a3f7a13aa249eeca31194658b0;hb=e771ff815dba3b4a95633f4e1e10dacd222dfe61;hp=d216ed47dd9051d4bb050a7d3eab28a9b8165267;hpb=26e3e98ff0e222a9fb9226938ac6902af77921bd;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index d216ed47d..e6a8d3f95 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -972,7 +972,7 @@ export class VideoModel extends Model>> { }) { const { accountId, channelId, start, count, sort, search, isLive } = options - function buildBaseQuery (): FindOptions { + function buildBaseQuery (forCount: boolean): FindOptions { const where: WhereOptions = {} if (search) { @@ -1001,7 +1001,9 @@ export class VideoModel extends Model>> { where: channelWhere, include: [ { - model: AccountModel, + model: forCount + ? AccountModel.unscoped() + : AccountModel, where: { id: accountId }, @@ -1015,8 +1017,8 @@ export class VideoModel extends Model>> { return baseQuery } - const countQuery = buildBaseQuery() - const findQuery = buildBaseQuery() + const countQuery = buildBaseQuery(true) + const findQuery = buildBaseQuery(false) const findScopes: (string | ScopeOptions)[] = [ ScopeNames.WITH_SCHEDULED_UPDATE,