merge: release 2025.4.2 (!1051)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1051

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
Approved-by: Julia <julia@insertdomain.name>

1 files changed, 40 insertions, 0 deletions

diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 669bffe2dc..1579719246 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -12,6 +12,7 @@ import { RoleEntityService } from '@/core/entities/RoleEntityService.js';
 import { IdService } from '@/core/IdService.js';
 import { notificationRecieveConfig } from '@/models/json-schema/user.js';
 import { isSystemAccount } from '@/misc/is-system-account.js';
+import { CacheService } from '@/core/CacheService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -111,6 +112,7 @@ export const meta = {
 					receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 					followRequestAccepted: { optional: true, ...notificationRecieveConfig },
 					roleAssigned: { optional: true, ...notificationRecieveConfig },
+					chatRoomInvitationReceived: { optional: true, ...notificationRecieveConfig },
 					achievementEarned: { optional: true, ...notificationRecieveConfig },
 					app: { optional: true, ...notificationRecieveConfig },
 					test: { optional: true, ...notificationRecieveConfig },
@@ -185,6 +187,36 @@ export const meta = {
 					},
 				},
 			},
+			followStats: {
+				type: 'object',
+				optional: false, nullable: false,
+				properties: {
+					totalFollowing: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					totalFollowers: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					localFollowing: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					localFollowers: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					remoteFollowing: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					remoteFollowers: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+				},
+			},
 		},
 	},
 } as const;
@@ -212,6 +244,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private roleService: RoleService,
 		private roleEntityService: RoleEntityService,
 		private idService: IdService,
+		private readonly cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const [user, profile] = await Promise.all([
@@ -236,6 +269,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const roleAssigns = await this.roleService.getUserAssigns(user.id);
 			const roles = await this.roleService.getUserRoles(user.id);
 
+			const followStats = await this.cacheService.getFollowStats(user.id);
+
 			return {
 				email: profile.email,
 				emailVerified: profile.emailVerified,
@@ -268,6 +303,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					expiresAt: a.expiresAt ? a.expiresAt.toISOString() : null,
 					roleId: a.roleId,
 				})),
+				followStats: {
+					...followStats,
+					totalFollowers: Math.max(user.followersCount, followStats.localFollowers + followStats.remoteFollowers),
+					totalFollowing: Math.max(user.followingCount, followStats.localFollowing + followStats.remoteFollowing),
+				},
 			};
 		});
 	}