import * as Bull from 'bull'
import { logger } from '../../../helpers/logger'
-import { CONFIG, REMOTE_SCHEME, sequelizeTypescript } from '../../../initializers'
+import { REMOTE_SCHEME, WEBSERVER } from '../../../initializers/constants'
import { sendFollow } from '../../activitypub/send'
import { sanitizeHost } from '../../../helpers/core-utils'
import { loadActorUrlOrGetFromWebfinger } from '../../../helpers/webfinger'
import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
import { ActorModel } from '../../../models/activitypub/actor'
import { Notifier } from '../../notifier'
+import { sequelizeTypescript } from '../../../initializers/database'
export type ActivitypubFollowPayload = {
followerActorId: number
logger.info('Processing ActivityPub follow in job %d.', job.id)
let targetActor: ActorModel
- if (!host || host === CONFIG.WEBSERVER.HOST) {
+ if (!host || host === WEBSERVER.HOST) {
targetActor = await ActorModel.loadLocalByName(payload.name)
} else {
const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP)
return actorFollow
})
- if (actorFollow.state === 'accepted') Notifier.Instance.notifyOfNewFollow(actorFollow)
+ if (actorFollow.state === 'accepted') Notifier.Instance.notifyOfNewUserFollow(actorFollow)
}