Add follow tabs

Following
Follow
Followers

31 files changed, 299 insertions, 222 deletions

diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index 88f44a811..cd8b9bdef 100644
--- a/client/src/app/+admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'
 import { MetaGuard } from '@ngx-meta/core'
 
 import { AdminComponent } from './admin.component'
-import { FriendsRoutes } from './friends'
+import { FollowsRoutes } from './follows'
 import { UsersRoutes } from './users'
 import { VideoAbusesRoutes } from './video-abuses'
 import { VideoBlacklistRoutes } from './video-blacklist'
@@ -21,7 +21,7 @@ const adminRoutes: Routes = [
         redirectTo: 'users',
         pathMatch: 'full'
       },
-      ...FriendsRoutes,
+      ...FollowsRoutes,
       ...UsersRoutes,
       ...VideoAbusesRoutes,
       ...VideoBlacklistRoutes
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index 32f6c42a6..3c6b7a793 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -1,25 +1,28 @@
 import { NgModule } from '@angular/core'
-
-import { AdminComponent } from './admin.component'
+import { TabsModule } from 'ngx-bootstrap/tabs'
+import { SharedModule } from '../shared'
 import { AdminRoutingModule } from './admin-routing.module'
-import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends'
-import { UsersComponent, UserAddComponent, UserUpdateComponent, UserListComponent, UserService } from './users'
-import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses'
+import { AdminComponent } from './admin.component'
+import { FollowersListComponent, FollowingAddComponent, FollowsComponent, FollowService } from './follows'
+import { FollowingListComponent } from './follows/following-list/following-list.component'
+import { UserAddComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users'
+import { VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses'
 import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist'
-import { SharedModule } from '../shared'
 
 @NgModule({
   imports: [
     AdminRoutingModule,
+    TabsModule.forRoot(),
     SharedModule
   ],
 
   declarations: [
     AdminComponent,
 
-    FriendsComponent,
-    FriendAddComponent,
-    FriendListComponent,
+    FollowsComponent,
+    FollowingAddComponent,
+    FollowersListComponent,
+    FollowingListComponent,
 
     UsersComponent,
     UserAddComponent,
@@ -38,7 +41,7 @@ import { SharedModule } from '../shared'
   ],
 
   providers: [
-    FriendService,
+    FollowService,
     UserService
   ]
 })
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html
new file mode 100644
index 000000000..24d75d2b3
--- /dev/null
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html
@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="content-padding">
+    <h3>Followers list</h3>
+
+    <p-dataTable
+        [value]="followers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+        sortField="createdAt" (onLazyLoad)="loadLazy($event)"
+    >
+      <p-column field="id" header="ID"></p-column>
+      <p-column field="host" header="Host"></p-column>
+      <p-column field="email" header="Email"></p-column>
+      <p-column field="score" header="Score"></p-column>
+      <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
+    </p-dataTable>
+  </div>
+</div>
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.scss b/client/src/app/+admin/follows/followers-list/followers-list.component.scss
index 0a0f621c6..0a0f621c6 100644
--- a/client/src/app/+admin/friends/friend-list/friend-list.component.scss
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.scss
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
new file mode 100644
index 000000000..208a0c648
--- /dev/null
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit } from '@angular/core'
+
+import { NotificationsService } from 'angular2-notifications'
+import { SortMeta } from 'primeng/primeng'
+
+import { ConfirmService } from '../../../core'
+import { RestTable, RestPagination } from '../../../shared'
+import { Pod } from '../../../../../../shared'
+import { FollowService } from '../shared'
+
+@Component({
+  selector: 'my-followers-list',
+  templateUrl: './followers-list.component.html',
+  styleUrls: [ './followers-list.component.scss' ]
+})
+export class FollowersListComponent extends RestTable {
+  followers: Pod[] = []
+  totalRecords = 0
+  rowsPerPage = 10
+  sort: SortMeta = { field: 'createdAt', order: 1 }
+  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+
+  constructor (
+    private notificationsService: NotificationsService,
+    private followService: FollowService
+  ) {
+    super()
+  }
+
+  protected loadData () {
+    this.followService.getFollowers(this.pagination, this.sort)
+                      .subscribe(
+                        resultList => {
+                          this.followers = resultList.data
+                          this.totalRecords = resultList.total
+                        },
+
+                        err => this.notificationsService.error('Error', err.message)
+                      )
+  }
+}
diff --git a/client/src/app/+admin/follows/followers-list/index.ts b/client/src/app/+admin/follows/followers-list/index.ts
new file mode 100644
index 000000000..15390cfbe
--- /dev/null
+++ b/client/src/app/+admin/follows/followers-list/index.ts
@@ -0,0 +1 @@
+export * from './followers-list.component'
diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html
index 81d8291cd..111f6a8de 100644
--- a/client/src/app/+admin/friends/friend-add/friend-add.component.html
+++ b/client/src/app/+admin/follows/following-add/following-add.component.html
@@ -1,11 +1,11 @@
 <div class="row">
   <div class="content-padding">
 
-    <h3>Make friends</h3>
+    <h3>Add following</h3>
 
     <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
-    <form (ngSubmit)="makeFriends()" [formGroup]="form">
+    <form (ngSubmit)="addFollowing()" [formGroup]="form">
       <div class="form-group"  *ngFor="let host of hosts; let id = index; trackBy:customTrackBy">
         <label [for]="'host-' + id">Host (so without "http://")</label>
 
@@ -26,10 +26,10 @@
       </div>
 
       <div *ngIf="canMakeFriends() === false"  class="alert alert-warning">
-        It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to make friends.
+        It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to follow servers.
       </div>
 
-      <input type="submit" value="Make friends" class="btn btn-default" [disabled]="!isFormValid()">
+      <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()">
     </form>
   </div>
 </div>
diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.scss b/client/src/app/+admin/follows/following-add/following-add.component.scss
index 5fde51636..5fde51636 100644
--- a/client/src/app/+admin/friends/friend-add/friend-add.component.scss
+++ b/client/src/app/+admin/follows/following-add/following-add.component.scss
diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts
index 29ed23e0c..d95d6afa9 100644
--- a/client/src/app/+admin/friends/friend-add/friend-add.component.ts
+++ b/client/src/app/+admin/follows/following-add/following-add.component.ts
@@ -6,14 +6,14 @@ import { NotificationsService } from 'angular2-notifications'
 
 import { ConfirmService } from '../../../core'
 import { validateHost } from '../../../shared'
-import { FriendService } from '../shared'
+import { FollowService } from '../shared'
 
 @Component({
-  selector: 'my-friend-add',
-  templateUrl: './friend-add.component.html',
-  styleUrls: [ './friend-add.component.scss' ]
+  selector: 'my-following-add',
+  templateUrl: './following-add.component.html',
+  styleUrls: [ './following-add.component.scss' ]
 })
-export class FriendAddComponent implements OnInit {
+export class FollowingAddComponent implements OnInit {
   form: FormGroup
   hosts: string[] = [ ]
   error: string = null
@@ -22,7 +22,7 @@ export class FriendAddComponent implements OnInit {
     private router: Router,
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
-    private friendService: FriendService
+    private followService: FollowService
   ) {}
 
   ngOnInit () {
@@ -72,7 +72,7 @@ export class FriendAddComponent implements OnInit {
     this.hosts.splice(index, 1)
   }
 
-  makeFriends () {
+  addFollowing () {
     this.error = ''
 
     const notEmptyHosts = this.getNotEmptyHosts()
@@ -87,13 +87,13 @@ export class FriendAddComponent implements OnInit {
     }
 
     const confirmMessage = 'Are you sure to make friends with:<br /> - ' + notEmptyHosts.join('<br /> - ')
-    this.confirmService.confirm(confirmMessage, 'Make friends').subscribe(
+    this.confirmService.confirm(confirmMessage, 'Follow new server(s)').subscribe(
       res => {
         if (res === false) return
 
-        this.friendService.follow(notEmptyHosts).subscribe(
+        this.followService.follow(notEmptyHosts).subscribe(
           status => {
-            this.notificationsService.success('Success', 'Make friends request sent!')
+            this.notificationsService.success('Success', 'Follow request(s) sent!')
             // Wait requests between pods
             setTimeout(() => this.router.navigate([ '/admin/friends/list' ]), 1000)
           },
diff --git a/client/src/app/+admin/follows/following-add/index.ts b/client/src/app/+admin/follows/following-add/index.ts
new file mode 100644
index 000000000..1b1897ffa
--- /dev/null
+++ b/client/src/app/+admin/follows/following-add/index.ts
@@ -0,0 +1 @@
+export * from './following-add.component'
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
new file mode 100644
index 000000000..fbcebfaa7
--- /dev/null
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="content-padding">
+    <h3>Following list</h3>
+
+    <p-dataTable
+        [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
+        sortField="createdAt" (onLazyLoad)="loadLazy($event)"
+    >
+      <p-column field="id" header="ID"></p-column>
+      <p-column field="host" header="Host"></p-column>
+      <p-column field="email" header="Email"></p-column>
+      <p-column field="score" header="Score"></p-column>
+      <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
+    </p-dataTable>
+  </div>
+</div>
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
new file mode 100644
index 000000000..7d2c5084b
--- /dev/null
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core'
+
+import { NotificationsService } from 'angular2-notifications'
+import { SortMeta } from 'primeng/primeng'
+
+import { ConfirmService } from '../../../core'
+import { RestTable, RestPagination } from '../../../shared'
+import { Pod } from '../../../../../../shared'
+import { FollowService } from '../shared'
+
+@Component({
+  selector: 'my-followers-list',
+  templateUrl: './following-list.component.html'
+})
+export class FollowingListComponent extends RestTable {
+  following: Pod[] = []
+  totalRecords = 0
+  rowsPerPage = 10
+  sort: SortMeta = { field: 'createdAt', order: 1 }
+  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+
+  constructor (
+    private notificationsService: NotificationsService,
+    private followService: FollowService
+  ) {
+    super()
+  }
+
+  protected loadData () {
+    this.followService.getFollowing(this.pagination, this.sort)
+                      .subscribe(
+                        resultList => {
+                          this.following = resultList.data
+                          this.totalRecords = resultList.total
+                        },
+
+                        err => this.notificationsService.error('Error', err.message)
+                      )
+  }
+}
diff --git a/client/src/app/+admin/follows/following-list/index.ts b/client/src/app/+admin/follows/following-list/index.ts
new file mode 100644
index 000000000..a70d46a7e
--- /dev/null
+++ b/client/src/app/+admin/follows/following-list/index.ts
@@ -0,0 +1 @@
+export * from './following-list.component'
diff --git a/client/src/app/+admin/follows/follows.component.html b/client/src/app/+admin/follows/follows.component.html
new file mode 100644
index 000000000..b67bc9736
--- /dev/null
+++ b/client/src/app/+admin/follows/follows.component.html
@@ -0,0 +1,11 @@
+<div class="follows-menu">
+  <tabset #followsMenuTabs>
+    <tab *ngFor="let link of links">
+      <ng-template tabHeading>
+        <a class="tab-link" [routerLink]="link.path">{{ link.title }}</a>
+      </ng-template>
+    </tab>
+  </tabset>
+</div>
+
+<router-outlet></router-outlet>
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss
new file mode 100644
index 000000000..d8ab41975
--- /dev/null
+++ b/client/src/app/+admin/follows/follows.component.scss
@@ -0,0 +1,21 @@
+.follows-menu {
+  margin-top: 20px;
+}
+
+tabset /deep/ {
+  .nav-link {
+    padding: 0;
+  }
+
+  .tab-link {
+    display: block;
+    text-align: center;
+    height: 40px;
+    width: 120px;
+    line-height: 40px;
+
+    &:hover, &:active, &:focus {
+      text-decoration: none !important;
+    }
+  }
+}
diff --git a/client/src/app/+admin/follows/follows.component.ts b/client/src/app/+admin/follows/follows.component.ts
new file mode 100644
index 000000000..97422a41b
--- /dev/null
+++ b/client/src/app/+admin/follows/follows.component.ts
@@ -0,0 +1,43 @@
+import { AfterViewInit, Component, ViewChild } from '@angular/core'
+import { TabsetComponent } from 'ngx-bootstrap/tabs'
+
+@Component({
+  templateUrl: './follows.component.html',
+  styleUrls: [ './follows.component.scss' ]
+})
+export class FollowsComponent implements AfterViewInit {
+  @ViewChild('followsMenuTabs') followsMenuTabs: TabsetComponent
+
+  links = [
+    {
+      path: 'following-list',
+      title: 'Following'
+    },
+    {
+      path: 'following-add',
+      title: 'Follow'
+    },
+    {
+      path: 'followers-list',
+      title: 'Followers'
+    }
+  ]
+
+  ngAfterViewInit () {
+    // Avoid issue with change detector
+    setTimeout(() => this.updateActiveTab())
+  }
+
+  private updateActiveTab () {
+    const url = window.location.pathname
+
+    for (let i = 0; i < this.links.length; i++) {
+      const path = this.links[i].path
+
+      if (url.endsWith(path) === true) {
+        this.followsMenuTabs.tabs[i].active = true
+        return
+      }
+    }
+  }
+}
diff --git a/client/src/app/+admin/follows/follows.routes.ts b/client/src/app/+admin/follows/follows.routes.ts
new file mode 100644
index 000000000..b7d44f75b
--- /dev/null
+++ b/client/src/app/+admin/follows/follows.routes.ts
@@ -0,0 +1,53 @@
+import { Routes } from '@angular/router'
+
+import { UserRightGuard } from '../../core'
+import { FollowsComponent } from './follows.component'
+import { FollowingAddComponent } from './following-add'
+import { FollowersListComponent } from './followers-list'
+import { UserRight } from '../../../../../shared'
+import { FollowingListComponent } from './following-list/following-list.component'
+
+export const FollowsRoutes: Routes = [
+  {
+    path: 'follows',
+    component: FollowsComponent,
+    canActivate: [ UserRightGuard ],
+    data: {
+      userRight: UserRight.MANAGE_APPLICATION_FOLLOW
+    },
+    children: [
+      {
+        path: '',
+        redirectTo: 'following-list',
+        pathMatch: 'full'
+      },
+      {
+        path: 'following-list',
+        component: FollowingListComponent,
+        data: {
+          meta: {
+            title: 'Following list'
+          }
+        }
+      },
+      {
+        path: 'followers-list',
+        component: FollowersListComponent,
+        data: {
+          meta: {
+            title: 'Followers list'
+          }
+        }
+      },
+      {
+        path: 'following-add',
+        component: FollowingAddComponent,
+        data: {
+          meta: {
+            title: 'Add follow'
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/client/src/app/+admin/follows/index.ts b/client/src/app/+admin/follows/index.ts
new file mode 100644
index 000000000..7849a06e7
--- /dev/null
+++ b/client/src/app/+admin/follows/index.ts
@@ -0,0 +1,6 @@
+export * from './following-add'
+export * from './followers-list'
+export * from './following-list'
+export * from './shared'
+export * from './follows.component'
+export * from './follows.routes'
diff --git a/client/src/app/+admin/friends/shared/friend.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts
index 867656a53..622c33cea 100644
--- a/client/src/app/+admin/friends/shared/friend.service.ts
+++ b/client/src/app/+admin/follows/shared/follow.service.ts
@@ -10,8 +10,8 @@ import { RestExtractor, RestPagination, RestService } from '../../../shared'
 import { Pod, ResultList } from '../../../../../../shared'
 
 @Injectable()
-export class FriendService {
-  private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/'
+export class FollowService {
+  private static BASE_APPLICATION_URL = API_URL + '/api/v1/application'
 
   constructor (
     private authHttp: HttpClient,
@@ -23,29 +23,26 @@ export class FriendService {
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
 
-    return this.authHttp.get<ResultList<Account>>(API_URL + '/api/v1/pods/followers', { params })
+    return this.authHttp.get<ResultList<Account>>(FollowService.BASE_APPLICATION_URL + '/following', { params })
                         .map(res => this.restExtractor.convertResultListDateToHuman(res))
                         .catch(res => this.restExtractor.handleError(res))
   }
 
+  getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> {
+    let params = new HttpParams()
+    params = this.restService.addRestGetParams(params, pagination, sort)
+
+    return this.authHttp.get<ResultList<Account>>(FollowService.BASE_APPLICATION_URL + '/followers', { params })
+      .map(res => this.restExtractor.convertResultListDateToHuman(res))
+      .catch(res => this.restExtractor.handleError(res))
+  }
+
   follow (notEmptyHosts: String[]) {
     const body = {
       hosts: notEmptyHosts
     }
 
-    return this.authHttp.post(API_URL + '/api/v1/pods/follow', body)
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(res => this.restExtractor.handleError(res))
-  }
-
-  quitFriends () {
-    return this.authHttp.get(FriendService.BASE_FRIEND_URL + 'quit-friends')
-                        .map(this.restExtractor.extractDataBool)
-                        .catch(res => this.restExtractor.handleError(res))
-  }
-
-  removeFriend (friend: Pod) {
-    return this.authHttp.delete(FriendService.BASE_FRIEND_URL + friend.id)
+    return this.authHttp.post(FollowService.BASE_APPLICATION_URL + '/follow', body)
                         .map(this.restExtractor.extractDataBool)
                         .catch(res => this.restExtractor.handleError(res))
   }
diff --git a/client/src/app/+admin/follows/shared/index.ts b/client/src/app/+admin/follows/shared/index.ts
new file mode 100644
index 000000000..78d456def
--- /dev/null
+++ b/client/src/app/+admin/follows/shared/index.ts
@@ -0,0 +1 @@
+export * from './follow.service'
diff --git a/client/src/app/+admin/friends/friend-add/index.ts b/client/src/app/+admin/friends/friend-add/index.ts
deleted file mode 100644
index 978ab3d46..000000000
--- a/client/src/app/+admin/friends/friend-add/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './friend-add.component'
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.html b/client/src/app/+admin/friends/friend-list/friend-list.component.html
deleted file mode 100644
index df5a570fd..000000000
--- a/client/src/app/+admin/friends/friend-list/friend-list.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="row">
-  <div class="content-padding">
-    <h3>Friends list</h3>
-
-    <p-dataTable
-        [value]="friends" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
-        sortField="createdAt" (onLazyLoad)="loadLazy($event)"
-    >
-      <p-column field="id" header="ID"></p-column>
-      <p-column field="host" header="Host"></p-column>
-      <p-column field="email" header="Email"></p-column>
-      <p-column field="score" header="Score"></p-column>
-      <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
-      <p-column header="Delete" styleClass="action-cell">
-        <ng-template pTemplate="body" let-pod="rowData">
-          <span (click)="removeFriend(pod)" class="glyphicon glyphicon-remove glyphicon-black" title="Remove this pod"></span>
-        </ng-template>
-      </p-column>
-    </p-dataTable>
-
-    <a *ngIf="hasFriends()" class="btn btn-danger pull-left" (click)="quitFriends()">
-      Quit friends
-    </a>
-
-    <a *ngIf="!hasFriends()" class="btn btn-success pull-right" [routerLink]="[ '/admin/friends/add' ]">
-      Make friends
-    </a>
-  </div>
-</div>
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.ts b/client/src/app/+admin/friends/friend-list/friend-list.component.ts
deleted file mode 100644
index 3fa8ef19f..000000000
--- a/client/src/app/+admin/friends/friend-list/friend-list.component.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-
-import { NotificationsService } from 'angular2-notifications'
-import { SortMeta } from 'primeng/primeng'
-
-import { ConfirmService } from '../../../core'
-import { RestTable, RestPagination } from '../../../shared'
-import { Pod } from '../../../../../../shared'
-import { FriendService } from '../shared'
-
-@Component({
-  selector: 'my-friend-list',
-  templateUrl: './friend-list.component.html',
-  styleUrls: ['./friend-list.component.scss']
-})
-export class FriendListComponent extends RestTable implements OnInit {
-  friends: Pod[] = []
-  totalRecords = 0
-  rowsPerPage = 10
-  sort: SortMeta = { field: 'createdAt', order: 1 }
-  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
-
-  constructor (
-    private notificationsService: NotificationsService,
-    private confirmService: ConfirmService,
-    private friendService: FriendService
-  ) {
-    super()
-  }
-
-  ngOnInit () {
-    this.loadData()
-  }
-
-  hasFriends () {
-    return this.friends.length !== 0
-  }
-
-  quitFriends () {
-    const confirmMessage = 'Do you really want to quit your friends? All their videos will be deleted.'
-    this.confirmService.confirm(confirmMessage, 'Quit friends').subscribe(
-      res => {
-        if (res === false) return
-
-        this.friendService.quitFriends().subscribe(
-          status => {
-            this.notificationsService.success('Success', 'Friends left!')
-            this.loadData()
-          },
-
-          err => this.notificationsService.error('Error', err.message)
-        )
-      }
-    )
-  }
-
-  removeFriend (friend: Pod) {
-    const confirmMessage = 'Do you really want to remove this friend ? All its videos will be deleted.'
-
-    this.confirmService.confirm(confirmMessage, 'Remove').subscribe(
-      res => {
-        if (res === false) return
-
-        this.friendService.removeFriend(friend).subscribe(
-          status => {
-            this.notificationsService.success('Success', 'Friend removed')
-            this.loadData()
-          },
-
-          err => this.notificationsService.error('Error', err.message)
-        )
-      }
-    )
-  }
-
-  protected loadData () {
-    this.friendService.getFollowing(this.pagination, this.sort)
-                      .subscribe(
-                        resultList => {
-                          this.friends = resultList.data
-                          this.totalRecords = resultList.total
-                        },
-
-                        err => this.notificationsService.error('Error', err.message)
-                      )
-  }
-}
diff --git a/client/src/app/+admin/friends/friend-list/index.ts b/client/src/app/+admin/friends/friend-list/index.ts
deleted file mode 100644
index c9cbd2800..000000000
--- a/client/src/app/+admin/friends/friend-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './friend-list.component'
diff --git a/client/src/app/+admin/friends/friends.component.ts b/client/src/app/+admin/friends/friends.component.ts
deleted file mode 100644
index 5ef0aaa03..000000000
--- a/client/src/app/+admin/friends/friends.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-  template: '<router-outlet></router-outlet>'
-})
-export class FriendsComponent {
-}
diff --git a/client/src/app/+admin/friends/friends.routes.ts b/client/src/app/+admin/friends/friends.routes.ts
deleted file mode 100644
index e2cb953b3..000000000
--- a/client/src/app/+admin/friends/friends.routes.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Routes } from '@angular/router'
-
-import { UserRightGuard } from '../../core'
-import { FriendsComponent } from './friends.component'
-import { FriendAddComponent } from './friend-add'
-import { FriendListComponent } from './friend-list'
-import { UserRight } from '../../../../../shared'
-
-export const FriendsRoutes: Routes = [
-  {
-    path: 'friends',
-    component: FriendsComponent,
-    canActivate: [ UserRightGuard ],
-    data: {
-      userRight: UserRight.MANAGE_PEERTUBE_FOLLOW
-    },
-    children: [
-      {
-        path: '',
-        redirectTo: 'list',
-        pathMatch: 'full'
-      },
-      {
-        path: 'list',
-        component: FriendListComponent,
-        data: {
-          meta: {
-            title: 'Friends list'
-          }
-        }
-      },
-      {
-        path: 'add',
-        component: FriendAddComponent,
-        data: {
-          meta: {
-            title: 'Add friends'
-          }
-        }
-      }
-    ]
-  }
-]
diff --git a/client/src/app/+admin/friends/index.ts b/client/src/app/+admin/friends/index.ts
deleted file mode 100644
index 356dee8e9..000000000
--- a/client/src/app/+admin/friends/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './friend-add'
-export * from './friend-list'
-export * from './shared'
-export * from './friends.component'
-export * from './friends.routes'
diff --git a/client/src/app/+admin/friends/shared/index.ts b/client/src/app/+admin/friends/shared/index.ts
deleted file mode 100644
index 65ab9fb46..000000000
--- a/client/src/app/+admin/friends/shared/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './friend.service'
diff --git a/client/src/app/core/menu/menu-admin.component.html b/client/src/app/core/menu/menu-admin.component.html
index 1966a944c..99ee287c5 100644
--- a/client/src/app/core/menu/menu-admin.component.html
+++ b/client/src/app/core/menu/menu-admin.component.html
@@ -5,9 +5,9 @@
       List users
     </a>
 
-    <a *ngIf="hasFriendsRight()" routerLink="/admin/friends" routerLinkActive="active">
+    <a *ngIf="hasApplicationFollowRight()" routerLink="/admin/follows" routerLinkActive="active">
       <span class="hidden-xs glyphicon glyphicon-cloud"></span>
-      List friends
+      Manage follows
     </a>
 
     <a *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active">
diff --git a/client/src/app/core/menu/menu-admin.component.ts b/client/src/app/core/menu/menu-admin.component.ts
index 92aab9a05..88a654d1f 100644
--- a/client/src/app/core/menu/menu-admin.component.ts
+++ b/client/src/app/core/menu/menu-admin.component.ts
@@ -15,8 +15,8 @@ export class MenuAdminComponent {
     return this.auth.getUser().hasRight(UserRight.MANAGE_USERS)
   }
 
-  hasFriendsRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_PEERTUBE_FOLLOW)
+  hasApplicationFollowRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_APPLICATION_FOLLOW)
   }
 
   hasVideoAbusesRight () {
diff --git a/client/src/app/core/menu/menu.component.ts b/client/src/app/core/menu/menu.component.ts
index 71295be86..872d29819 100644
--- a/client/src/app/core/menu/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -16,7 +16,7 @@ export class MenuComponent implements OnInit {
 
   private routesPerRight = {
     [UserRight.MANAGE_USERS]: '/admin/users',
-    [UserRight.MANAGE_PEERTUBE_FOLLOW]: '/admin/friends',
+    [UserRight.MANAGE_APPLICATION_FOLLOW]: '/admin/friends',
     [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/video-abuses',
     [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/video-blacklist'
   }
@@ -58,7 +58,7 @@ export class MenuComponent implements OnInit {
 
     const adminRights = [
       UserRight.MANAGE_USERS,
-      UserRight.MANAGE_PEERTUBE_FOLLOW,
+      UserRight.MANAGE_APPLICATION_FOLLOW,
       UserRight.MANAGE_VIDEO_ABUSES,
       UserRight.MANAGE_VIDEO_BLACKLIST
     ]