summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-09-23 06:21:31 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-09-23 06:21:31 +0900
commit174a8b1b3e705ac350ebeb00299fbca94c916ddf (patch)
tree1239d7a101f6895625aa8cdca715fa0c1a1c47e7 /packages/backend/src/server/api
parentchore: fix type import (diff)
downloadsharkey-174a8b1b3e705ac350ebeb00299fbca94c916ddf.tar.gz
sharkey-174a8b1b3e705ac350ebeb00299fbca94c916ddf.tar.bz2
sharkey-174a8b1b3e705ac350ebeb00299fbca94c916ddf.zip
fixes
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/common/GetterService.ts3
-rw-r--r--packages/backend/src/server/api/endpoints/announcements.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/pages.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/stats.ts10
4 files changed, 11 insertions, 6 deletions
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,
+ };
});
}
}