Move models to typescript-sequelize

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

diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
index 5b4c65b81480e90cd3704c80c8fd187a56669b33..8040dde2ae50a791763dc1f467c9f4127bf045d6 100644 (file)
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
@@ -1,21 +1,15 @@
-import { logger } from '../../../helpers'
-import { buildSignedActivity } from '../../../helpers/activitypub'
-import { doRequest } from '../../../helpers/requests'
-import { database as db } from '../../../initializers'
-import { ActivityPubHttpPayload, maybeRetryRequestLater } from './activitypub-http-job-scheduler'
+import { doRequest, logger } from '../../../helpers'
+import { ActivityPubHttpPayload, computeBody, maybeRetryRequestLater } from './activitypub-http-job-scheduler'
 
 async function process (payload: ActivityPubHttpPayload, jobId: number) {
   logger.info('Processing ActivityPub broadcast in job %d.', jobId)
 
-  const accountSignature = await db.Account.load(payload.signatureAccountId)
-  if (!accountSignature) throw new Error('Unknown signature account id.')
-
-  const signedBody = await buildSignedActivity(accountSignature, payload.body)
+  const body = await computeBody(payload)
 
   const options = {
     method: 'POST',
     uri: '',
-    json: signedBody
+    json: body
   }
 
   for (const uri of payload.uris) {