aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/video
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
committerChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
commit00aab0666c6f772548c160fdfa871a8843b88f37 (patch)
tree73958f6f5d41371980f9653c8cb0ed8f46683c5a /server/models/video
parentbe04c6fdab5d91a7a57fa3ff36cde22a549c29da (diff)
parent951532924c1b3fd547cbf45f0c9cf9734203d6b4 (diff)
downloadPeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.gz
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.zst
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.zip
Merge branch 'release/1.4.0' into develop
Diffstat (limited to 'server/models/video')
-rw-r--r--server/models/video/video-blacklist.ts7
1 files changed, 3 insertions, 4 deletions
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index b4df6cd6a..533bfe1ad 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,11 +1,11 @@
1import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' 1import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
2import { getSortOnModel, SortType, throwIfNotValid } from '../utils' 2import { getBlacklistSort, SortType, throwIfNotValid } from '../utils'
3import { VideoModel } from './video' 3import { VideoModel } from './video'
4import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' 4import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
5import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist' 5import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist'
6import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos' 6import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos'
7import { CONSTRAINTS_FIELDS } from '../../initializers/constants' 7import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
8import { FindOptions } from 'sequelize' 8import { FindOptions, literal } from 'sequelize'
9import { ThumbnailModel } from './thumbnail' 9import { ThumbnailModel } from './thumbnail'
10import * as Bluebird from 'bluebird' 10import * as Bluebird from 'bluebird'
11import { MVideoBlacklist, MVideoBlacklistFormattable } from '@server/typings/models' 11import { MVideoBlacklist, MVideoBlacklistFormattable } from '@server/typings/models'
@@ -59,14 +59,13 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
59 return { 59 return {
60 offset: start, 60 offset: start,
61 limit: count, 61 limit: count,
62 order: getSortOnModel(sort.sortModel, sort.sortValue) 62 order: getBlacklistSort(sort.sortModel, sort.sortValue)
63 } 63 }
64 } 64 }
65 65
66 const countQuery = buildBaseQuery() 66 const countQuery = buildBaseQuery()
67 67
68 const findQuery = buildBaseQuery() 68 const findQuery = buildBaseQuery()
69 findQuery.subQuery = false
70 findQuery.include = [ 69 findQuery.include = [
71 { 70 {
72 model: VideoModel, 71 model: VideoModel,