import * as Bull from 'bull'
+import { getLocalActorFollowActivityPubUrl } from '@server/lib/activitypub/url'
+import { ActivitypubFollowPayload } from '@shared/models'
+import { sanitizeHost } from '../../../helpers/core-utils'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
+import { loadActorUrlOrGetFromWebfinger } from '../../../helpers/webfinger'
import { REMOTE_SCHEME, WEBSERVER } from '../../../initializers/constants'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { ActorModel } from '../../../models/actor/actor'
+import { ActorFollowModel } from '../../../models/actor/actor-follow'
+import { MActor, MActorFollowActors, MActorFull } from '../../../types/models'
+import { getOrCreateAPActor } from '../../activitypub/actors'
import { sendFollow } from '../../activitypub/send'
-import { sanitizeHost } from '../../../helpers/core-utils'
-import { loadActorUrlOrGetFromWebfinger } from '../../../helpers/webfinger'
-import { getOrCreateActorAndServerAndModel } from '../../activitypub/actor'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { ActorModel } from '../../../models/activitypub/actor'
import { Notifier } from '../../notifier'
-import { sequelizeTypescript } from '../../../initializers/database'
-import { MActor, MActorFollowActors, MActorFull } from '../../../typings/models'
-
-export type ActivitypubFollowPayload = {
- followerActorId: number
- name: string
- host: string
- isAutoFollow?: boolean
- assertIsChannel?: boolean
-}
async function processActivityPubFollow (job: Bull.Job) {
const payload = job.data as ActivitypubFollowPayload
} else {
const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP)
const actorUrl = await loadActorUrlOrGetFromWebfinger(payload.name + '@' + sanitizedHost)
- targetActor = await getOrCreateActorAndServerAndModel(actorUrl, 'all')
+ targetActor = await getOrCreateAPActor(actorUrl, 'all')
}
if (payload.assertIsChannel && !targetActor.VideoChannel) {
- logger.warn('Do not follow %s@%s because it is not a channel.', name, host)
+ logger.warn('Do not follow %s@%s because it is not a channel.', payload.name, host)
return
}
},
defaults: {
state,
+ url: getLocalActorFollowActivityPubUrl(fromActor, targetActor),
actorId: fromActor.id,
targetActorId: targetActor.id
},