X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-blacklist.ts;h=694983cb316a0d623a1aaddce51bb1f6f14b18dc;hb=3d527ba173a37bd61ec8ad742642bb320d12995c;hp=b4df6cd6a3707d15bc026bc962cd82c6e68f3441;hpb=282e61e6c11f79e919c543871783fe1a00298d18;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts index b4df6cd6a..694983cb3 100644 --- a/server/models/video/video-blacklist.ts +++ b/server/models/video/video-blacklist.ts @@ -1,5 +1,5 @@ import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' -import { getSortOnModel, SortType, throwIfNotValid } from '../utils' +import { getBlacklistSort, SortType, throwIfNotValid } from '../utils' import { VideoModel } from './video' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist' @@ -59,14 +59,13 @@ export class VideoBlacklistModel extends Model { return { offset: start, limit: count, - order: getSortOnModel(sort.sortModel, sort.sortValue) + order: getBlacklistSort(sort.sortModel, sort.sortValue) } } const countQuery = buildBaseQuery() const findQuery = buildBaseQuery() - findQuery.subQuery = false findQuery.include = [ { model: VideoModel,