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/controllers/api/users | |
| 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/controllers/api/users')
| -rw-r--r-- | server/controllers/api/users/my-notifications.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts index bbafda5a6..4edad2a74 100644 --- a/server/controllers/api/users/my-notifications.ts +++ b/server/controllers/api/users/my-notifications.ts | |||
| @@ -69,6 +69,7 @@ async function updateNotificationSettings (req: express.Request, res: express.Re | |||
| 69 | newVideoFromSubscription: body.newVideoFromSubscription, | 69 | newVideoFromSubscription: body.newVideoFromSubscription, |
| 70 | newCommentOnMyVideo: body.newCommentOnMyVideo, | 70 | newCommentOnMyVideo: body.newCommentOnMyVideo, |
| 71 | videoAbuseAsModerator: body.videoAbuseAsModerator, | 71 | videoAbuseAsModerator: body.videoAbuseAsModerator, |
| 72 | videoAutoBlacklistAsModerator: body.videoAutoBlacklistAsModerator, | ||
| 72 | blacklistOnMyVideo: body.blacklistOnMyVideo, | 73 | blacklistOnMyVideo: body.blacklistOnMyVideo, |
| 73 | myVideoPublished: body.myVideoPublished, | 74 | myVideoPublished: body.myVideoPublished, |
| 74 | myVideoImportFinished: body.myVideoImportFinished, | 75 | myVideoImportFinished: body.myVideoImportFinished, |