Resumable video uploads (#3933)

[github/Chocobozzz/PeerTube.git] / server / controllers / api / server / server-blocklist.ts

diff --git a/server/controllers/api/server/server-blocklist.ts b/server/controllers/api/server/server-blocklist.ts
index d165db19164fb3142237bebb4456f34bf4c4d3a6..6e341c0fb23e853fa47f91404b6af86c2a0fd0b5 100644 (file)
--- a/server/controllers/api/server/server-blocklist.ts
+++ b/server/controllers/api/server/server-blocklist.ts
@@ -1,6 +1,11 @@
-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/account/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,
@@ -19,9 +24,8 @@ import {
   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()
 
@@ -82,7 +86,13 @@ export {
 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))
 }
@@ -93,7 +103,13 @@ async function blockAccount (req: express.Request, res: express.Response) {
 
   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) {
@@ -101,13 +117,19 @@ 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))
 }
@@ -118,7 +140,13 @@ async function blockServer (req: express.Request, res: express.Response) {
 
   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) {
@@ -126,5 +154,5 @@ 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()
 }