Merge branch 'master' into release/3.3.0

[github/Chocobozzz/PeerTube.git] / shared / models / actors / account.model.ts

diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index d1470131722a048ffd60fdbf9e51ee619ec9bf27..f2138077e682b44bd82d6dcf50909d70473c24c4 100644 (file)
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -1,13 +1,20 @@
-import { Avatar } from '../avatars/avatar.model'
+import { ActorImage } from './actor-image.model'
+import { Actor } from './actor.model'
 
-export interface Account {
+export interface Account extends Actor {
+  displayName: string
+  description: string
+
+  updatedAt: Date | string
+
+  userId?: number
+}
+
+export interface AccountSummary {
   id: number
-  uuid: string
   name: string
+  displayName: string
+  url: string
   host: string
-  followingCount: number
-  followersCount: number
-  createdAt: Date
-  updatedAt: Date
-  avatar: Avatar
+  avatar?: ActorImage
 }