Propagate old comment on new follow

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

diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
index b8ead32a48c1101ace2df5bc277de3f8ac479688..a7b5aabd059e0e0cd657ad8cdc8bd262219d19f8 100644 (file)
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
@@ -1,10 +1,8 @@
-import { logger } from '../../../helpers'
-import { buildSignedActivity } from '../../../helpers/activitypub'
+import { logger } from '../../../helpers/logger'
 import { doRequest } from '../../../helpers/requests'
-import { database as db } from '../../../initializers'
+import { ACTIVITY_PUB } from '../../../initializers'
+import { processActivities } from '../../activitypub/process'
 import { ActivityPubHttpPayload } from './activitypub-http-job-scheduler'
-import { processActivities } from '../../activitypub/process/process'
-import { ACTIVITY_PUB } from '../../../initializers/constants'
 
 async function process (payload: ActivityPubHttpPayload, jobId: number) {
   logger.info('Processing ActivityPub fetcher in job %d.', jobId)
@@ -12,7 +10,8 @@ async function process (payload: ActivityPubHttpPayload, jobId: number) {
   const options = {
     method: 'GET',
     uri: '',
-    json: true
+    json: true,
+    activityPub: true
   }
 
   for (const uri of payload.uris) {
@@ -25,7 +24,7 @@ async function process (payload: ActivityPubHttpPayload, jobId: number) {
     if (firstBody.first && Array.isArray(firstBody.first.orderedItems)) {
       const activities = firstBody.first.orderedItems
 
-      logger.info('Processing %i items ActivityPub fetcher for %s.', activities.length, uri)
+      logger.info('Processing %i items ActivityPub fetcher for %s.', activities.length, options.uri)
 
       await processActivities(activities)
     }
@@ -37,12 +36,12 @@ async function process (payload: ActivityPubHttpPayload, jobId: number) {
       options.uri = nextLink
 
       const { body } = await doRequest(options)
-      nextLink = body.nextLink
+      nextLink = body.next
       i++
 
       if (Array.isArray(body.orderedItems)) {
         const activities = body.orderedItems
-        logger.info('Processing %i items ActivityPub fetcher for %s.', activities.length, uri)
+        logger.info('Processing %i items ActivityPub fetcher for %s.', activities.length, options.uri)
 
         await processActivities(activities)
       }
@@ -51,7 +50,7 @@ async function process (payload: ActivityPubHttpPayload, jobId: number) {
 }
 
 function onError (err: Error, jobId: number) {
-  logger.error('Error when broadcasting ActivityPub request in job %d.', jobId, err)
+  logger.error('Error when fetcher ActivityPub request in job %d.', jobId, err)
   return Promise.resolve()
 }