const serverActor = await getServerActor()
const { name, host } = getRemoteNameAndHost(req.params.hostOrHandle)
- const follow = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(serverActor.id, name, host)
+ const follow = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI({
+ actorId: serverActor.id,
+ targetName: name,
+ targetHost: host
+ })
if (!follow) {
return res.fail({
}
]
-const acceptOrRejectFollowerValidator = [
+const acceptFollowerValidator = [
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking accept/reject follower parameters', { parameters: req.params })
+ logger.debug('Checking accept follower parameters', { parameters: req.params })
const follow = res.locals.follow
- if (follow.state !== 'pending') {
- return res.fail({ message: 'Follow is not in pending state.' })
+ if (follow.state !== 'pending' && follow.state !== 'rejected') {
+ return res.fail({ message: 'Follow is not in pending/rejected state.' })
+ }
+
+ return next()
+ }
+]
+
+const rejectFollowerValidator = [
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking reject follower parameters', { parameters: req.params })
+
+ const follow = res.locals.follow
+ if (follow.state !== 'pending' && follow.state !== 'accepted') {
+ return res.fail({ message: 'Follow is not in pending/accepted state.' })
}
return next()
followValidator,
removeFollowingValidator,
getFollowerValidator,
- acceptOrRejectFollowerValidator,
+ acceptFollowerValidator,
+ rejectFollowerValidator,
listFollowsValidator
}