import * as express from 'express'
import { body, param } from 'express-validator/check'
-import { getServerActor, isTestInstance, logger } from '../../helpers'
+import { isTestInstance } from '../../helpers/core-utils'
import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers'
-import { CONFIG } from '../../initializers'
+import { logger } from '../../helpers/logger'
+import { getServerActor } from '../../helpers/utils'
+import { CONFIG, SERVER_ACTOR_NAME } from '../../initializers'
import { ActorFollowModel } from '../../models/activitypub/actor-follow'
import { areValidationErrors } from './utils'
(req: express.Request, res: express.Response, next: express.NextFunction) => {
// Force https if the administrator wants to make friends
if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') {
- return res.status(400)
+ return res.status(500)
.json({
- error: 'Cannot follow non HTTPS web server.'
+ error: 'Cannot follow on a non HTTPS web server.'
})
.end()
}
if (areValidationErrors(req, res)) return
const serverActor = await getServerActor()
- const follow = await ActorFollowModel.loadByActorAndTargetHost(serverActor.id, req.params.host)
+ const follow = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(serverActor.id, SERVER_ACTOR_NAME, req.params.host)
if (!follow) {
- return res.status(404)
+ return res
+ .status(404)
+ .json({
+ error: `Follower ${req.params.host} not found.`
+ })
.end()
}