-import * as kue from 'kue'
+import * as Bull from 'bull'
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 { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils'
+import { JOB_REQUEST_TIMEOUT } from '../../../initializers/constants'
+import { ActorFollowScoreCache } from '../../files-cache'
+import { ContextType } from '@server/helpers/activitypub'
export type ActivitypubHttpUnicastPayload = {
uri: string
signatureActorId?: number
body: any
+ contextType?: ContextType
}
-async function processActivityPubHttpUnicast (job: kue.Job) {
+async function processActivityPubHttpUnicast (job: Bull.Job) {
logger.info('Processing ActivityPub unicast in job %d.', job.id)
const payload = job.data as ActivitypubHttpUnicastPayload
method: 'POST',
uri,
json: body,
- httpSignature: httpSignatureOptions
+ httpSignature: httpSignatureOptions,
+ timeout: JOB_REQUEST_TIMEOUT,
+ headers: buildGlobalHeaders(body)
}
try {
await doRequest(options)
- ActorFollowModel.updateActorFollowsScore([ uri ], [], undefined)
+ ActorFollowScoreCache.Instance.updateActorFollowsScore([ uri ], [])
} catch (err) {
- ActorFollowModel.updateActorFollowsScore([], [ uri ], undefined)
+ ActorFollowScoreCache.Instance.updateActorFollowsScore([], [ uri ])
throw err
}