21 files changed, 78 insertions, 79 deletions

diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index 0cd3e54c2..c3e4895ac 100644
--- a/client/src/app/+admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -9,7 +9,7 @@ import { RequestSchedulersRoutes } from './request-schedulers'
 import { UsersRoutes } from './users'
 import { VideoAbusesRoutes } from './video-abuses'
 import { AdminGuard } from './admin-guard.service'
-import { BlacklistRoutes } from './blacklist'
+import { VideoBlacklistRoutes } from './video-blacklist'
 
 const adminRoutes: Routes = [
   {
@@ -27,7 +27,7 @@ const adminRoutes: Routes = [
       ...RequestSchedulersRoutes,
       ...UsersRoutes,
       ...VideoAbusesRoutes,
-      ...BlacklistRoutes
+      ...VideoBlacklistRoutes
     ]
   }
 ]
diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 93ec216bf..ecd62ee61 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -3,6 +3,5 @@ import { Component } from '@angular/core'
 @Component({
   template: '<router-outlet></router-outlet>'
 })
-
 export class AdminComponent {
 }
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index c2dd60774..f29c501b0 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -6,7 +6,7 @@ import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendServic
 import { RequestSchedulersComponent, RequestSchedulersStatsComponent, RequestSchedulersService } from './request-schedulers'
 import { UsersComponent, UserAddComponent, UserUpdateComponent, UserListComponent, UserService } from './users'
 import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses'
-import { BlacklistComponent, BlacklistListComponent, BlacklistService } from './blacklist'
+import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist'
 import { SharedModule } from '../shared'
 import { AdminGuard } from './admin-guard.service'
 
@@ -31,8 +31,8 @@ import { AdminGuard } from './admin-guard.service'
     UserUpdateComponent,
     UserListComponent,
 
-    BlacklistComponent,
-    BlacklistListComponent,
+    VideoBlacklistComponent,
+    VideoBlacklistListComponent,
 
     VideoAbusesComponent,
     VideoAbuseListComponent
@@ -46,8 +46,7 @@ import { AdminGuard } from './admin-guard.service'
     FriendService,
     RequestSchedulersService,
     UserService,
-    AdminGuard,
-    BlacklistService
+    AdminGuard
   ]
 })
 export class AdminModule { }
diff --git a/client/src/app/+admin/blacklist/blacklist-list/index.ts b/client/src/app/+admin/blacklist/blacklist-list/index.ts
deleted file mode 100644
index 45f60a2b9..000000000
--- a/client/src/app/+admin/blacklist/blacklist-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './blacklist-list.component'
diff --git a/client/src/app/+admin/blacklist/blacklist.routes.ts b/client/src/app/+admin/blacklist/blacklist.routes.ts
deleted file mode 100644
index 780347ca8..000000000
--- a/client/src/app/+admin/blacklist/blacklist.routes.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Routes } from '@angular/router'
-
-import { BlacklistComponent } from './blacklist.component'
-import { BlacklistListComponent } from './blacklist-list'
-
-export const BlacklistRoutes: Routes = [
-  {
-    path: 'blacklist',
-    component: BlacklistComponent,
-    children: [
-      {
-        path: '',
-        redirectTo: 'list',
-        pathMatch: 'full'
-      },
-      {
-        path: 'list',
-        component: BlacklistListComponent,
-        data: {
-          meta: {
-            title: 'Blacklisted videos'
-          }
-        }
-      }
-    ]
-  }
-]
diff --git a/client/src/app/+admin/blacklist/index.ts b/client/src/app/+admin/blacklist/index.ts
deleted file mode 100644
index 675dc1263..000000000
--- a/client/src/app/+admin/blacklist/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './shared'
-export * from './blacklist-list'
-export * from './blacklist.component'
-export * from './blacklist.routes'
diff --git a/client/src/app/+admin/blacklist/shared/index.ts b/client/src/app/+admin/blacklist/shared/index.ts
deleted file mode 100644
index ad22e2d51..000000000
--- a/client/src/app/+admin/blacklist/shared/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './blacklist.service'
diff --git a/client/src/app/+admin/video-blacklist/index.ts b/client/src/app/+admin/video-blacklist/index.ts
new file mode 100644
index 000000000..a5451e2e1
--- /dev/null
+++ b/client/src/app/+admin/video-blacklist/index.ts
@@ -0,0 +1,3 @@
+export * from './video-blacklist-list'
+export * from './video-blacklist.component'
+export * from './video-blacklist.routes'
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/index.ts b/client/src/app/+admin/video-blacklist/video-blacklist-list/index.ts
new file mode 100644
index 000000000..4daf64187
--- /dev/null
+++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/index.ts
@@ -0,0 +1 @@
+export * from './video-blacklist-list.component'
diff --git a/client/src/app/+admin/blacklist/blacklist-list/blacklist-list.component.html b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html
index 5d4636ee9..05d116798 100644
--- a/client/src/app/+admin/blacklist/blacklist-list/blacklist-list.component.html
+++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html
@@ -18,8 +18,8 @@
       <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
       <p-column header="Delete" styleClass="action-cell">
         <ng-template pTemplate="body" let-entry="rowData">
