X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Factivitypub%2Factivity.ts;h=d5359eba183229bdbf5df841a72be50b596c6461;hb=d7a7c248b36af5f9cf7375ba62720e4a1530eca6;hp=254daf11894869ffe20d66d931d1ffba85bd7e20;hpb=7a7724e66e4533523083e7336cd0d0c747c4a33b;p=github%2FChocobozzz%2FPeerTube.git

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