diff options
author | Chocobozzz <me@florianbigard.com> | 2021-04-06 11:35:56 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-04-08 10:07:53 +0200 |
commit | f479685678406a5df864d89615b33d29085ebfc6 (patch) | |
tree | 8de15e90cd8d97d8810715df8585c61f48d5282a /client/src/app | |
parent | 968aaed2066873fc1c39f95168284122d9d15e21 (diff) | |
download | PeerTube-f479685678406a5df864d89615b33d29085ebfc6.tar.gz PeerTube-f479685678406a5df864d89615b33d29085ebfc6.tar.zst PeerTube-f479685678406a5df864d89615b33d29085ebfc6.zip |
Agnostic actor image storage
Diffstat (limited to 'client/src/app')
7 files changed, 15 insertions, 16 deletions
diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts index 15a4f7f82..8aaaa238d 100644 --- a/client/src/app/core/users/user.model.ts +++ b/client/src/app/core/users/user.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Account } from '@app/shared/shared-main/account/account.model' | 1 | import { Account } from '@app/shared/shared-main/account/account.model' |
2 | import { hasUserRight } from '@shared/core-utils/users' | 2 | import { hasUserRight } from '@shared/core-utils/users' |
3 | import { | 3 | import { |
4 | Avatar, | 4 | ActorImage, |
5 | NSFWPolicyType, | 5 | NSFWPolicyType, |
6 | User as UserServerModel, | 6 | User as UserServerModel, |
7 | UserAdminFlag, | 7 | UserAdminFlag, |
@@ -131,7 +131,7 @@ export class User implements UserServerModel { | |||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | updateAccountAvatar (newAccountAvatar?: Avatar) { | 134 | updateAccountAvatar (newAccountAvatar?: ActorImage) { |
135 | if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar) | 135 | if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar) |
136 | else this.account.resetAvatar() | 136 | else this.account.resetAvatar() |
137 | } | 137 | } |
diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts index 33cc1f668..3de83152c 100644 --- a/client/src/app/core/users/user.service.ts +++ b/client/src/app/core/users/user.service.ts | |||
@@ -7,8 +7,7 @@ import { AuthService } from '@app/core/auth' | |||
7 | import { getBytes } from '@root-helpers/bytes' | 7 | import { getBytes } from '@root-helpers/bytes' |
8 | import { UserLocalStorageKeys } from '@root-helpers/users' | 8 | import { UserLocalStorageKeys } from '@root-helpers/users' |
9 | import { | 9 | import { |
10 | Avatar, | 10 | ActorImage, |
11 | NSFWPolicyType, | ||
12 | ResultList, | 11 | ResultList, |
13 | User as UserServerModel, | 12 | User as UserServerModel, |
14 | UserCreate, | 13 | UserCreate, |
@@ -136,7 +135,7 @@ export class UserService { | |||
136 | changeAvatar (avatarForm: FormData) { | 135 | changeAvatar (avatarForm: FormData) { |
137 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' | 136 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' |
138 | 137 | ||
139 | return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) | 138 | return this.authHttp.post<{ avatar: ActorImage }>(url, avatarForm) |
140 | .pipe(catchError(err => this.restExtractor.handleError(err))) | 139 | .pipe(catchError(err => this.restExtractor.handleError(err))) |
141 | } | 140 | } |
142 | 141 | ||
diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts index b71a893d1..17fddff09 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Account as ServerAccount, Avatar } from '@shared/models' | 1 | import { Account as ServerAccount, ActorImage } from '@shared/models' |
2 | import { Actor } from './actor.model' | 2 | import { Actor } from './actor.model' |
3 | 3 | ||
4 | export class Account extends Actor implements ServerAccount { | 4 | export class Account extends Actor implements ServerAccount { |
@@ -38,7 +38,7 @@ export class Account extends Actor implements ServerAccount { | |||
38 | this.mutedServerByInstance = false | 38 | this.mutedServerByInstance = false |
39 | } | 39 | } |
40 | 40 | ||
41 | updateAvatar (newAvatar: Avatar) { | 41 | updateAvatar (newAvatar: ActorImage) { |
42 | this.avatar = newAvatar | 42 | this.avatar = newAvatar |
43 | 43 | ||
44 | this.updateComputedAttributes() | 44 | this.updateComputedAttributes() |
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts index 8222c9769..c105a88ac 100644 --- a/client/src/app/shared/shared-main/account/actor.model.ts +++ b/client/src/app/shared/shared-main/account/actor.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Actor as ActorServer, Avatar } from '@shared/models' | 1 | import { Actor as ActorServer, ActorImage } from '@shared/models' |
2 | import { getAbsoluteAPIUrl } from '@app/helpers' | 2 | import { getAbsoluteAPIUrl } from '@app/helpers' |
3 | 3 | ||
4 | export abstract class Actor implements ActorServer { | 4 | export abstract class Actor implements ActorServer { |
@@ -10,7 +10,7 @@ export abstract class Actor implements ActorServer { | |||
10 | followersCount: number | 10 | followersCount: number |
11 | createdAt: Date | string | 11 | createdAt: Date | string |
12 | updatedAt: Date | string | 12 | updatedAt: Date | string |
13 | avatar: Avatar | 13 | avatar: ActorImage |
14 | 14 | ||
15 | avatarUrl: string | 15 | avatarUrl: string |
16 | 16 | ||
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts index 126e43cea..b4c3365a9 100644 --- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts +++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Account as ServerAccount, Avatar, VideoChannel as ServerVideoChannel, ViewsPerDate } from '@shared/models' | 1 | import { Account as ServerAccount, ActorImage, VideoChannel as ServerVideoChannel, ViewsPerDate } from '@shared/models' |
2 | import { Account } from '../account/account.model' | 2 | import { Account } from '../account/account.model' |
3 | import { Actor } from '../account/actor.model' | 3 | import { Actor } from '../account/actor.model' |
4 | 4 | ||
@@ -51,7 +51,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel { | |||
51 | } | 51 | } |
52 | } | 52 | } |
53 | 53 | ||
54 | updateAvatar (newAvatar: Avatar) { | 54 | updateAvatar (newAvatar: ActorImage) { |
55 | this.avatar = newAvatar | 55 | this.avatar = newAvatar |
56 | 56 | ||
57 | this.updateComputedAttributes() | 57 | this.updateComputedAttributes() |
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts index eff3fad4d..3f9ef74fa 100644 --- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts +++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts | |||
@@ -3,7 +3,7 @@ import { catchError, map, tap } from 'rxjs/operators' | |||
3 | import { HttpClient, HttpParams } from '@angular/common/http' | 3 | import { HttpClient, HttpParams } from '@angular/common/http' |
4 | import { Injectable } from '@angular/core' | 4 | import { Injectable } from '@angular/core' |
5 | import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' | 5 | import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' |
6 | import { Avatar, ResultList, VideoChannel as VideoChannelServer, VideoChannelCreate, VideoChannelUpdate } from '@shared/models' | 6 | import { ActorImage, ResultList, VideoChannel as VideoChannelServer, VideoChannelCreate, VideoChannelUpdate } from '@shared/models' |
7 | import { environment } from '../../../../environments/environment' | 7 | import { environment } from '../../../../environments/environment' |
8 | import { Account } from '../account' | 8 | import { Account } from '../account' |
9 | import { AccountService } from '../account/account.service' | 9 | import { AccountService } from '../account/account.service' |
@@ -85,7 +85,7 @@ export class VideoChannelService { | |||
85 | changeVideoChannelAvatar (videoChannelName: string, avatarForm: FormData) { | 85 | changeVideoChannelAvatar (videoChannelName: string, avatarForm: FormData) { |
86 | const url = VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannelName + '/avatar/pick' | 86 | const url = VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannelName + '/avatar/pick' |
87 | 87 | ||
88 | return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) | 88 | return this.authHttp.post<{ avatar: ActorImage }>(url, avatarForm) |
89 | .pipe(catchError(err => this.restExtractor.handleError(err))) | 89 | .pipe(catchError(err => this.restExtractor.handleError(err))) |
90 | } | 90 | } |
91 | 91 | ||
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts index adb6e884f..1c2c4a575 100644 --- a/client/src/app/shared/shared-main/video/video.model.ts +++ b/client/src/app/shared/shared-main/video/video.model.ts | |||
@@ -6,7 +6,7 @@ import { Actor } from '@app/shared/shared-main/account/actor.model' | |||
6 | import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' | 6 | import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' |
7 | import { peertubeTranslate } from '@shared/core-utils/i18n' | 7 | import { peertubeTranslate } from '@shared/core-utils/i18n' |
8 | import { | 8 | import { |
9 | Avatar, | 9 | ActorImage, |
10 | ServerConfig, | 10 | ServerConfig, |
11 | UserRight, | 11 | UserRight, |
12 | Video as VideoServerModel, | 12 | Video as VideoServerModel, |
@@ -72,7 +72,7 @@ export class Video implements VideoServerModel { | |||
72 | displayName: string | 72 | displayName: string |
73 | url: string | 73 | url: string |
74 | host: string | 74 | host: string |
75 | avatar?: Avatar | 75 | avatar?: ActorImage |
76 | } | 76 | } |
77 | 77 | ||
78 | channel: { | 78 | channel: { |
@@ -81,7 +81,7 @@ export class Video implements VideoServerModel { | |||
81 | displayName: string | 81 | displayName: string |
82 | url: string | 82 | url: string |
83 | host: string | 83 | host: string |
84 | avatar?: Avatar | 84 | avatar?: ActorImage |
85 | } | 85 | } |
86 | 86 | ||
87 | userHistory?: { | 87 | userHistory?: { |