aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/server/server-blocklist.ts22
-rw-r--r--server/controllers/api/users/my-blocklist.ts14
-rw-r--r--server/controllers/api/users/my-subscriptions.ts3
3 files changed, 35 insertions, 4 deletions
diff --git a/server/controllers/api/server/server-blocklist.ts b/server/controllers/api/server/server-blocklist.ts
index f849b15c7..78e8a7e09 100644
--- a/server/controllers/api/server/server-blocklist.ts
+++ b/server/controllers/api/server/server-blocklist.ts
@@ -1,6 +1,11 @@
1import * as express from 'express'
2import 'multer' 1import 'multer'
2import * as express from 'express'
3import { logger } from '@server/helpers/logger'
4import { UserNotificationModel } from '@server/models/account/user-notification'
5import { getServerActor } from '@server/models/application/application'
6import { UserRight } from '../../../../shared/models/users'
3import { getFormattedObjects } from '../../../helpers/utils' 7import { getFormattedObjects } from '../../../helpers/utils'
8import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
4import { 9import {
5 asyncMiddleware, 10 asyncMiddleware,
6 asyncRetryTransactionMiddleware, 11 asyncRetryTransactionMiddleware,
@@ -19,10 +24,7 @@ import {
19 unblockServerByServerValidator 24 unblockServerByServerValidator
20} from '../../../middlewares/validators' 25} from '../../../middlewares/validators'
21import { AccountBlocklistModel } from '../../../models/account/account-blocklist' 26import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
22import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
23import { ServerBlocklistModel } from '../../../models/server/server-blocklist' 27import { ServerBlocklistModel } from '../../../models/server/server-blocklist'
24import { UserRight } from '../../../../shared/models/users'
25import { getServerActor } from '@server/models/application/application'
26 28
27const serverBlocklistRouter = express.Router() 29const serverBlocklistRouter = express.Router()
28 30
@@ -100,6 +102,12 @@ async function blockAccount (req: express.Request, res: express.Response) {
100 102
101 await addAccountInBlocklist(serverActor.Account.id, accountToBlock.id) 103 await addAccountInBlocklist(serverActor.Account.id, accountToBlock.id)
102 104
105 UserNotificationModel.removeNotificationsOf({
106 id: accountToBlock.id,
107 type: 'account',
108 forUserId: null // For all users
109 }).catch(err => logger.error('Cannot remove notifications after an account mute.', { err }))
110
103 return res.status(204).end() 111 return res.status(204).end()
104} 112}
105 113
@@ -131,6 +139,12 @@ async function blockServer (req: express.Request, res: express.Response) {
131 139
132 await addServerInBlocklist(serverActor.Account.id, serverToBlock.id) 140 await addServerInBlocklist(serverActor.Account.id, serverToBlock.id)
133 141
142 UserNotificationModel.removeNotificationsOf({
143 id: serverToBlock.id,
144 type: 'server',
145 forUserId: null // For all users
146 }).catch(err => logger.error('Cannot remove notifications after a server mute.', { err }))
147
134 return res.status(204).end() 148 return res.status(204).end()
135} 149}
136 150
diff --git a/server/controllers/api/users/my-blocklist.ts b/server/controllers/api/users/my-blocklist.ts
index 3a44376f2..6eba22d52 100644
--- a/server/controllers/api/users/my-blocklist.ts
+++ b/server/controllers/api/users/my-blocklist.ts
@@ -20,6 +20,8 @@ import {
20import { AccountBlocklistModel } from '../../../models/account/account-blocklist' 20import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
21import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist' 21import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
22import { ServerBlocklistModel } from '../../../models/server/server-blocklist' 22import { ServerBlocklistModel } from '../../../models/server/server-blocklist'
23import { UserNotificationModel } from '@server/models/account/user-notification'
24import { logger } from '@server/helpers/logger'
23 25
24const myBlocklistRouter = express.Router() 26const myBlocklistRouter = express.Router()
25 27
@@ -91,6 +93,12 @@ async function blockAccount (req: express.Request, res: express.Response) {
91 93
92 await addAccountInBlocklist(user.Account.id, accountToBlock.id) 94 await addAccountInBlocklist(user.Account.id, accountToBlock.id)
93 95
96 UserNotificationModel.removeNotificationsOf({
97 id: accountToBlock.id,
98 type: 'account',
99 forUserId: user.id
100 }).catch(err => logger.error('Cannot remove notifications after an account mute.', { err }))
101
94 return res.status(204).end() 102 return res.status(204).end()
95} 103}
96 104
@@ -122,6 +130,12 @@ async function blockServer (req: express.Request, res: express.Response) {
122 130
123 await addServerInBlocklist(user.Account.id, serverToBlock.id) 131 await addServerInBlocklist(user.Account.id, serverToBlock.id)
124 132
133 UserNotificationModel.removeNotificationsOf({
134 id: serverToBlock.id,
135 type: 'server',
136 forUserId: user.id
137 }).catch(err => logger.error('Cannot remove notifications after a server mute.', { err }))
138
125 return res.status(204).end() 139 return res.status(204).end()
126} 140}
127 141
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index b8c234eef..66b33c477 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -26,6 +26,7 @@ import {
26} from '../../../middlewares/validators' 26} from '../../../middlewares/validators'
27import { ActorFollowModel } from '../../../models/activitypub/actor-follow' 27import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
28import { VideoModel } from '../../../models/video/video' 28import { VideoModel } from '../../../models/video/video'
29import { sendUndoFollow } from '@server/lib/activitypub/send'
29 30
30const mySubscriptionsRouter = express.Router() 31const mySubscriptionsRouter = express.Router()
31 32
@@ -138,6 +139,8 @@ async function deleteUserSubscription (req: express.Request, res: express.Respon
138 const subscription = res.locals.subscription 139 const subscription = res.locals.subscription
139 140
140 await sequelizeTypescript.transaction(async t => { 141 await sequelizeTypescript.transaction(async t => {
142 if (subscription.state === 'accepted') await sendUndoFollow(subscription, t)
143
141 return subscription.destroy({ transaction: t }) 144 return subscription.destroy({ transaction: t })
142 }) 145 })
143 146