-import * as express from 'express'
import 'multer'
-import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
+import * as express from 'express'
+import { logger } from '@server/helpers/logger'
+import { UserNotificationModel } from '@server/models/user/user-notification'
+import { getServerActor } from '@server/models/application/application'
+import { UserRight } from '../../../../shared/models/users'
+import { getFormattedObjects } from '../../../helpers/utils'
+import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
unblockServerByServerValidator
} from '../../../middlewares/validators'
import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
-import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
import { ServerBlocklistModel } from '../../../models/server/server-blocklist'
-import { UserRight } from '../../../../shared/models/users'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
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))
}
await addAccountInBlocklist(serverActor.Account.id, accountToBlock.id)
- return res.status(204).end()
+ UserNotificationModel.removeNotificationsOf({
+ id: accountToBlock.id,
+ type: 'account',
+ forUserId: null // For all users
+ }).catch(err => logger.error('Cannot remove notifications after an account mute.', { err }))
+
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function unblockAccount (req: express.Request, res: express.Response) {
await removeAccountFromBlocklist(accountBlock)
- return res.status(204).end()
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
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))
}
await addServerInBlocklist(serverActor.Account.id, serverToBlock.id)
- return res.status(204).end()
+ UserNotificationModel.removeNotificationsOf({
+ id: serverToBlock.id,
+ type: 'server',
+ forUserId: null // For all users
+ }).catch(err => logger.error('Cannot remove notifications after a server mute.', { err }))
+
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function unblockServer (req: express.Request, res: express.Response) {
await removeServerFromBlocklist(serverBlock)
- return res.status(204).end()
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}