X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=5fe864f8b6a62233d0352be6c6a11e4fa41727d2;hb=adc1f09c0dbd997f34028c1c82d1c118dc8ead80;hp=3b9645048c4130ac2d52d4782f6a5e58b703c62f;hpb=0626e7af82e02f8a5bd1e74a7d4d8c916d073ceb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 3b9645048..5fe864f8b 100644
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,13 +1,13 @@
 import * as express from 'express'
-import { query } from 'express-validator/check'
-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 })
@@ -18,14 +18,14 @@ const webfingerValidator = [
     const nameWithHost = getHostWithPort(req.query.resource.substr(5))
     const [ name ] = nameWithHost.split('@')
 
-    const actor = await ActorModel.loadLocalByName(name)
+    const actor = await ActorModel.loadLocalUrlByName(name)
     if (!actor) {
       return res.status(404)
         .send({ error: 'Actor not found' })
         .end()
     }
 
-    res.locals.actor = actor
+    res.locals.actorUrl = actor
     return next()
   }
 ]