-          <span (click)="removeVideoFromBlacklist(entry)" class="glyphicon glyphicon-remove glyphicon-black" title="Remove this video"></span>
-        </ng-template>
+          <span (click)="removeVideoFromBlacklist(entry)" class="glyphicon glyphicon-remove glyphicon-black" title="Remove this video from blacklist"></span>
+        </ng-template>
       </p-column>
     </p-dataTable>
   </div>
diff --git a/client/src/app/+admin/blacklist/blacklist-list/blacklist-list.component.ts b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts
index b308054ed..56024b247 100644
--- a/client/src/app/+admin/blacklist/blacklist-list/blacklist-list.component.ts
+++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts
@@ -4,16 +4,15 @@ import { SortMeta } from 'primeng/components/common/sortmeta'
 import { NotificationsService } from 'angular2-notifications'
 
 import { ConfirmService } from '../../../core'
-import { RestTable, RestPagination } from '../../../shared'
-import { BlacklistService } from '../shared'
+import { VideoBlacklistService, RestTable, RestPagination } from '../../../shared'
 import { BlacklistedVideo } from '../../../../../../shared'
 
 @Component({
-  selector: 'my-blacklist-list',
-  templateUrl: './blacklist-list.component.html',
+  selector: 'my-video-blacklist-list',
+  templateUrl: './video-blacklist-list.component.html',
   styleUrls: []
 })
