import { getServerActor } from '@server/models/application/application'
import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { getAPId } from '../../../helpers/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { CONFIG } from '../../../initializers/config'
import { sequelizeTypescript } from '../../../initializers/database'
+import { getAPId } from '../../../lib/activitypub/activity'
import { ActorModel } from '../../../models/actor/actor'
import { ActorFollowModel } from '../../../models/actor/actor-follow'
import { APProcessorOptions } from '../../../types/activitypub-processor.model'
if (isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.ENABLED === false) {
logger.info('Rejecting %s because instance followers are disabled.', targetActor.url)
- await sendReject(activityId, byActor, targetActor)
+ sendReject(activityId, byActor, targetActor)
return { actorFollow: undefined as MActorFollowActors }
}
- const [ actorFollow, created ] = await ActorFollowModel.findOrCreate<MActorFollowActors>({
- where: {
- actorId: byActor.id,
- targetActorId: targetActor.id
- },
- defaults: {
- actorId: byActor.id,
- targetActorId: targetActor.id,
- url: activityId,
-
- state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL
- ? 'pending'
- : 'accepted'
- },
+ const [ actorFollow, created ] = await ActorFollowModel.findOrCreateCustom({
+ byActor,
+ targetActor,
+ activityId,
+ state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL
+ ? 'pending'
+ : 'accepted',
transaction: t
})
// Target sends to actor he accepted the follow request
if (actorFollow.state === 'accepted') {
- await sendAccept(actorFollow)
- await autoFollowBackIfNeeded(actorFollow)
+ sendAccept(actorFollow)
+
+ await autoFollowBackIfNeeded(actorFollow, t)
}
return { actorFollow, created, isFollowingInstance, targetActor }