Add AccountAvatarComponent (#3965)

[github/Chocobozzz/PeerTube.git] / client / src / app / core / users / user.model.ts

diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts
index a94b35c469dd8449ee94d557197cc8f83d9e2b54..7d03e1c40f07167da7781e2130d64faa36283154 100644 (file)
--- a/client/src/app/core/users/user.model.ts
+++ b/client/src/app/core/users/user.model.ts
@@ -1,7 +1,7 @@
 import { Account } from '@app/shared/shared-main/account/account.model'
+import { hasUserRight } from '@shared/core-utils/users'
 import {
-  Avatar,
-  hasUserRight,
+  ActorImage,
   NSFWPolicyType,
   User as UserServerModel,
   UserAdminFlag,
@@ -10,11 +10,8 @@ import {
   UserRole,
   VideoChannel
 } from '@shared/models'
-import { UserKeys } from '@root-helpers/user-keys'
 
 export class User implements UserServerModel {
-  static KEYS = UserKeys
-
   id: number
   username: string
   email: string
@@ -114,12 +111,6 @@ export class User implements UserServerModel {
     }
   }
 
-  get accountAvatarUrl () {
-    if (!this.account) return ''
-
-    return this.account.avatarUrl
-  }
-
   hasRight (right: UserRight) {
     return hasUserRight(this.role, right)
   }
@@ -134,8 +125,9 @@ export class User implements UserServerModel {
     }
   }
 
-  updateAccountAvatar (newAccountAvatar: Avatar) {
-    this.account.updateAvatar(newAccountAvatar)
+  updateAccountAvatar (newAccountAvatar?: ActorImage) {
+    if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar)
+    else this.account.resetAvatar()
   }
 
   isUploadDisabled () {