Stronger actor association typing in AP functions

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / process / process-view.ts

diff --git a/server/lib/activitypub/process/process-view.ts b/server/lib/activitypub/process/process-view.ts
index 8f66d3630ecdbea67096f6237ba65203aa55bcf0..e4997b8282a492d606e56cca6cf08d0bb3cab5d1 100644 (file)
--- a/server/lib/activitypub/process/process-view.ts
+++ b/server/lib/activitypub/process/process-view.ts
@@ -1,10 +1,12 @@
-import { ActorModel } from '../../../models/activitypub/actor'
 import { getOrCreateVideoAndAccountAndChannel } from '../videos'
 import { forwardVideoRelatedActivity } from '../send/utils'
 import { Redis } from '../../redis'
 import { ActivityCreate, ActivityView, ViewObject } from '../../../../shared/models/activitypub'
+import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
+import { SignatureActorModel } from '../../../typings/models'
 
-async function processViewActivity (activity: ActivityView | ActivityCreate, byActor: ActorModel) {
+async function processViewActivity (options: APProcessorOptions<ActivityCreate | ActivityView>) {
+  const { activity, byActor } = options
   return processCreateView(activity, byActor)
 }
 
@@ -16,7 +18,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processCreateView (activity: ActivityView | ActivityCreate, byActor: ActorModel) {
+async function processCreateView (activity: ActivityView | ActivityCreate, byActor: SignatureActorModel) {
   const videoObject = activity.type === 'View' ? activity.object : (activity.object as ViewObject).object
 
   const options = {