X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Factivitypub%2Factivity.ts;h=89994f6650f2c272976272e7d4fcb1e3799c9f8c;hb=848f499def54db2dd36437ef0dfb74dd5041c23b;hp=a2494da25af9a910be058725fc2bd0154e26d27f;hpb=571389d43b8fc8aaf27e77c06f19b320b08dbbc9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts
index a2494da25..89994f665 100644
--- a/shared/models/activitypub/activity.ts
+++ b/shared/models/activitypub/activity.ts
@@ -1,39 +1,94 @@
-import {
-  VideoChannelObject,
-  VideoTorrentObject
-} from './objects'
+import { ActivityPubActor } from './activitypub-actor'
 import { ActivityPubSignature } from './activitypub-signature'
+import { CacheFileObject, 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'
+import { APObject } from './objects/object.model'
 
-export type Activity = ActivityCreate | ActivityAdd | ActivityUpdate | ActivityFlag
+export type Activity = ActivityCreate | ActivityUpdate |
+  ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce |
+  ActivityUndo | ActivityLike | ActivityReject | ActivityView | ActivityDislike | ActivityFlag
 
-// Flag -> report abuse
-export type ActivityType = 'Create' | 'Add' | 'Update' | 'Flag'
+export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject' |
+  'View' | 'Dislike' | 'Flag'
+
+export interface ActivityAudience {
+  to: string[]
+  cc: string[]
+}
 
 export interface BaseActivity {
   '@context'?: any[]
   id: string
-  to: string[]
-  actor: string
+  to?: string[]
+  cc?: string[]
+  actor: string | ActivityPubActor
   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 | VideoCommentObject | CacheFileObject
 }
 
 export interface ActivityUpdate extends BaseActivity {
   type: 'Update'
-  object: VideoTorrentObject | VideoChannelObject
+  object: VideoTorrentObject | ActivityPubActor | CacheFileObject
 }
 
-export interface ActivityFlag extends BaseActivity {
-  type: 'Flag'
+export interface ActivityDelete extends BaseActivity {
+  type: 'Delete'
+  object: string | { id: string }
+}
+
+export interface ActivityFollow extends BaseActivity {
+  type: 'Follow'
   object: string
 }
+
+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: APObject
+}
+
+export interface ActivityUndo extends BaseActivity {
+  type: 'Undo',
+  object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce
+}
+
+export interface ActivityLike extends BaseActivity {
+  type: 'Like',
+  object: APObject
+}
+
+export interface ActivityView extends BaseActivity {
+  type: 'View',
+  actor: string
+  object: APObject
+}
+
+export interface ActivityDislike extends BaseActivity {
+  id: string
+  type: 'Dislike'
+  actor: string
+  object: APObject
+}
+
+export interface ActivityFlag extends BaseActivity {
+  type: 'Flag',
+  content: string,
+  object: APObject
+}