-import * as express from 'express'
-import { query } from 'express-validator/check'
-import { logger } from '../../helpers'
-import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
-import { ActorModel } from '../../models/activitypub/actor'
-import { areValidationErrors } from './utils'
+import express from 'express'
+import { query } from 'express-validator'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
+import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger'
+import { getHostWithPort } from '../../helpers/express-utils'
+import { logger } from '../../helpers/logger'
+import { ActorModel } from '../../models/actor/actor'
+import { areValidationErrors } from './shared'
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 })
if (areValidationErrors(req, res)) return
// Remove 'acct:' from the beginning of the string
- const nameWithHost = req.query.resource.substr(5)
+ 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()
+ return res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Actor not found'
+ })
}
- res.locals.actor = actor
+ res.locals.actorUrl = actor
return next()
}
]