aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-21 11:21:56 +0200
committerChocobozzz <me@florianbigard.com>2019-05-21 11:21:56 +0200
commit432ebe8bddb407bfbe503b782d59b1ee4c0d6842 (patch)
treeb37b83b0edea8655e7fc24326eb520ebb29297fe /server
parent73b3aa6429dfb2e31628fa09a479dce318289d7d (diff)
parentb9dde7d96b28a8004a2698f465447f0f9b6b6dbb (diff)
downloadPeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.tar.gz
PeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.tar.zst
PeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.zip
Merge branch 'release/v1.3.0' into develop
Diffstat (limited to 'server')
-rw-r--r--server/models/video/video-blacklist.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index d9fe9dfc9..3bd74460d 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,6 +1,6 @@
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 { getSortOnModel, SortType, throwIfNotValid } from '../utils'
3import { VideoModel } from './video' 3import { VideoModel, ScopeNames as VideoModelScopeNames } from './video'
4import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel' 4import { ScopeNames as VideoChannelScopeNames, 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'
@@ -58,7 +58,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
58 order: getSortOnModel(sort.sortModel, sort.sortValue), 58 order: getSortOnModel(sort.sortModel, sort.sortValue),
59 include: [ 59 include: [
60 { 60 {
61 model: VideoModel, 61 model: VideoModel.scope(VideoModelScopeNames.WITH_THUMBNAILS),
62 required: true, 62 required: true,
63 include: [ 63 include: [
64 { 64 {