diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/+admin/follows/shared/follow.service.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/users/user.service.ts | 7 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 9 |
3 files changed, 9 insertions, 9 deletions
diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts index 5897e64ca..87ea5fb0c 100644 --- a/client/src/app/+admin/follows/shared/follow.service.ts +++ b/client/src/app/+admin/follows/shared/follow.service.ts | |||
@@ -22,7 +22,7 @@ export class FollowService { | |||
22 | let params = new HttpParams() | 22 | let params = new HttpParams() |
23 | params = this.restService.addRestGetParams(params, pagination, sort) | 23 | params = this.restService.addRestGetParams(params, pagination, sort) |
24 | 24 | ||
25 | return this.authHttp.get<ResultList<Account>>(FollowService.BASE_APPLICATION_URL + '/following', { params }) | 25 | return this.authHttp.get<ResultList<AccountFollow>>(FollowService.BASE_APPLICATION_URL + '/following', { params }) |
26 | .pipe( | 26 | .pipe( |
27 | map(res => this.restExtractor.convertResultListDateToHuman(res)), | 27 | map(res => this.restExtractor.convertResultListDateToHuman(res)), |
28 | catchError(res => this.restExtractor.handleError(res)) | 28 | catchError(res => this.restExtractor.handleError(res)) |
diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts index 4843be618..9fe6c8b60 100644 --- a/client/src/app/shared/users/user.service.ts +++ b/client/src/app/shared/users/user.service.ts | |||
@@ -1,9 +1,10 @@ | |||
1 | import { catchError, map } from 'rxjs/operators' | 1 | import { catchError, map } from 'rxjs/operators' |
2 | import { HttpClient } from '@angular/common/http' | 2 | import { HttpClient } from '@angular/common/http' |
3 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
4 | import { UserCreate, UserUpdateMe } from '../../../../../shared' | 4 | import { UserCreate, UserUpdateMe, UserVideoQuota } from '../../../../../shared' |
5 | import { environment } from '../../../environments/environment' | 5 | import { environment } from '../../../environments/environment' |
6 | import { RestExtractor } from '../rest' | 6 | import { RestExtractor } from '../rest' |
7 | import { Avatar } from '../../../../../shared/models/avatars/avatar.model' | ||
7 | 8 | ||
8 | @Injectable() | 9 | @Injectable() |
9 | export class UserService { | 10 | export class UserService { |
@@ -41,7 +42,7 @@ export class UserService { | |||
41 | changeAvatar (avatarForm: FormData) { | 42 | changeAvatar (avatarForm: FormData) { |
42 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' | 43 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' |
43 | 44 | ||
44 | return this.authHttp.post(url, avatarForm) | 45 | return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) |
45 | .pipe(catchError(this.restExtractor.handleError)) | 46 | .pipe(catchError(this.restExtractor.handleError)) |
46 | } | 47 | } |
47 | 48 | ||
@@ -56,7 +57,7 @@ export class UserService { | |||
56 | getMyVideoQuotaUsed () { | 57 | getMyVideoQuotaUsed () { |
57 | const url = UserService.BASE_USERS_URL + '/me/video-quota-used' | 58 | const url = UserService.BASE_USERS_URL + '/me/video-quota-used' |
58 | 59 | ||
59 | return this.authHttp.get(url) | 60 | return this.authHttp.get<UserVideoQuota>(url) |
60 | .pipe(catchError(res => this.restExtractor.handleError(res))) | 61 | .pipe(catchError(res => this.restExtractor.handleError(res))) |
61 | } | 62 | } |
62 | 63 | ||
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index f57cb6d6d..5b8e2467a 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -48,7 +48,7 @@ export class VideoService { | |||
48 | ) | 48 | ) |
49 | } | 49 | } |
50 | 50 | ||
51 | viewVideo (uuid: string): Observable<VideoDetails> { | 51 | viewVideo (uuid: string): Observable<boolean> { |
52 | return this.authHttp.post(this.getVideoViewUrl(uuid), {}) | 52 | return this.authHttp.post(this.getVideoViewUrl(uuid), {}) |
53 | .pipe( | 53 | .pipe( |
54 | map(this.restExtractor.extractDataBool), | 54 | map(this.restExtractor.extractDataBool), |
@@ -92,7 +92,7 @@ export class VideoService { | |||
92 | const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true }) | 92 | const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true }) |
93 | 93 | ||
94 | return this.authHttp | 94 | return this.authHttp |
95 | .request(req) | 95 | .request<{ video: { id: number, uuid: string} }>(req) |
96 | .pipe(catchError(this.restExtractor.handleError)) | 96 | .pipe(catchError(this.restExtractor.handleError)) |
97 | } | 97 | } |
98 | 98 | ||
@@ -265,11 +265,10 @@ export class VideoService { | |||
265 | return this.setVideoRate(id, 'none') | 265 | return this.setVideoRate(id, 'none') |
266 | } | 266 | } |
267 | 267 | ||
268 | getUserVideoRating (id: number): Observable<UserVideoRate> { | 268 | getUserVideoRating (id: number) { |
269 | const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating' | 269 | const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating' |
270 | 270 | ||
271 | return this.authHttp | 271 | return this.authHttp.get<UserVideoRate>(url) |
272 | .get(url) | ||
273 | .pipe(catchError(res => this.restExtractor.handleError(res))) | 272 | .pipe(catchError(res => this.restExtractor.handleError(res))) |
274 | } | 273 | } |
275 | 274 | ||