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'
return { actorFollow: undefined as MActorFollowActors }
}
- // Don't use findOrCreate by sequelize that breaks our actor follow hooks
- let created = false
- let actorFollow: MActorFollowActors = await ActorFollowModel.loadByActorAndTarget(byActor.id, targetActor.id, t)
-
- if (!actorFollow) {
- created = true
-
- actorFollow = await ActorFollowModel.create({
- actorId: byActor.id,
- targetActorId: targetActor.id,
- url: activityId,
-
- state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL
- ? 'pending'
- : 'accepted'
- }, { transaction: t })
- }
+ const [ actorFollow, created ] = await ActorFollowModel.findOrCreateCustom({
+ byActor,
+ targetActor,
+ activityId,
+ state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL
+ ? 'pending'
+ : 'accepted',
+ transaction: t
+ })
// Set the follow as accepted if the remote actor follows a channel or account
// Or if the instance automatically accepts followers