X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Factivitypub-http-unicast.ts;h=9e4e84002528abd90471f88afc347d90aa71610f;hb=405c83f9af377a663a4c8e9ad025fd5c10496922;hp=173f3bb522cdfaa9a5d78fd0f88082c76e6368c1;hpb=71e3dfda4e2bcc228415c0d66b09a84bb73dddd1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/job-queue/handlers/activitypub-http-unicast.ts b/server/lib/job-queue/handlers/activitypub-http-unicast.ts
index 173f3bb52..9e4e84002 100644
--- a/server/lib/job-queue/handlers/activitypub-http-unicast.ts
+++ b/server/lib/job-queue/handlers/activitypub-http-unicast.ts
@@ -1,18 +1,12 @@
-import * as kue from 'kue'
+import { Job } from 'bullmq'
+import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from '@server/lib/activitypub/send'
+import { ActivitypubHttpUnicastPayload } from '@shared/models'
 import { logger } from '../../../helpers/logger'
 import { doRequest } from '../../../helpers/requests'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils'
-import { JOB_REQUEST_TIMEOUT } from '../../../initializers'
-
-export type ActivitypubHttpUnicastPayload = {
-  uri: string
-  signatureActorId?: number
-  body: any
-}
+import { ActorFollowHealthCache } from '../../actor-follow-health-cache'
 
-async function processActivityPubHttpUnicast (job: kue.Job) {
-  logger.info('Processing ActivityPub unicast in job %d.', job.id)
+async function processActivityPubHttpUnicast (job: Job) {
+  logger.info('Processing ActivityPub unicast in job %s.', job.id)
 
   const payload = job.data as ActivitypubHttpUnicastPayload
   const uri = payload.uri
@@ -21,18 +15,17 @@ async function processActivityPubHttpUnicast (job: kue.Job) {
   const httpSignatureOptions = await buildSignedRequestOptions(payload)
 
   const options = {
-    method: 'POST',
-    uri,
+    method: 'POST' as 'POST',
     json: body,
     httpSignature: httpSignatureOptions,
-    timeout: JOB_REQUEST_TIMEOUT
+    headers: buildGlobalHeaders(body)
   }
 
   try {
-    await doRequest(options)
-    ActorFollowModel.updateActorFollowsScore([ uri ], [], undefined)
+    await doRequest(uri, options)
+    ActorFollowHealthCache.Instance.updateActorFollowsHealth([ uri ], [])
   } catch (err) {
-    ActorFollowModel.updateActorFollowsScore([], [ uri ], undefined)
+    ActorFollowHealthCache.Instance.updateActorFollowsHealth([], [ uri ])
 
     throw err
   }