import * as express from 'express'
import 'multer'
-import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
+import { getFormattedObjects } from '../../../helpers/utils'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
import { ServerBlocklistModel } from '../../../models/server/server-blocklist'
import { UserRight } from '../../../../shared/models/users'
+import { getServerActor } from '@server/models/application/application'
const serverBlocklistRouter = express.Router()
async function listBlockedAccounts (req: express.Request, res: express.Response) {
const serverActor = await getServerActor()
- const resultList = await AccountBlocklistModel.listForApi(serverActor.Account.id, req.query.start, req.query.count, req.query.sort)
+ const resultList = await AccountBlocklistModel.listForApi({
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ accountId: serverActor.Account.id
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function listBlockedServers (req: express.Request, res: express.Response) {
const serverActor = await getServerActor()
- const resultList = await ServerBlocklistModel.listForApi(serverActor.Account.id, req.query.start, req.query.count, req.query.sort)
+ const resultList = await ServerBlocklistModel.listForApi({
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ accountId: serverActor.Account.id
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}