X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fserver.ts;h=10bbefe38866ee95d16be212f8f12197b23a83fe;hb=3318147300b4f998adf728eb0a5a14a4c1829c51;hp=6158c3363d9f6a6f7d041ef11498d89cc6797440;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/server.ts b/server/middlewares/validators/server.ts
index 6158c3363..10bbefe38 100644
--- a/server/middlewares/validators/server.ts
+++ b/server/middlewares/validators/server.ts
@@ -1,12 +1,13 @@
-import * as express from 'express'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
-import { isHostValid, isValidContactBody } from '../../helpers/custom-validators/servers'
-import { ServerModel } from '../../models/server/server'
+import express from 'express'
 import { body } from 'express-validator'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
+import { isHostValid, isValidContactBody } from '../../helpers/custom-validators/servers'
 import { isUserDisplayNameValid } from '../../helpers/custom-validators/users'
-import { Redis } from '../../lib/redis'
+import { logger } from '../../helpers/logger'
 import { CONFIG, isEmailEnabled } from '../../initializers/config'
+import { Redis } from '../../lib/redis'
+import { ServerModel } from '../../models/server/server'
+import { areValidationErrors } from './shared'
 
 const serverGetValidator = [
   body('host').custom(isHostValid).withMessage('Should have a valid host'),
@@ -18,9 +19,10 @@ const serverGetValidator = [
 
     const server = await ServerModel.loadByHost(req.body.host)
     if (!server) {
-      return res.status(404)
-         .send({ error: 'Server host not found.' })
-         .end()
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'Server host not found.'
+      })
     }
 
     res.locals.server = server
@@ -43,26 +45,26 @@ const contactAdministratorValidator = [
     if (areValidationErrors(req, res)) return
 
     if (CONFIG.CONTACT_FORM.ENABLED === false) {
-      return res
-        .status(409)
-        .send({ error: 'Contact form is not enabled on this instance.' })
-        .end()
+      return res.fail({
+        status: HttpStatusCode.CONFLICT_409,
+        message: 'Contact form is not enabled on this instance.'
+      })
     }
 
     if (isEmailEnabled() === false) {
-      return res
-        .status(409)
-        .send({ error: 'Emailer is not enabled on this instance.' })
-        .end()
+      return res.fail({
+        status: HttpStatusCode.CONFLICT_409,
+        message: 'Emailer is not enabled on this instance.'
+      })
     }
 
     if (await Redis.Instance.doesContactFormIpExist(req.ip)) {
       logger.info('Refusing a contact form by %s: already sent one recently.', req.ip)
 
-      return res
-        .status(403)
-        .send({ error: 'You already sent a contact form recently.' })
-        .end()
+      return res.fail({
+        status: HttpStatusCode.FORBIDDEN_403,
+        message: 'You already sent a contact form recently.'
+      })
     }
 
     return next()