diff options
author | Josh Morel <morel.josh@hotmail.com> | 2019-04-02 05:26:47 -0400 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-04-02 11:26:47 +0200 |
commit | 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch) | |
tree | e75dc991369c1768804fefa114eb2a832881087f /server/models/account | |
parent | 12fed49ebab0c414713d57ea316b6488ae6bef99 (diff) | |
download | PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip |
add quarantine videos feature (#1637)
* add quarantine videos feature
* increase Notification settings test timeout
to 20000ms. was completing 7000 locally but timing out
after 10000 on travis
* fix quarantine video test issues
-propagate misspelling
-remove skip from server/tests/client.ts
* WIP use blacklist for moderator video approval
instead of video.quarantine boolean
* finish auto-blacklist feature
Diffstat (limited to 'server/models/account')
-rw-r--r-- | server/models/account/user-notification-setting.ts | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/server/models/account/user-notification-setting.ts b/server/models/account/user-notification-setting.ts index f1c3ac223..ba7f739b9 100644 --- a/server/models/account/user-notification-setting.ts +++ b/server/models/account/user-notification-setting.ts | |||
@@ -59,6 +59,15 @@ export class UserNotificationSettingModel extends Model<UserNotificationSettingM | |||
59 | @AllowNull(false) | 59 | @AllowNull(false) |
60 | @Default(null) | 60 | @Default(null) |
61 | @Is( | 61 | @Is( |
62 | 'UserNotificationSettingVideoAutoBlacklistAsModerator', | ||
63 | value => throwIfNotValid(value, isUserNotificationSettingValid, 'videoAutoBlacklistAsModerator') | ||
64 | ) | ||
65 | @Column | ||
66 | videoAutoBlacklistAsModerator: UserNotificationSettingValue | ||
67 | |||
68 | @AllowNull(false) | ||
69 | @Default(null) | ||
70 | @Is( | ||
62 | 'UserNotificationSettingBlacklistOnMyVideo', | 71 | 'UserNotificationSettingBlacklistOnMyVideo', |
63 | value => throwIfNotValid(value, isUserNotificationSettingValid, 'blacklistOnMyVideo') | 72 | value => throwIfNotValid(value, isUserNotificationSettingValid, 'blacklistOnMyVideo') |
64 | ) | 73 | ) |
@@ -139,6 +148,7 @@ export class UserNotificationSettingModel extends Model<UserNotificationSettingM | |||
139 | newCommentOnMyVideo: this.newCommentOnMyVideo, | 148 | newCommentOnMyVideo: this.newCommentOnMyVideo, |
140 | newVideoFromSubscription: this.newVideoFromSubscription, | 149 | newVideoFromSubscription: this.newVideoFromSubscription, |
141 | videoAbuseAsModerator: this.videoAbuseAsModerator, | 150 | videoAbuseAsModerator: this.videoAbuseAsModerator, |
151 | videoAutoBlacklistAsModerator: this.videoAutoBlacklistAsModerator, | ||
142 | blacklistOnMyVideo: this.blacklistOnMyVideo, | 152 | blacklistOnMyVideo: this.blacklistOnMyVideo, |
143 | myVideoPublished: this.myVideoPublished, | 153 | myVideoPublished: this.myVideoPublished, |
144 | myVideoImportFinished: this.myVideoImportFinished, | 154 | myVideoImportFinished: this.myVideoImportFinished, |