import * as express from 'express'
-import { body, param } from 'express-validator/check'
+import { body, param } from 'express-validator'
import { isTestInstance } from '../../helpers/core-utils'
import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers'
import { logger } from '../../helpers/logger'
import { getServerActor } from '../../helpers/utils'
-import { CONFIG, SERVER_ACTOR_NAME } from '../../initializers'
+import { SERVER_ACTOR_NAME, WEBSERVER } from '../../initializers/constants'
import { ActorFollowModel } from '../../models/activitypub/actor-follow'
import { areValidationErrors } from './utils'
import { ActorModel } from '../../models/activitypub/actor'
import { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger'
-import { getOrCreateActorAndServerAndModel } from '../../lib/activitypub'
import { isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
+import { MActorFollowActorsDefault } from '@server/typings/models'
const followValidator = [
body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'),
(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') {
+ if (isTestInstance() === false && WEBSERVER.SCHEME === 'http') {
return res.status(500)
.json({
error: 'Cannot follow on a non HTTPS web server.'
}
]
-const removeFollowerValidator = [
+const getFollowerValidator = [
param('nameWithHost').custom(isValidActorHandle).withMessage('Should have a valid nameWithHost'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking remove follower parameters', { parameters: req.params })
+ logger.debug('Checking get follower parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
- const serverActor = await getServerActor()
-
- const actorUrl = await loadActorUrlOrGetFromWebfinger(req.params.nameWithHost)
- const actor = await ActorModel.loadByUrl(actorUrl)
+ let follow: MActorFollowActorsDefault
+ try {
+ const actorUrl = await loadActorUrlOrGetFromWebfinger(req.params.nameWithHost)
+ const actor = await ActorModel.loadByUrl(actorUrl)
- const follow = await ActorFollowModel.loadByActorAndTarget(actor.id, serverActor.id)
+ const serverActor = await getServerActor()
+ follow = await ActorFollowModel.loadByActorAndTarget(actor.id, serverActor.id)
+ } catch (err) {
+ logger.warn('Cannot get actor from handle.', { handle: req.params.nameWithHost, err })
+ }
if (!follow) {
return res
}
]
+const acceptOrRejectFollowerValidator = [
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking accept/reject follower parameters', { parameters: req.params })
+
+ const follow = res.locals.follow
+ if (follow.state !== 'pending') {
+ return res.status(400).json({ error: 'Follow is not in pending state.' }).end()
+ }
+
+ return next()
+ }
+]
+
// ---------------------------------------------------------------------------
export {
followValidator,
removeFollowingValidator,
- removeFollowerValidator
+ getFollowerValidator,
+ acceptOrRejectFollowerValidator
}