From c49f529ccbe5514ecd595c64946dde50b0eec9b1 Mon Sep 17 00:00:00 2001 From: Johann150 Date: Sat, 12 Nov 2022 15:23:49 +0100 Subject: [PATCH] server: use DeliverManager for user deletion --- packages/backend/src/services/suspend-user.ts | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/backend/src/services/suspend-user.ts b/packages/backend/src/services/suspend-user.ts index b891a6a1c..a3c06b781 100644 --- a/packages/backend/src/services/suspend-user.ts +++ b/packages/backend/src/services/suspend-user.ts @@ -1,7 +1,7 @@ import { Not, IsNull } from 'typeorm'; import renderDelete from '@/remote/activitypub/renderer/delete.js'; import { renderActivity } from '@/remote/activitypub/renderer/index.js'; -import { deliver } from '@/queue/index.js'; +import { DeliverManager } from '@/remote/activitypub/deliver-manager.js'; import config from '@/config/index.js'; import { User } from '@/models/entities/user.js'; import { Users, Followings } from '@/models/index.js'; @@ -11,27 +11,11 @@ export async function doPostSuspend(user: { id: User['id']; host: User['host'] } publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true }); if (Users.isLocalUser(user)) { - // 知り得る全SharedInboxにDelete配信 const content = renderActivity(renderDelete(`${config.url}/users/${user.id}`, user)); - const queue: string[] = []; - - const followings = await Followings.find({ - where: [ - { followerSharedInbox: Not(IsNull()) }, - { followeeSharedInbox: Not(IsNull()) }, - ], - select: ['followerSharedInbox', 'followeeSharedInbox'], - }); - - const inboxes = followings.map(x => x.followerSharedInbox || x.followeeSharedInbox); - - for (const inbox of inboxes) { - if (inbox != null && !queue.includes(inbox)) queue.push(inbox); - } - - for (const inbox of queue) { - deliver(user, content, inbox); - } + // deliver to all of known network + const dm = new DeliverManager(user, content); + dm.addEveryone(); + await dm.execute(); } }