Fix i18n generation

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

diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 894c724982004e03b042eec673b61864917bbea6..d50e6527fe4ac7ab3d9764c6372e90b96df91163 100644 (file)
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,12 +1,13 @@
 import * as express from 'express'
-import { query } from 'express-validator/check'
-import { getHostWithPort, logger } from '../../helpers'
-import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
+import { query } from 'express-validator'
+import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger'
+import { logger } from '../../helpers/logger'
 import { ActorModel } from '../../models/activitypub/actor'
 import { areValidationErrors } from './utils'
+import { getHostWithPort } from '../../helpers/express-utils'
 
 const webfingerValidator = [
-  query('resource').custom(isWebfingerResourceValid).withMessage('Should have a valid webfinger resource'),
+  query('resource').custom(isWebfingerLocalResourceValid).withMessage('Should have a valid webfinger resource'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking webfinger parameters', { parameters: req.query })
@@ -17,6 +18,7 @@ const webfingerValidator = [
     const nameWithHost = getHostWithPort(req.query.resource.substr(5))
     const [ name ] = nameWithHost.split('@')
 
+    // FIXME: we don't need the full actor
     const actor = await ActorModel.loadLocalByName(name)
     if (!actor) {
       return res.status(404)
@@ -24,7 +26,7 @@ const webfingerValidator = [
         .end()
     }
 
-    res.locals.actor = actor
+    res.locals.actorFull = actor
     return next()
   }
 ]