From 174a8b1b3e705ac350ebeb00299fbca94c916ddf Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 23 Sep 2022 06:21:31 +0900
Subject: fixes

---
 packages/backend/src/server/api/common/GetterService.ts    |  3 +++
 packages/backend/src/server/api/endpoints/announcements.ts |  2 +-
 packages/backend/src/server/api/endpoints/users/pages.ts   |  2 +-
 packages/backend/src/server/api/endpoints/users/stats.ts   | 10 ++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'packages/backend/src/server/api')

diff --git a/packages/backend/src/server/api/common/GetterService.ts b/packages/backend/src/server/api/common/GetterService.ts
index a6b60d1f5a..70ab46ec35 100644
--- a/packages/backend/src/server/api/common/GetterService.ts
+++ b/packages/backend/src/server/api/common/GetterService.ts
@@ -4,6 +4,7 @@ import type { NotesRepository, UsersRepository } from '@/models/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import type { User } from '@/models/entities/User.js';
 import type { Note } from '@/models/entities/Note.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
 
 @Injectable()
 export class GetterService {
@@ -13,6 +14,8 @@ export class GetterService {
 
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
+
+		private userEntityService: UserEntityService,
 	) {
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 74168481f6..79788be4e2 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
 import { DI } from '@/di-symbols.js';
-import type { AnnouncementReadsRepository, AnnouncementsRepository } from '@/models';
+import type { AnnouncementReadsRepository, AnnouncementsRepository } from '@/models/index.js';
 
 export const meta = {
 	tags: ['meta'],
diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts
index e007aa57b2..a105103f16 100644
--- a/packages/backend/src/server/api/endpoints/users/pages.ts
+++ b/packages/backend/src/server/api/endpoints/users/pages.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
 import { PageEntityService } from '@/core/entities/PageEntityService.js';
-import type { PagesRepository } from '@/models';
+import type { PagesRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts
index 71f4ca0cfa..7479793afe 100644
--- a/packages/backend/src/server/api/endpoints/users/stats.ts
+++ b/packages/backend/src/server/api/endpoints/users/stats.ts
@@ -3,6 +3,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import { DI } from '@/di-symbols.js';
+import type { UsersRepository, NotesRepository, FollowingsRepository, DriveFilesRepository, NoteReactionsRepository, PageLikesRepository, NoteFavoritesRepository, PollVotesRepository } from '@/models/index.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -217,10 +218,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				driveUsage: this.driveFileEntityService.calcDriveUsageOf(user),
 			});
 
-			result.followingCount = result.localFollowingCount + result.remoteFollowingCount;
-			result.followersCount = result.localFollowersCount + result.remoteFollowersCount;
-
-			return result;
+			return {
+				...result,
+				followingCount: result.localFollowingCount + result.remoteFollowingCount,
+				followersCount: result.localFollowersCount + result.remoteFollowersCount,
+			};
 		});
 	}
 }
-- 
cgit v1.2.3-freya