From a093c373c4aa8fb1bb25642c4f5fa99f5fd70237 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 5 Apr 2023 13:57:22 +0900
Subject: [PATCH] fix

---
 packages/backend/src/core/UserBlockingService.ts  | 13 ++++++++++---
 packages/backend/src/core/UserFollowingService.ts | 14 +++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts
index 6eaef8f68a..b3e306346e 100644
--- a/packages/backend/src/core/UserBlockingService.ts
+++ b/packages/backend/src/core/UserBlockingService.ts
@@ -1,5 +1,6 @@
 
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import { IdService } from '@/core/IdService.js';
 import type { User } from '@/models/entities/User.js';
 import type { Blocking } from '@/models/entities/Blocking.js';
@@ -17,10 +18,13 @@ import { CacheService } from '@/core/CacheService.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
 
 @Injectable()
-export class UserBlockingService {
+export class UserBlockingService implements OnModuleInit {
 	private logger: Logger;
+	private userFollowingService: UserFollowingService;
 
 	constructor(
+		private moduleRef: ModuleRef,
+	
 		@Inject(DI.followRequestsRepository)
 		private followRequestsRepository: FollowRequestsRepository,
 
@@ -34,7 +38,6 @@ export class UserBlockingService {
 		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		private cacheService: CacheService,
-		private userFollowingService: UserFollowingService,
 		private userEntityService: UserEntityService,
 		private idService: IdService,
 		private queueService: QueueService,
@@ -46,6 +49,10 @@ export class UserBlockingService {
 		this.logger = this.loggerService.getLogger('user-block');
 	}
 
+	onModuleInit() {
+		this.userFollowingService = this.moduleRef.get('UserFollowingService');
+	}
+
 	@bindThis
 	public async block(blocker: User, blockee: User) {
 		await Promise.all([
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 4f22c5cd46..d7bb8f3920 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -1,4 +1,5 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, OnModuleInit, forwardRef } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
@@ -37,8 +38,12 @@ type Remote = RemoteUser | {
 type Both = Local | Remote;
 
 @Injectable()
-export class UserFollowingService {
+export class UserFollowingService implements OnModuleInit {
+	private userBlockingService: UserBlockingService;
+
 	constructor(
+		private moduleRef: ModuleRef,
+	
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -56,7 +61,6 @@ export class UserFollowingService {
 
 		private cacheService: CacheService,
 		private userEntityService: UserEntityService,
-		private userBlockingService: UserBlockingService,
 		private idService: IdService,
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
@@ -70,6 +74,10 @@ export class UserFollowingService {
 	) {
 	}
 
+	onModuleInit() {
+		this.userBlockingService = this.moduleRef.get('UserBlockingService');
+	}
+
 	@bindThis
 	public async follow(_follower: { id: User['id'] }, _followee: { id: User['id'] }, requestId?: string): Promise<void> {
 		const [follower, followee] = await Promise.all([