-import * as express from 'express'
+import express from 'express'
import { body, param, query } from 'express-validator'
+import { isProdInstance } from '@server/helpers/core-utils'
import { isEachUniqueHandleValid, isFollowStateValid, isRemoteHandleValid } from '@server/helpers/custom-validators/follows'
import { loadActorUrlOrGetFromWebfinger } from '@server/lib/activitypub/actors'
import { getRemoteNameAndHost } from '@server/lib/activitypub/follow'
import { getServerActor } from '@server/models/application/application'
import { MActorFollowActorsDefault } from '@server/types/models'
+import { ServerFollowCreate } from '@shared/models'
import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
-import { isTestInstance } from '../../helpers/core-utils'
import { isActorTypeValid, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers'
import { logger } from '../../helpers/logger'
import { ActorModel } from '../../models/actor/actor'
import { ActorFollowModel } from '../../models/actor/actor-follow'
import { areValidationErrors } from './shared'
-import { ServerFollowCreate } from '@shared/models'
const listFollowsValidator = [
query('state')
.optional()
- .custom(isFollowStateValid).withMessage('Should have a valid follow state'),
+ .custom(isFollowStateValid),
query('actorType')
.optional()
- .custom(isActorTypeValid).withMessage('Should have a valid actor type'),
+ .custom(isActorTypeValid),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
if (areValidationErrors(req, res)) return
(req: express.Request, res: express.Response, next: express.NextFunction) => {
// Force https if the administrator wants to follow remote actors
- if (isTestInstance() === false && WEBSERVER.SCHEME === 'http') {
+ if (isProdInstance() && WEBSERVER.SCHEME === 'http') {
return res
.status(HttpStatusCode.INTERNAL_SERVER_ERROR_500)
.json({
})
}
- logger.debug('Checking follow parameters', { parameters: req.body })
-
if (areValidationErrors(req, res)) return
const body: ServerFollowCreate = req.body
const removeFollowingValidator = [
param('hostOrHandle')
- .custom(value => isHostValid(value) || isRemoteHandleValid(value))
- .withMessage('Should have a valid host/handle'),
+ .custom(value => isHostValid(value) || isRemoteHandleValid(value)),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking unfollowing parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
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 getFollowerValidator = [
- param('nameWithHost').custom(isValidActorHandle).withMessage('Should have a valid nameWithHost'),
+ param('nameWithHost')
+ .custom(isValidActorHandle),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking get follower parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
let follow: MActorFollowActorsDefault
}
]
-const acceptOrRejectFollowerValidator = [
+const acceptFollowerValidator = [
(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' && 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) => {
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 !== 'accepted') {
+ return res.fail({ message: 'Follow is not in pending/accepted state.' })
}
return next()
followValidator,
removeFollowingValidator,
getFollowerValidator,
- acceptOrRejectFollowerValidator,
+ acceptFollowerValidator,
+ rejectFollowerValidator,
listFollowsValidator
}