5 files changed, 53 insertions, 30 deletions

diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts
index fd5d38316..10cf53ead 100644
--- a/shared/models/activitypub/activity.ts
+++ b/shared/models/activitypub/activity.ts
@@ -1,20 +1,34 @@
 import { ActivityPubActor } from './activitypub-actor'
 import { ActivityPubSignature } from './activitypub-signature'
-import { ActivityFlagReasonObject, CacheFileObject, VideoObject, WatchActionObject } from './objects'
-import { AbuseObject } from './objects/abuse-object'
-import { DislikeObject } from './objects/dislike-object'
-import { APObject } from './objects/object.model'
-import { PlaylistObject } from './objects/playlist-object'
-import { VideoCommentObject } from './objects/video-comment-object'
+import {
+  ActivityFlagReasonObject,
+  ActivityObject,
+  APObjectId,
+  CacheFileObject,
+  PlaylistObject,
+  VideoCommentObject,
+  VideoObject,
+  WatchActionObject
+} from './objects'
+
+export type ActivityUpdateObject =
+  Extract<ActivityObject, VideoObject | CacheFileObject | PlaylistObject | ActivityPubActor | string> | ActivityPubActor
+
+// Cannot Extract from Activity because of circular reference
+export type ActivityUndoObject =
+  ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate<CacheFileObject | string> | ActivityAnnounce
+
+export type ActivityCreateObject =
+  Extract<ActivityObject, VideoObject | CacheFileObject | WatchActionObject | VideoCommentObject | PlaylistObject | string>
 
 export type Activity =
-  ActivityCreate |
-  ActivityUpdate |
+  ActivityCreate<ActivityCreateObject> |
+  ActivityUpdate<ActivityUpdateObject> |
   ActivityDelete |
   ActivityFollow |
   ActivityAccept |
   ActivityAnnounce |
-  ActivityUndo |
+  ActivityUndo<ActivityUndoObject> |
   ActivityLike |
   ActivityReject |
   ActivityView |
@@ -50,19 +64,19 @@ export interface BaseActivity {
   signature?: ActivityPubSignature
 }
 
-export interface ActivityCreate extends BaseActivity {
+export interface ActivityCreate <T extends ActivityCreateObject> extends BaseActivity {
   type: 'Create'
-  object: VideoObject | AbuseObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject | WatchActionObject
+  object: T
 }
 
-export interface ActivityUpdate extends BaseActivity {
+export interface ActivityUpdate <T extends ActivityUpdateObject> extends BaseActivity {
   type: 'Update'
-  object: VideoObject | ActivityPubActor | CacheFileObject | PlaylistObject
+  object: T
 }
 
 export interface ActivityDelete extends BaseActivity {
   type: 'Delete'
-  object: string | { id: string }
+  object: APObjectId
 }
 
 export interface ActivityFollow extends BaseActivity {
@@ -82,23 +96,23 @@ export interface ActivityReject extends BaseActivity {
 
 export interface ActivityAnnounce extends BaseActivity {
   type: 'Announce'
-  object: APObject
+  object: APObjectId
 }
 
-export interface ActivityUndo extends BaseActivity {
+export interface ActivityUndo <T extends ActivityUndoObject> extends BaseActivity {
   type: 'Undo'
-  object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce
+  object: T
 }
 
 export interface ActivityLike extends BaseActivity {
   type: 'Like'
-  object: APObject
+  object: APObjectId
 }
 
 export interface ActivityView extends BaseActivity {
   type: 'View'
   actor: string
-  object: APObject
+  object: APObjectId
 
   // If sending a "viewer" event
   expires?: string
@@ -108,13 +122,13 @@ export interface ActivityDislike extends BaseActivity {
   id: string
   type: 'Dislike'
   actor: string
-  object: APObject
+  object: APObjectId
 }
 
 export interface ActivityFlag extends BaseActivity {
   type: 'Flag'
   content: string
-  object: APObject | APObject[]
+  object: APObjectId | APObjectId[]
   tag?: ActivityFlagReasonObject[]
   startAt?: number
   endAt?: number
diff --git a/shared/models/activitypub/objects/activitypub-object.ts b/shared/models/activitypub/objects/activitypub-object.ts
new file mode 100644
index 000000000..faeac2618
--- /dev/null
+++ b/shared/models/activitypub/objects/activitypub-object.ts
@@ -0,0 +1,17 @@
+import { AbuseObject } from './abuse-object'
+import { CacheFileObject } from './cache-file-object'
+import { PlaylistObject } from './playlist-object'
+import { VideoCommentObject } from './video-comment-object'
+import { VideoObject } from './video-object'
+import { WatchActionObject } from './watch-action-object'
+
+export type ActivityObject =
+  VideoObject |
+  AbuseObject |
+  VideoCommentObject |
+  CacheFileObject |
+  PlaylistObject |
+  WatchActionObject |
+  string
+
+export type APObjectId = string | { id: string }
diff --git a/shared/models/activitypub/objects/dislike-object.ts b/shared/models/activitypub/objects/dislike-object.ts
deleted file mode 100644
index 7218fb784..000000000
--- a/shared/models/activitypub/objects/dislike-object.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface DislikeObject {
-  id: string
-  type: 'Dislike'
-  actor: string
-  object: string
-}
diff --git a/shared/models/activitypub/objects/index.ts b/shared/models/activitypub/objects/index.ts
index a2e040b32..753e02003 100644
--- a/shared/models/activitypub/objects/index.ts
+++ b/shared/models/activitypub/objects/index.ts
@@ -1,8 +1,7 @@
 export * from './abuse-object'
+export * from './activitypub-object'
 export * from './cache-file-object'
 export * from './common-objects'
-export * from './dislike-object'
-export * from './object.model'
 export * from './playlist-element-object'
 export * from './playlist-object'
 export * from './video-comment-object'
diff --git a/shared/models/activitypub/objects/object.model.ts b/shared/models/activitypub/objects/object.model.ts
deleted file mode 100644
index 3fd33800a..000000000
--- a/shared/models/activitypub/objects/object.model.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type APObject = string | { id: string }