diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2022-02-28 08:34:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-28 08:34:43 +0100 |
commit | d0800f7661f13fabe7bb6f4aa0ea50764f106405 (patch) | |
tree | d43e6b0b6f4a5a32e03487e6464edbcaf288be2a /client/src/app/shared/shared-main/account/account.model.ts | |
parent | 5cad2ca9db9b9d138f8a33058d10b94a9fd50c69 (diff) | |
download | PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.gz PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.zst PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.zip |
Implement avatar miniatures (#4639)
* client: remove unused file
* refactor(client/my-actor-avatar): size from input
Read size from component input instead of scss, to make it possible to
use smaller avatar images when implemented.
* implement avatar miniatures
close #4560
* fix(test): max file size
* fix(search-index): normalize res acc to avatarMini
* refactor avatars to an array
* client/search: resize channel avatar to 120
* refactor(client/videos): remove unused function
* client(actor-avatar): set default size
* fix tests and avatars full result
When findOne is used only an array containting one avatar is returned.
* update migration version and version notations
* server/search: harmonize normalizing
* Cleanup avatar miniature PR
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'client/src/app/shared/shared-main/account/account.model.ts')
-rw-r--r-- | client/src/app/shared/shared-main/account/account.model.ts | 16 |
1 files changed, 10 insertions, 6 deletions
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 8b78d01a6..a26a9c11c 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts | |||
@@ -17,11 +17,15 @@ export class Account extends Actor implements ServerAccount { | |||
17 | 17 | ||
18 | userId?: number | 18 | userId?: number |
19 | 19 | ||
20 | static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) { | 20 | static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) { |
21 | return Actor.GET_ACTOR_AVATAR_URL(actor) | 21 | return Actor.GET_ACTOR_AVATAR_URL(actor, size) |
22 | } | 22 | } |
23 | 23 | ||
24 | static GET_DEFAULT_AVATAR_URL () { | 24 | static GET_DEFAULT_AVATAR_URL (size: number) { |
25 | if (size <= 48) { | ||
26 | return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png` | ||
27 | } | ||
28 | |||
25 | return `${window.location.origin}/client/assets/images/default-avatar-account.png` | 29 | return `${window.location.origin}/client/assets/images/default-avatar-account.png` |
26 | } | 30 | } |
27 | 31 | ||
@@ -42,12 +46,12 @@ export class Account extends Actor implements ServerAccount { | |||
42 | this.mutedServerByInstance = false | 46 | this.mutedServerByInstance = false |
43 | } | 47 | } |
44 | 48 | ||
45 | updateAvatar (newAvatar: ActorImage) { | 49 | updateAvatar (newAvatars: ActorImage[]) { |
46 | this.avatar = newAvatar | 50 | this.avatars = newAvatars |
47 | } | 51 | } |
48 | 52 | ||
49 | resetAvatar () { | 53 | resetAvatar () { |
50 | this.avatar = null | 54 | this.avatars = [] |
51 | } | 55 | } |
52 | 56 | ||
53 | updateBlockStatus (blockStatus: BlockStatus) { | 57 | updateBlockStatus (blockStatus: BlockStatus) { |