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/config.ts | |
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/config.ts')
-rw-r--r-- | server/controllers/api/config.ts | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 6497cda3c..bd0ba4f9d 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
@@ -94,6 +94,13 @@ async function getConfig (req: express.Request, res: express.Response) { | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | }, | 96 | }, |
97 | autoBlacklist: { | ||
98 | videos: { | ||
99 | ofUsers: { | ||
100 | enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED | ||
101 | } | ||
102 | } | ||
103 | }, | ||
97 | avatar: { | 104 | avatar: { |
98 | file: { | 105 | file: { |
99 | size: { | 106 | size: { |
@@ -265,6 +272,13 @@ function customConfig (): CustomConfig { | |||
265 | enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED | 272 | enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED |
266 | } | 273 | } |
267 | } | 274 | } |
275 | }, | ||
276 | autoBlacklist: { | ||
277 | videos: { | ||
278 | ofUsers: { | ||
279 | enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED | ||
280 | } | ||
281 | } | ||
268 | } | 282 | } |
269 | } | 283 | } |
270 | } | 284 | } |