Begin moving video channel to actor

[github/Chocobozzz/PeerTube.git] / server / lib / jobs / activitypub-http-job-scheduler / activitypub-http-job-scheduler.ts

diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
index fcc81eb16e136b442653b63c9ecb3605a8e07f56..95a5d3ff201a6019c807011a90c10dc0e44a0679 100644 (file)
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
@@ -1,8 +1,7 @@
 import { JobCategory } from '../../../../shared'
-import { buildSignedActivity } from '../../../helpers/activitypub'
-import { logger } from '../../../helpers/logger'
-import { ACTIVITY_PUB } from '../../../initializers/constants'
-import { database as db } from '../../../initializers/database'
+import { buildSignedActivity, logger } from '../../../helpers'
+import { ACTIVITY_PUB } from '../../../initializers'
+import { ActorModel } from '../../../models/activitypub/actor'
 import { JobHandler, JobScheduler } from '../job-scheduler'
 
 import * as activitypubHttpBroadcastHandler from './activitypub-http-broadcast-handler'
@@ -11,7 +10,7 @@ import * as activitypubHttpUnicastHandler from './activitypub-http-unicast-handl
 
 type ActivityPubHttpPayload = {
   uris: string[]
-  signatureAccountId?: number
+  signatureActorId?: number
   body?: any
   attemptNumber?: number
 }
@@ -45,10 +44,10 @@ function maybeRetryRequestLater (err: Error, payload: ActivityPubHttpPayload, ur
 async function computeBody (payload: ActivityPubHttpPayload) {
   let body = payload.body
 
-  if (payload.signatureAccountId) {
-    const accountSignature = await db.Account.load(payload.signatureAccountId)
-    if (!accountSignature) throw new Error('Unknown signature account id.')
-    body = await buildSignedActivity(accountSignature, payload.body)
+  if (payload.signatureActorId) {
+    const actorSignature = await ActorModel.load(payload.signatureActorId)
+    if (!actorSignature) throw new Error('Unknown signature account id.')
+    body = await buildSignedActivity(actorSignature, payload.body)
   }
 
   return body