aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+admin/follows/followers-list/followers-list.component.ts10
-rw-r--r--client/src/app/+admin/follows/following-add/following-add.component.html2
-rw-r--r--client/src/app/+admin/follows/following-add/following-add.component.ts2
-rw-r--r--client/src/app/+admin/follows/following-list/following-list.component.ts11
-rw-r--r--client/src/app/+admin/follows/shared/follow.service.ts6
-rw-r--r--client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html2
-rw-r--r--client/src/app/videos/shared/video-details.model.ts2
-rw-r--r--client/src/app/videos/shared/video.model.ts10
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 @@
1import { Component, OnInit } from '@angular/core' 1import { Component } from '@angular/core'
2 2
3import { NotificationsService } from 'angular2-notifications' 3import { NotificationsService } from 'angular2-notifications'
4import { SortMeta } from 'primeng/primeng' 4import { SortMeta } from 'primeng/primeng'
5 5import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model'
6import { ConfirmService } from '../../../core' 6import { RestPagination, RestTable } from '../../../shared'
7import { RestTable, RestPagination } from '../../../shared'
8import { Pod } from '../../../../../../shared'
9import { FollowService } from '../shared' 7import { FollowService } from '../shared'
10 8
11@Component({ 9@Component({
@@ -14,7 +12,7 @@ import { FollowService } from '../shared'
14 styleUrls: [ './followers-list.component.scss' ] 12 styleUrls: [ './followers-list.component.scss' ]
15}) 13})
16export class FollowersListComponent extends RestTable { 14export class FollowersListComponent extends RestTable {
17 followers: Pod[] = [] 15 followers: AccountFollow[] = []
18 totalRecords = 0 16 totalRecords = 0
19 rowsPerPage = 10 17 rowsPerPage = 10
20 sort: SortMeta = { field: 'createdAt', order: 1 } 18 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 @@
26 </div> 26 </div>
27 27
28 <div *ngIf="canMakeFriends() === false" class="alert alert-warning"> 28 <div *ngIf="canMakeFriends() === false" class="alert alert-warning">
29 It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to follow servers. 29 It seems that you are not on a HTTPS server. Your webserver need to have TLS activated in order to follow servers.
30 </div> 30 </div>
31 31
32 <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()"> 32 <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 {
94 this.followService.follow(notEmptyHosts).subscribe( 94 this.followService.follow(notEmptyHosts).subscribe(
95 status => { 95 status => {
96 this.notificationsService.success('Success', 'Follow request(s) sent!') 96 this.notificationsService.success('Success', 'Follow request(s) sent!')
97 // Wait requests between pods
98 setTimeout(() => this.router.navigate([ '/admin/friends/list' ]), 1000)
99 }, 97 },
100 98
101 err => this.notificationsService.error('Error', err.message) 99 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 @@
1import { Component, OnInit } from '@angular/core' 1import { Component } from '@angular/core'
2
3import { NotificationsService } from 'angular2-notifications' 2import { NotificationsService } from 'angular2-notifications'
4import { SortMeta } from 'primeng/primeng' 3import { SortMeta } from 'primeng/primeng'
5 4import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model'
6import { ConfirmService } from '../../../core' 5import { RestPagination, RestTable } from '../../../shared'
7import { RestTable, RestPagination } from '../../../shared'
8import { Pod } from '../../../../../../shared'
9import { FollowService } from '../shared' 6import { FollowService } from '../shared'
10 7
11@Component({ 8@Component({
@@ -13,7 +10,7 @@ import { FollowService } from '../shared'
13 templateUrl: './following-list.component.html' 10 templateUrl: './following-list.component.html'
14}) 11})
15export class FollowingListComponent extends RestTable { 12export class FollowingListComponent extends RestTable {
16 following: Pod[] = [] 13 following: AccountFollow[] = []
17 totalRecords = 0 14 totalRecords = 0
18 rowsPerPage = 10 15 rowsPerPage = 10
19 sort: SortMeta = { field: 'createdAt', order: 1 } 16 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'
7import { SortMeta } from 'primeng/primeng' 7import { SortMeta } from 'primeng/primeng'
8 8
9import { RestExtractor, RestPagination, RestService } from '../../../shared' 9import { RestExtractor, RestPagination, RestService } from '../../../shared'
10import { Pod, ResultList } from '../../../../../../shared' 10import { AccountFollow, ResultList } from '../../../../../../shared'
11 11
12@Injectable() 12@Injectable()
13export class FollowService { 13export class FollowService {
@@ -19,7 +19,7 @@ export class FollowService {
19 private restExtractor: RestExtractor 19 private restExtractor: RestExtractor
20 ) {} 20 ) {}
21 21
22 getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> { 22 getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> {
23 let params = new HttpParams() 23 let params = new HttpParams()
24 params = this.restService.addRestGetParams(params, pagination, sort) 24 params = this.restService.addRestGetParams(params, pagination, sort)
25 25
@@ -28,7 +28,7 @@ export class FollowService {
28 .catch(res => this.restExtractor.handleError(res)) 28 .catch(res => this.restExtractor.handleError(res))
29 } 29 }
30 30
31 getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> { 31 getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> {
32 let params = new HttpParams() 32 let params = new HttpParams()
33 params = this.restService.addRestGetParams(params, pagination, sort) 33 params = this.restService.addRestGetParams(params, pagination, sort)
34 34
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 @@
9 > 9 >
10 <p-column field="id" header="ID" [sortable]="true"></p-column> 10 <p-column field="id" header="ID" [sortable]="true"></p-column>
11 <p-column field="reason" header="Reason"></p-column> 11 <p-column field="reason" header="Reason"></p-column>
12 <p-column field="reporterPodHost" header="Reporter pod host"></p-column> 12 <p-column field="reporterServerHost" header="Reporter server host"></p-column>
13 <p-column field="reporterUsername" header="Reporter username"></p-column> 13 <p-column field="reporterUsername" header="Reporter username"></p-column>
14 <p-column header="Video" styleClass="action-cell"> 14 <p-column header="Video" styleClass="action-cell">
15 <ng-template pTemplate="body" let-videoAbuse="rowData"> 15 <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 @@
2 <div class="alert alert-danger"> 2 <div class="alert alert-danger">
3 The video load seems to be abnormally long. 3 The video load seems to be abnormally long.
4 <ul> 4 <ul>
5 <li>Maybe the server {{ video.podHost }} is down :(</li> 5 <li>Maybe the server {{ video.serverHost }} is down :(</li>
6 <li> 6 <li>
7 If not, you can report an issue on 7 If not, you can report an issue on
8 <a href="https://github.com/Chocobozzz/PeerTube/issues" title="Report an issue"> 8 <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 {
27 uuid: string 27 uuid: string
28 isLocal: boolean 28 isLocal: boolean
29 name: string 29 name: string
30 podHost: string 30 serverHost: string
31 tags: string[] 31 tags: string[]
32 thumbnailPath: string 32 thumbnailPath: string
33 thumbnailUrl: string 33 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 {
19 uuid: string 19 uuid: string
20 isLocal: boolean 20 isLocal: boolean
21 name: string 21 name: string
22 podHost: string 22 serverHost: string
23 tags: string[] 23 tags: string[]
24 thumbnailPath: string 24 thumbnailPath: string
25 thumbnailUrl: string 25 thumbnailUrl: string
@@ -32,8 +32,8 @@ export class Video implements VideoServerModel {
32 dislikes: number 32 dislikes: number
33 nsfw: boolean 33 nsfw: boolean
34 34
35 private static createByString (account: string, podHost: string) { 35 private static createByString (account: string, serverHost: string) {
36 return account + '@' + podHost 36 return account + '@' + serverHost
37 } 37 }
38 38
39 private static createDurationString (duration: number) { 39 private static createDurationString (duration: number) {
@@ -67,7 +67,7 @@ export class Video implements VideoServerModel {
67 this.uuid = hash.uuid 67 this.uuid = hash.uuid
68 this.isLocal = hash.isLocal 68 this.isLocal = hash.isLocal
69 this.name = hash.name 69 this.name = hash.name
70 this.podHost = hash.podHost 70 this.serverHost = hash.serverHost
71 this.tags = hash.tags 71 this.tags = hash.tags
72 this.thumbnailPath = hash.thumbnailPath 72 this.thumbnailPath = hash.thumbnailPath
73 this.thumbnailUrl = absoluteAPIUrl + hash.thumbnailPath 73 this.thumbnailUrl = absoluteAPIUrl + hash.thumbnailPath
@@ -80,7 +80,7 @@ export class Video implements VideoServerModel {
80 this.dislikes = hash.dislikes 80 this.dislikes = hash.dislikes
81 this.nsfw = hash.nsfw 81 this.nsfw = hash.nsfw
82 82
83 this.by = Video.createByString(hash.account, hash.podHost) 83 this.by = Video.createByString(hash.account, hash.serverHost)
84 } 84 }
85 85
86 isVideoNSFWForUser (user: User) { 86 isVideoNSFWForUser (user: User) {