Merge branch 'release/4.1.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / activitypub / activitypub-actor.ts

diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
index d9f80b94c88694ee2656813e5a87a3def8070900..efb6edec48c3255ae517c0a6d92ad3a0b141057d 100644 (file)
--- a/shared/models/activitypub/activitypub-actor.ts
+++ b/shared/models/activitypub/activitypub-actor.ts
@@ -1,6 +1,6 @@
-import { ActivityPubAttributedTo } from './objects/common-objects'
+import { ActivityIconObject, ActivityPubAttributedTo } from './objects/common-objects'
 
-export type ActivityPubActorType = 'Person' | 'Application' | 'Group'
+export type ActivityPubActorType = 'Person' | 'Application' | 'Group' | 'Service' | 'Organization'
 
 export interface ActivityPubActor {
   '@context': any[]
@@ -8,6 +8,7 @@ export interface ActivityPubActor {
   id: string
   following: string
   followers: string
+  playlists?: string
   inbox: string
   outbox: string
   preferredUsername: string
@@ -19,14 +20,18 @@ export interface ActivityPubActor {
   summary: string
   attributedTo: ActivityPubAttributedTo[]
 
-  uuid: string
+  support?: string
   publicKey: {
     id: string
     owner: string
     publicKeyPem: string
   }
 
-  // Not used
-  // icon: string[]
-  // liked: string
+  image?: ActivityIconObject | ActivityIconObject[]
+
+  icon?: ActivityIconObject | ActivityIconObject[]
+  // TODO: migrate to `icon`, introduced in 4.2
+  icons?: ActivityIconObject[]
+
+  published?: string
 }