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/shared/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 'client/src/app/shared/users')
-rw-r--r-- | client/src/app/shared/users/user-notification.model.ts | 6 | ||||
-rw-r--r-- | client/src/app/shared/users/user-notifications.component.html | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 097830752..7d0eb5ea2 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts | |||
@@ -54,6 +54,7 @@ export class UserNotification implements UserNotificationServer { | |||
54 | videoUrl?: string | 54 | videoUrl?: string |
55 | commentUrl?: any[] | 55 | commentUrl?: any[] |
56 | videoAbuseUrl?: string | 56 | videoAbuseUrl?: string |
57 | videoAutoBlacklistUrl?: string | ||
57 | accountUrl?: string | 58 | accountUrl?: string |
58 | videoImportIdentifier?: string | 59 | videoImportIdentifier?: string |
59 | videoImportUrl?: string | 60 | videoImportUrl?: string |
@@ -107,6 +108,11 @@ export class UserNotification implements UserNotificationServer { | |||
107 | this.videoUrl = this.buildVideoUrl(this.videoAbuse.video) | 108 | this.videoUrl = this.buildVideoUrl(this.videoAbuse.video) |
108 | break | 109 | break |
109 | 110 | ||
111 | case UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS: | ||
112 | this.videoAutoBlacklistUrl = '/admin/moderation/video-auto-blacklist/list' | ||
113 | this.videoUrl = this.buildVideoUrl(this.video) | ||
114 | break | ||
115 | |||
110 | case UserNotificationType.BLACKLIST_ON_MY_VIDEO: | 116 | case UserNotificationType.BLACKLIST_ON_MY_VIDEO: |
111 | this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video) | 117 | this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video) |
112 | break | 118 | break |
diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index 1c0af1bb0..6d2f2750e 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html | |||
@@ -36,6 +36,14 @@ | |||
36 | </div> | 36 | </div> |
37 | </ng-container> | 37 | </ng-container> |
38 | 38 | ||
39 | <ng-container i18n *ngSwitchCase="UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS"> | ||
40 | <my-global-icon iconName="no"></my-global-icon> | ||
41 | |||
42 | <div class="message"> | ||
43 | The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">auto-blacklisted</a> | ||
44 | </div> | ||
45 | </ng-container> | ||
46 | |||
39 | <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_COMMENT_ON_MY_VIDEO"> | 47 | <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_COMMENT_ON_MY_VIDEO"> |
40 | <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" /> | 48 | <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" /> |
41 | 49 | ||