Rename Pod -> Server

9 files changed, 20 insertions, 27 deletions

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
index 208a0c648..8dc2d9317 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -1,11 +1,9 @@
-import { Component, OnInit } from '@angular/core'
+import { Component } 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 { AccountFollow } from '../../../../../../shared/models/accounts/follow.model'
+import { RestPagination, RestTable } from '../../../shared'
 import { FollowService } from '../shared'
 
 @Component({
@@ -14,7 +12,7 @@ import { FollowService } from '../shared'
   styleUrls: [ './followers-list.component.scss' ]
 })
 export class FollowersListComponent extends RestTable {
-  followers: Pod[] = []
+  followers: AccountFollow[] = []
   totalRecords = 0
   rowsPerPage = 10
   sort: SortMeta = { field: 'createdAt', order: 1 }
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html
index 111f6a8de..8e7dddc11 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.html
+++ b/client/src/app/+admin/follows/following-add/following-add.component.html
@@ -26,7 +26,7 @@
       </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 follow servers.
+        It seems that you are not on a HTTPS server. Your webserver need to have TLS activated in order to follow servers.
       </div>
 
       <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()">
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts
index d95d6afa9..0ceb4c1db 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.ts
+++ b/client/src/app/+admin/follows/following-add/following-add.component.ts
@@ -94,8 +94,6 @@ export class FollowingAddComponent implements OnInit {
         this.followService.follow(notEmptyHosts).subscribe(
           status => {
             this.notificationsService.success('Success', 'Follow request(s) sent!')
-            // Wait requests between pods
-            setTimeout(() => this.router.navigate([ '/admin/friends/list' ]), 1000)
           },
 
           err => this.notificationsService.error('Error', err.message)
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
index 7d2c5084b..a1dff1db3 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,11 +1,8 @@
-import { Component, OnInit } from '@angular/core'
-
+import { Component } 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 { AccountFollow } from '../../../../../../shared/models/accounts/follow.model'
+import { RestPagination, RestTable } from '../../../shared'
 import { FollowService } from '../shared'
 
 @Component({
@@ -13,7 +10,7 @@ import { FollowService } from '../shared'
   templateUrl: './following-list.component.html'
 })
 export class FollowingListComponent extends RestTable {
-  following: Pod[] = []
+  following: AccountFollow[] = []
   totalRecords = 0
   rowsPerPage = 10
   sort: SortMeta = { field: 'createdAt', order: 1 }
diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts
index 622c33cea..3dc91dfca 100644
--- a/client/src/app/+admin/follows/shared/follow.service.ts
+++ b/client/src/app/+admin/follows/shared/follow.service.ts
@@ -7,7 +7,7 @@ import 'rxjs/add/operator/map'
 import { SortMeta } from 'primeng/primeng'
 
 import { RestExtractor, RestPagination, RestService } from '../../../shared'
-import { Pod, ResultList } from '../../../../../../shared'
+import { AccountFollow, ResultList } from '../../../../../../shared'
 
 @Injectable()
 export class FollowService {
@@ -19,7 +19,7 @@ export class FollowService {
     private restExtractor: RestExtractor
   ) {}
 
-  getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> {
+  getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> {
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
 
@@ -28,7 +28,7 @@ export class FollowService {
                         .catch(res => this.restExtractor.handleError(res))
   }
 
-  getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> {
+  getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> {
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
 
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html
index e73f38112..1d8bb4d38 100644
--- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html
@@ -9,7 +9,7 @@
   >
     <p-column field="id" header="ID" [sortable]="true"></p-column>
     <p-column field="reason" header="Reason"></p-column>
-    <p-column field="reporterPodHost" header="Reporter pod host"></p-column>
+    <p-column field="reporterServerHost" header="Reporter server host"></p-column>
     <p-column field="reporterUsername" header="Reporter username"></p-column>
     <p-column header="Video" styleClass="action-cell">
       <ng-template pTemplate="body" let-videoAbuse="rowData">
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index ee7bbec74..fd3ce2b84 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -2,7 +2,7 @@
   <div class="alert alert-danger">
     The video load seems to be abnormally long.
     <ul>
-      <li>Maybe the server {{ video.podHost }} is down :(</li>
+      <li>Maybe the server {{ video.serverHost }} is down :(</li>
       <li>
         If not, you can report an issue on
         <a href="https://github.com/Chocobozzz/PeerTube/issues" title="Report an issue">
diff --git a/client/src/app/videos/shared/video-details.model.ts b/client/src/app/videos/shared/video-details.model.ts
index f4ae64dc1..64cb4f847 100644
--- a/client/src/app/videos/shared/video-details.model.ts
+++ b/client/src/app/videos/shared/video-details.model.ts
@@ -27,7 +27,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
   uuid: string
   isLocal: boolean
   name: string
-  podHost: string
+  serverHost: string
   tags: string[]
   thumbnailPath: string
   thumbnailUrl: string
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts
index 2cad4a04e..0dd41d71b 100644
--- a/client/src/app/videos/shared/video.model.ts
+++ b/client/src/app/videos/shared/video.model.ts
@@ -19,7 +19,7 @@ export class Video implements VideoServerModel {
   uuid: string
   isLocal: boolean
   name: string
-  podHost: string
+  serverHost: string
   tags: string[]
   thumbnailPath: string
   thumbnailUrl: string
@@ -32,8 +32,8 @@ export class Video implements VideoServerModel {
   dislikes: number
   nsfw: boolean
 
-  private static createByString (account: string, podHost: string) {
-    return account + '@' + podHost
+  private static createByString (account: string, serverHost: string) {
+    return account + '@' + serverHost
   }
 
   private static createDurationString (duration: number) {
@@ -67,7 +67,7 @@ export class Video implements VideoServerModel {
     this.uuid = hash.uuid
     this.isLocal = hash.isLocal
     this.name = hash.name
-    this.podHost = hash.podHost
+    this.serverHost = hash.serverHost
     this.tags = hash.tags
     this.thumbnailPath = hash.thumbnailPath
     this.thumbnailUrl = absoluteAPIUrl + hash.thumbnailPath
@@ -80,7 +80,7 @@ export class Video implements VideoServerModel {
     this.dislikes = hash.dislikes
     this.nsfw = hash.nsfw
 
-    this.by = Video.createByString(hash.account, hash.podHost)
+    this.by = Video.createByString(hash.account, hash.serverHost)
   }
 
   isVideoNSFWForUser (user: User) {