-export class BlacklistListComponent extends RestTable implements OnInit {
+export class VideoBlacklistListComponent extends RestTable implements OnInit {
   blacklist: BlacklistedVideo[] = []
   totalRecords = 0
   rowsPerPage = 10
@@ -23,7 +22,7 @@ export class BlacklistListComponent extends RestTable implements OnInit {
   constructor (
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
-    private blacklistService: BlacklistService
+    private videoBlacklistService: VideoBlacklistService
   ) {
     super()
   }
@@ -39,7 +38,7 @@ export class BlacklistListComponent extends RestTable implements OnInit {
       res => {
         if (res === false) return
 
-        this.blacklistService.removeVideoFromBlacklist(entry).subscribe(
+        this.videoBlacklistService.removeVideoFromBlacklist(entry.videoId).subscribe(
           status => {
             this.notificationsService.success('Success', `Video ${entry.name} removed from the blacklist.`)
             this.loadData()
@@ -52,7 +51,7 @@ export class BlacklistListComponent extends RestTable implements OnInit {
   }
 
   protected loadData () {
-    this.blacklistService.getBlacklist(this.pagination, this.sort)
+    this.videoBlacklistService.listBlacklist(this.pagination, this.sort)
       .subscribe(
         resultList => {
           this.blacklist = resultList.data
diff --git a/client/src/app/+admin/blacklist/blacklist.component.ts b/client/src/app/+admin/video-blacklist/video-blacklist.component.ts
index ce8fe4298..24b8c98f8 100644
--- a/client/src/app/+admin/blacklist/blacklist.component.ts
+++ b/client/src/app/+admin/video-blacklist/video-blacklist.component.ts
@@ -3,6 +3,5 @@ import { Component } from '@angular/core'
 @Component({
   template: '<router-outlet></router-outlet>'
 })
-
-export class BlacklistComponent {
+export class VideoBlacklistComponent {
 }
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts b/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts
new file mode 100644
index 000000000..682b6f8bd
--- /dev/null
+++ b/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts
@@ -0,0 +1,27 @@
+import { Routes } from '@angular/router'
+
+import { VideoBlacklistComponent } from './video-blacklist.component'
+import { VideoBlacklistListComponent } from './video-blacklist-list'
+
+export const VideoBlacklistRoutes: Routes = [
+  {
+    path: 'video-blacklist',
+    component: VideoBlacklistComponent,
+    children: [
+      {
+        path: '',
+        redirectTo: 'list',
+        pathMatch: 'full'
+      },
+      {
+        path: 'list',
+        component: VideoBlacklistListComponent,
+        data: {
+          meta: {
+            title: 'Blacklisted videos'
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 68719f73d..7d890e72a 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -11,7 +11,7 @@ import { UserService } from './shared'
 })
 export class AppComponent implements OnInit {
   notificationOptions = {
-    timeOut: 3000,
+    timeOut: 5000,
     lastOnBottom: true,
     clickToClose: true,
     maxLength: 0,
diff --git a/client/src/app/core/menu/menu-admin.component.html b/client/src/app/core/menu/menu-admin.component.html
index f512a4e67..edacdee6d 100644
--- a/client/src/app/core/menu/menu-admin.component.html
+++ b/client/src/app/core/menu/menu-admin.component.html
@@ -20,7 +20,7 @@
       Video abuses
     </a>
 
-    <a routerLink="/admin/blacklist/list" routerLinkActive="active">
+    <a routerLink="/admin/video-blacklist/list" routerLinkActive="active">
       <span class="hidden-xs glyphicon glyphicon-eye-close"></span>
       Video blacklist
     </a>
diff --git a/client/src/app/shared/index.ts b/client/src/app/shared/index.ts
index 212645c51..79bf5ef43 100644
--- a/client/src/app/shared/index.ts
+++ b/client/src/app/shared/index.ts
@@ -4,5 +4,6 @@ export * from './rest'
 export * from './search'
 export * from './users'
 export * from './video-abuse'
+export * from './video-blacklist'
 export * from './shared.module'
 export * from './utils'
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 56da62fc4..47f651590 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -18,6 +18,7 @@ import { RestExtractor, RestService } from './rest'
 import { SearchComponent, SearchService } from './search'
 import { UserService } from './users'
 import { VideoAbuseService } from './video-abuse'
+import { VideoBlacklistService } from './video-blacklist'
 
 @NgModule({
   imports: [
@@ -67,6 +68,7 @@ import { VideoAbuseService } from './video-abuse'
     RestService,
     SearchService,
     VideoAbuseService,
+    VideoBlacklistService,
     UserService
   ]
 })
diff --git a/client/src/app/shared/video-blacklist/index.ts b/client/src/app/shared/video-blacklist/index.ts
new file mode 100644
index 000000000..bfb026441
--- /dev/null
+++ b/client/src/app/shared/video-blacklist/index.ts
@@ -0,0 +1 @@
+export * from './video-blacklist.service'
diff --git a/client/src/app/+admin/blacklist/shared/blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
index ee2bf82e9..17373d52e 100644
--- a/client/src/app/+admin/blacklist/shared/blacklist.service.ts
+++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
@@ -6,13 +6,13 @@ import 'rxjs/add/operator/map'
 
 import { SortMeta } from 'primeng/components/common/sortmeta'
 
-import { RestExtractor, RestPagination, RestService } from '../../../shared'
-import { Utils } from '../../../shared'
-import { BlacklistedVideo, ResultList } from '../../../../../../shared'
+import { RestExtractor, RestPagination, RestService } from '../rest'
+import { Utils } from '../utils'
+import { BlacklistedVideo, ResultList } from '../../../../../shared'
 
 @Injectable()
-export class BlacklistService {
-  private static BASE_BLACKLISTS_URL = API_URL + '/api/v1/blacklist/'
+export class VideoBlacklistService {
+  private static BASE_VIDEOS_URL = API_URL + '/api/v1/videos/'
 
   constructor (
     private authHttp: HttpClient,
@@ -20,22 +20,28 @@ export class BlacklistService {
     private restExtractor: RestExtractor
   ) {}
 
-  getBlacklist (pagination: RestPagination, sort: SortMeta): Observable<ResultList<BlacklistedVideo>> {
+  listBlacklist (pagination: RestPagination, sort: SortMeta): Observable<ResultList<BlacklistedVideo>> {
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
 
-    return this.authHttp.get<ResultList<BlacklistedVideo>>(BlacklistService.BASE_BLACKLISTS_URL, { params })
+    return this.authHttp.get<ResultList<BlacklistedVideo>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
                         .map(res => this.restExtractor.convertResultListDateToHuman(res))
                         .map(res => this.restExtractor.applyToResultListData(res, this.formatBlacklistedVideo.bind(this)))
                         .catch(res => this.restExtractor.handleError(res))
   }
 
-  removeVideoFromBlacklist (entry: BlacklistedVideo) {
-    return this.authHttp.delete(BlacklistService.BASE_BLACKLISTS_URL + entry.id)
+  removeVideoFromBlacklist (videoId: number) {
+    return this.authHttp.delete(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist')
                         .map(this.restExtractor.extractDataBool)
                         .catch(res => this.restExtractor.handleError(res))
   }
 
+  blacklistVideo (videoId: number) {
+    return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', {})
+               .map(this.restExtractor.extractDataBool)
+               .catch(res => this.restExtractor.handleError(res))
+  }
+
   private formatBlacklistedVideo (blacklistedVideo: BlacklistedVideo) {
     return Object.assign(blacklistedVideo, {
       createdAt: Utils.dateToHuman(blacklistedVideo.createdAt)
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 874dd5997..bd98e877c 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -14,7 +14,7 @@ import { VideoMagnetComponent } from './video-magnet.component'
 import { VideoShareComponent } from './video-share.component'
 import { VideoReportComponent } from './video-report.component'
 import { Video, VideoService } from '../shared'
-import { WebTorrentService } from './webtorrent.service'
+import { VideoBlacklistService } from '../../shared'
 import { UserVideoRateType, VideoRateType } from '../../../../../shared'
 
 @Component({
@@ -45,6 +45,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private router: Router,
     private videoService: VideoService,
+    private videoBlacklistService: VideoBlacklistService,
     private confirmService: ConfirmService,
     private metaService: MetaService,
     private authService: AuthService,
@@ -137,15 +138,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       res => {
         if (res === false) return
 
-        this.videoService.blacklistVideo(this.video.id)
-                         .subscribe(
-                           status => {
-                             this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
-                             this.router.navigate(['/videos/list'])
-                           },
+        this.videoBlacklistService.blacklistVideo(this.video.id)
+                                  .subscribe(
+                                    status => {
+                                      this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
+                                      this.router.navigate(['/videos/list'])
+                                    },
 
-                           error => this.notificationsService.error('Error', error.text)
-                         )
+                                    error => this.notificationsService.error('Error', error.text)
+                                  )
       }
     )
   }
diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts
index 037c20416..fe7f9108d 100644
--- a/client/src/app/videos/shared/video.service.ts
+++ b/client/src/app/videos/shared/video.service.ts
@@ -122,12 +122,6 @@ export class VideoService {
                         .catch(res => this.restExtractor.handleError(res))
   }
 
-  blacklistVideo (id: number) {
-    return this.authHttp.post(VideoService.BASE_VIDEO_URL + id + '/blacklist', {})
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(res => this.restExtractor.handleError(res))
-  }
-
   private videoPaginationToRestPagination (videoPagination: VideoPagination) {
     const start: number = (videoPagination.currentPage - 1) * videoPagination.itemsPerPage
     const count: number = videoPagination.itemsPerPage