import * as express from 'express'
-import { body } from 'express-validator/check'
+import { body, param } from 'express-validator/check'
import { isTestInstance } from '../../helpers/core-utils'
-import { isAccountIdValid } from '../../helpers/custom-validators/activitypub/account'
-import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers'
+import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers'
import { logger } from '../../helpers/logger'
-import { CONFIG, database as db } from '../../initializers'
-import { checkErrors } from './utils'
-import { getServerAccount } from '../../helpers/utils'
+import { getServerActor } from '../../helpers/utils'
+import { CONFIG } from '../../initializers'
+import { ActorFollowModel } from '../../models/activitypub/actor-follow'
+import { areValidationErrors } from './utils'
const followValidator = [
body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'),
if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') {
return res.status(400)
.json({
- error: 'Cannot follow non HTTPS web server.'
+ error: 'Cannot follow on a non HTTPS web server.'
})
.end()
}
logger.debug('Checking follow parameters', { parameters: req.body })
- checkErrors(req, res, next)
+ if (areValidationErrors(req, res)) return
+
+ return next()
}
]
const removeFollowingValidator = [
- body('accountId').custom(isAccountIdValid).withMessage('Should have a valid account id'),
+ param('host').custom(isHostValid).withMessage('Should have a valid host'),
- (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking follow parameters', { parameters: req.body })
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking unfollow parameters', { parameters: req.params })
- checkErrors(req, res, async () => {
- try {
- const serverAccount = await getServerAccount()
- const following = await db.AccountFollow.loadByAccountAndTarget(serverAccount.id, req.params.accountId)
+ if (areValidationErrors(req, res)) return
- if (!following) {
- return res.status(404)
- .end()
- }
+ const serverActor = await getServerActor()
+ const follow = await ActorFollowModel.loadByActorAndTargetHost(serverActor.id, req.params.host)
- res.locals.following = following
+ if (!follow) {
+ return res
+ .status(404)
+ .json({
+ error: `Follower ${req.params.host} not found.`
+ })
+ .end()
+ }
- return next()
- } catch (err) {
- logger.error('Error in remove following validator.', err)
- return res.sendStatus(500)
- }
- })
+ res.locals.follow = follow
+ return next()
}
]