X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fblocklist.ts;h=27224ff9b5c5218a45e20d52817dc9fd528034ac;hb=2158ac90341dc3fcae958540de65032da25c8d6e;hp=47a0b1a1c13135de8ca6db78e40df96e3a637d4d;hpb=c8861d5dc0436ef4342ce517241e3591fa256a13;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/blocklist.ts b/server/middlewares/validators/blocklist.ts index 47a0b1a1c..27224ff9b 100644 --- a/server/middlewares/validators/blocklist.ts +++ b/server/middlewares/validators/blocklist.ts @@ -6,9 +6,9 @@ import { AccountBlocklistModel } from '../../models/account/account-blocklist' import { isHostValid } from '../../helpers/custom-validators/servers' import { ServerBlocklistModel } from '../../models/server/server-blocklist' import { ServerModel } from '../../models/server/server' -import { getServerActor } from '../../helpers/utils' import { WEBSERVER } from '../../initializers/constants' import { doesAccountNameWithHostExist } from '../../helpers/middlewares' +import { getServerActor } from '@server/models/application/application' const blockAccountValidator = [ body('accountName').exists().withMessage('Should have an account name with host'), @@ -84,12 +84,7 @@ const blockServerValidator = [ .end() } - const server = await ServerModel.loadByHost(host) - if (!server) { - return res.status(404) - .send({ error: 'Server host not found.' }) - .end() - } + const server = await ServerModel.loadOrCreateByHost(host) res.locals.server = server