From 2a4325881cd75dc1a04bfadda82fc6afd8f0f019 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sat, 17 Aug 2024 13:58:57 +0900 Subject: [PATCH] fix conflict --- packages/backend/src/core/UserSuspendService.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts index ffbdb885b1..bb09eb7149 100644 --- a/packages/backend/src/core/UserSuspendService.ts +++ b/packages/backend/src/core/UserSuspendService.ts @@ -4,11 +4,11 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import { DI } from '@/di-symbols.js'; import { Not, IsNull } from 'typeorm'; import type { FollowingsRepository, FollowRequestsRepository, UsersRepository } from '@/models/_.js'; import type { MiUser } from '@/models/User.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; +import { DI } from '@/di-symbols.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; @@ -16,6 +16,7 @@ import { UserKeypairService } from './UserKeypairService.js'; import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js'; import { RelationshipJobData } from '@/queue/types.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; +import { QueueService } from '@/core/QueueService.js'; @Injectable() export class UserSuspendService { @@ -30,6 +31,7 @@ export class UserSuspendService { private followRequestsRepository: FollowRequestsRepository, private userEntityService: UserEntityService, + private queueService: QueueService, private globalEventService: GlobalEventService, private apRendererService: ApRendererService, private userKeypairService: UserKeypairService,