-import { body, param } from 'express-validator'
-import * as express from 'express'
+import express from 'express'
+import { body, param, query } from 'express-validator'
+import { areValidActorHandles } from '@server/helpers/custom-validators/activitypub/actor'
+import { toArray } from '@server/helpers/custom-validators/misc'
+import { getServerActor } from '@server/models/application/application'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
+import { isEachUniqueHostValid, isHostValid } from '../../helpers/custom-validators/servers'
import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+import { WEBSERVER } from '../../initializers/constants'
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 { ServerBlocklistModel } from '../../models/server/server-blocklist'
+import { areValidationErrors, doesAccountNameWithHostExist } from './shared'
const blockAccountValidator = [
body('accountName').exists().withMessage('Should have an account name with host'),
const accountToBlock = res.locals.account
if (user.Account.id === accountToBlock.id) {
- res.status(409)
- .send({ error: 'You cannot block yourself.' })
- .end()
-
+ res.fail({
+ status: HttpStatusCode.CONFLICT_409,
+ message: 'You cannot block yourself.'
+ })
return
}
const host: string = req.body.host
if (host === WEBSERVER.HOST) {
- return res.status(409)
- .send({ error: 'You cannot block your own server.' })
- .end()
+ return res.fail({
+ status: HttpStatusCode.CONFLICT_409,
+ message: 'You cannot block your own server.'
+ })
}
- let server = await ServerModel.loadByHost(host)
- if (!server) {
- server = await ServerModel.create({ host })
- }
+ const server = await ServerModel.loadOrCreateByHost(host)
res.locals.server = server
}
]
+const blocklistStatusValidator = [
+ query('hosts')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isEachUniqueHostValid).withMessage('Should have a valid hosts array'),
+
+ query('accounts')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(areValidActorHandles).withMessage('Should have a valid accounts array'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking blocklistStatusValidator parameters', { query: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
// ---------------------------------------------------------------------------
export {
unblockAccountByAccountValidator,
unblockServerByAccountValidator,
unblockAccountByServerValidator,
- unblockServerByServerValidator
+ unblockServerByServerValidator,
+ blocklistStatusValidator
}
// ---------------------------------------------------------------------------
async function doesUnblockAccountExist (accountId: number, targetAccountId: number, res: express.Response) {
const accountBlock = await AccountBlocklistModel.loadByAccountAndTarget(accountId, targetAccountId)
if (!accountBlock) {
- res.status(404)
- .send({ error: 'Account block entry not found.' })
- .end()
-
+ res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Account block entry not found.'
+ })
return false
}
res.locals.accountBlock = accountBlock
-
return true
}
async function doesUnblockServerExist (accountId: number, host: string, res: express.Response) {
const serverBlock = await ServerBlocklistModel.loadByAccountAndHost(accountId, host)
if (!serverBlock) {
- res.status(404)
- .send({ error: 'Server block entry not found.' })
- .end()
-
+ res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Server block entry not found.'
+ })
return false
}
res.locals.serverBlock = serverBlock
-
return true
}