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 /client/src/app/+admin/moderation/moderation.routes.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 'client/src/app/+admin/moderation/moderation.routes.ts')
-rw-r--r-- | client/src/app/+admin/moderation/moderation.routes.ts | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts index 6f6dde290..a024f2bee 100644 --- a/client/src/app/+admin/moderation/moderation.routes.ts +++ b/client/src/app/+admin/moderation/moderation.routes.ts | |||
@@ -3,6 +3,7 @@ import { UserRight } from '../../../../../shared' | |||
3 | import { UserRightGuard } from '@app/core' | 3 | import { UserRightGuard } from '@app/core' |
4 | import { VideoAbuseListComponent } from '@app/+admin/moderation/video-abuse-list' | 4 | import { VideoAbuseListComponent } from '@app/+admin/moderation/video-abuse-list' |
5 | import { VideoBlacklistListComponent } from '@app/+admin/moderation/video-blacklist-list' | 5 | import { VideoBlacklistListComponent } from '@app/+admin/moderation/video-blacklist-list' |
6 | import { VideoAutoBlacklistListComponent } from '@app/+admin/moderation/video-auto-blacklist-list' | ||
6 | import { ModerationComponent } from '@app/+admin/moderation/moderation.component' | 7 | import { ModerationComponent } from '@app/+admin/moderation/moderation.component' |
7 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' | 8 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' |
8 | 9 | ||
@@ -27,6 +28,11 @@ export const ModerationRoutes: Routes = [ | |||
27 | pathMatch: 'full' | 28 | pathMatch: 'full' |
28 | }, | 29 | }, |
29 | { | 30 | { |
31 | path: 'video-auto-blacklist', | ||
32 | redirectTo: 'video-auto-blacklist/list', | ||
33 | pathMatch: 'full' | ||
34 | }, | ||
35 | { | ||
30 | path: 'video-abuses/list', | 36 | path: 'video-abuses/list', |
31 | component: VideoAbuseListComponent, | 37 | component: VideoAbuseListComponent, |
32 | canActivate: [ UserRightGuard ], | 38 | canActivate: [ UserRightGuard ], |
@@ -38,6 +44,17 @@ export const ModerationRoutes: Routes = [ | |||
38 | } | 44 | } |
39 | }, | 45 | }, |
40 | { | 46 | { |
47 | path: 'video-auto-blacklist/list', | ||
48 | component: VideoAutoBlacklistListComponent, | ||
49 | canActivate: [ UserRightGuard ], | ||
50 | data: { | ||
51 | userRight: UserRight.MANAGE_VIDEO_BLACKLIST, | ||
52 | meta: { | ||
53 | title: 'Auto-blacklisted videos' | ||
54 | } | ||
55 | } | ||
56 | }, | ||
57 | { | ||
41 | path: 'video-blacklist/list', | 58 | path: 'video-blacklist/list', |
42 | component: VideoBlacklistListComponent, | 59 | component: VideoBlacklistListComponent, |
43 | canActivate: [ UserRightGuard ], | 60 | canActivate: [ UserRightGuard ], |