Hide schedule privacy if private does not exist

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / follows.ts

diff --git a/server/middlewares/validators/follows.ts b/server/middlewares/validators/follows.ts
index 1d18de8cd9281fa1b787218a0021319519acbbb3..205baca48ddb526ef08d55204429d24e0f97df2e 100644 (file)
--- a/server/middlewares/validators/follows.ts
+++ b/server/middlewares/validators/follows.ts
@@ -1,6 +1,7 @@
 import * as express from 'express'
 import { body, param, query } from 'express-validator'
 import { isFollowStateValid } from '@server/helpers/custom-validators/follows'
+import { loadActorUrlOrGetFromWebfinger } from '@server/lib/activitypub/actors'
 import { getServerActor } from '@server/models/application/application'
 import { MActorFollowActorsDefault } from '@server/types/models'
 import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
@@ -8,11 +9,10 @@ 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 { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger'
 import { SERVER_ACTOR_NAME, WEBSERVER } from '../../initializers/constants'
 import { ActorModel } from '../../models/actor/actor'
 import { ActorFollowModel } from '../../models/actor/actor-follow'
-import { areValidationErrors } from './utils'
+import { areValidationErrors } from './shared'
 
 const listFollowsValidator = [
   query('state')
@@ -63,11 +63,10 @@ const removeFollowingValidator = [
     const follow = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(serverActor.id, SERVER_ACTOR_NAME, req.params.host)
 
     if (!follow) {
-      return res
-        .status(HttpStatusCode.NOT_FOUND_404)
-        .json({
-          error: `Following ${req.params.host} not found.`
-        })
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: `Following ${req.params.host} not found.`
+      })
     }
 
     res.locals.follow = follow
@@ -95,12 +94,10 @@ const getFollowerValidator = [
     }
 
     if (!follow) {
-      return res
-        .status(HttpStatusCode.NOT_FOUND_404)
-        .json({
-          error: `Follower ${req.params.nameWithHost} not found.`
-        })
-        .end()
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: `Follower ${req.params.nameWithHost} not found.`
+      })
     }
 
     res.locals.follow = follow
@@ -114,12 +111,7 @@ const acceptOrRejectFollowerValidator = [
 
     const follow = res.locals.follow
     if (follow.state !== 'pending') {
-      return res
-        .status(HttpStatusCode.BAD_REQUEST_400)
-        .json({
-          error: 'Follow is not in pending state.'
-        })
-        .end()
+      return res.fail({ message: 'Follow is not in pending state.' })
     }
 
     return next()