X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Factivitypub%2Factivity.ts;h=46e883e5f081d7a5a5a7dae888ab1b01e3919113;hb=8fffe21a7bc96d08b229293d66ddba576e609790;hp=2e6feeb16f9fe995b5e304ff1e764e1b32d09b8f;hpb=9a27cdc27c900feaae5f6db4315c4ccdfc0c4493;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts
index 2e6feeb16..46e883e5f 100644
--- a/shared/models/activitypub/activity.ts
+++ b/shared/models/activitypub/activity.ts
@@ -1,46 +1,45 @@
-import { VideoChannelObject, VideoTorrentObject } from './objects'
+import { ActivityPubActor } from './activitypub-actor'
 import { ActivityPubSignature } from './activitypub-signature'
+import { VideoTorrentObject } from './objects'
+import { DislikeObject } from './objects/dislike-object'
 import { VideoAbuseObject } from './objects/video-abuse-object'
+import { VideoCommentObject } from './objects/video-comment-object'
+import { ViewObject } from './objects/view-object'
 
-export type Activity = ActivityCreate | ActivityAdd | ActivityUpdate | ActivityFlag |
-  ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce
+export type Activity = ActivityCreate | ActivityUpdate |
+  ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce |
+  ActivityUndo | ActivityLike | ActivityReject
 
-// Flag -> report abuse
-export type ActivityType = 'Create' | 'Add' | 'Update' | 'Flag' | 'Delete' | 'Follow' | 'Accept' | 'Announce'
+export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject'
+
+export interface ActivityAudience {
+  to: string[]
+  cc: string[]
+}
 
 export interface BaseActivity {
   '@context'?: any[]
   id: string
   to?: string[]
   cc?: string[]
-  actor: string
+  actor: string | ActivityPubActor
   type: ActivityType
   signature?: ActivityPubSignature
 }
 
 export interface ActivityCreate extends BaseActivity {
   type: 'Create'
-  object: VideoChannelObject | VideoAbuseObject
-}
-
-export interface ActivityAdd extends BaseActivity {
-  type: 'Add'
-  target: string
-  object: VideoTorrentObject
+  object: VideoTorrentObject | VideoAbuseObject | ViewObject | DislikeObject | VideoCommentObject
 }
 
 export interface ActivityUpdate extends BaseActivity {
   type: 'Update'
-  object: VideoTorrentObject | VideoChannelObject
-}
-
-export interface ActivityFlag extends BaseActivity {
-  type: 'Flag'
-  object: string
+  object: VideoTorrentObject | ActivityPubActor
 }
 
 export interface ActivityDelete extends BaseActivity {
   type: 'Delete'
+  object: string | { id: string }
 }
 
 export interface ActivityFollow extends BaseActivity {
@@ -50,9 +49,25 @@ export interface ActivityFollow extends BaseActivity {
 
 export interface ActivityAccept extends BaseActivity {
   type: 'Accept'
+  object: ActivityFollow
+}
+
+export interface ActivityReject extends BaseActivity {
+  type: 'Reject'
+  object: ActivityFollow
 }
 
 export interface ActivityAnnounce extends BaseActivity {
   type: 'Announce'
-  object: ActivityCreate | ActivityAdd
+  object: string | { id: string }
+}
+
+export interface ActivityUndo extends BaseActivity {
+  type: 'Undo',
+  object: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce
+}
+
+export interface ActivityLike extends BaseActivity {
+  type: 'Like',
+  object: string
 }