aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
Diffstat (limited to 'server/models')
-rw-r--r--server/models/account/user.ts4
-rw-r--r--server/models/video/video-blacklist.ts8
2 files changed, 6 insertions, 6 deletions
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index fbd3080c6..4ea175583 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -739,11 +739,11 @@ export class UserModel extends Model<UserModel> {
739 const videoUserId = video.VideoChannel.Account.userId 739 const videoUserId = video.VideoChannel.Account.userId
740 740
741 if (video.isBlacklisted()) { 741 if (video.isBlacklisted()) {
742 return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) 742 return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
743 } 743 }
744 744
745 if (video.privacy === VideoPrivacy.PRIVATE) { 745 if (video.privacy === VideoPrivacy.PRIVATE) {
746 return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) 746 return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
747 } 747 }
748 748
749 if (video.privacy === VideoPrivacy.INTERNAL) return true 749 if (video.privacy === VideoPrivacy.INTERNAL) return true
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index 8cbfe362e..70a6ecb03 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -3,7 +3,7 @@ import { getBlacklistSort, SortType, throwIfNotValid, searchAttribute } from '..
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 { VideoBlocklist, VideoBlockType } from '../../../shared/models/videos'
7import { CONSTRAINTS_FIELDS } from '../../initializers/constants' 7import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
8import { FindOptions } from 'sequelize' 8import { FindOptions } from 'sequelize'
9import { ThumbnailModel } from './thumbnail' 9import { ThumbnailModel } from './thumbnail'
@@ -34,7 +34,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
34 @Default(null) 34 @Default(null)
35 @Is('VideoBlacklistType', value => throwIfNotValid(value, isVideoBlacklistTypeValid, 'type')) 35 @Is('VideoBlacklistType', value => throwIfNotValid(value, isVideoBlacklistTypeValid, 'type'))
36 @Column 36 @Column
37 type: VideoBlacklistType 37 type: VideoBlockType
38 38
39 @CreatedAt 39 @CreatedAt
40 createdAt: Date 40 createdAt: Date
@@ -59,7 +59,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
59 count: number 59 count: number
60 sort: SortType 60 sort: SortType
61 search?: string 61 search?: string
62 type?: VideoBlacklistType 62 type?: VideoBlockType
63 }) { 63 }) {
64 const { start, count, sort, search, type } = parameters 64 const { start, count, sort, search, type } = parameters
65 65
@@ -119,7 +119,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
119 return VideoBlacklistModel.findOne(query) 119 return VideoBlacklistModel.findOne(query)
120 } 120 }
121 121
122 toFormattedJSON (this: MVideoBlacklistFormattable): VideoBlacklist { 122 toFormattedJSON (this: MVideoBlacklistFormattable): VideoBlocklist {
123 return { 123 return {
124 id: this.id, 124 id: this.id,
125 createdAt: this.createdAt, 125 createdAt: this.createdAt,