From 858ba188768017764c61c4a5591bdf2524a850e7 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Thu, 1 Aug 2024 08:24:50 -0400
Subject: [PATCH] fix: pass current user into `InstanceEntityService.packMany`
---
packages/backend/src/core/entities/InstanceEntityService.ts | 3 ++-
.../backend/src/server/api/endpoints/federation/instances.ts | 2 +-
packages/backend/src/server/api/endpoints/federation/stats.ts | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 002a93397d..2dfb8d5356 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -63,8 +63,9 @@ export class InstanceEntityService {
@bindThis
public packMany(
instances: MiInstance[],
+ me?: { id: MiUser['id']; } | null | undefined,
) {
- return Promise.all(instances.map(x => this.pack(x)));
+ return Promise.all(instances.map(x => this.pack(x, me)));
}
}
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index c3f2247b69..c1ce3f2238 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -203,7 +203,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const instances = await query.limit(ps.limit).offset(ps.offset).getMany();
- return await this.instanceEntityService.packMany(instances);
+ return await this.instanceEntityService.packMany(instances, me);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts
index bac54970ab..69900bff9a 100644
--- a/packages/backend/src/server/api/endpoints/federation/stats.ts
+++ b/packages/backend/src/server/api/endpoints/federation/stats.ts
@@ -107,9 +107,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const gotPubCount = topPubInstances.map(x => x.followingCount).reduce((a, b) => a + b, 0);
return await awaitAll({
- topSubInstances: this.instanceEntityService.packMany(topSubInstances),
+ topSubInstances: this.instanceEntityService.packMany(topSubInstances, me),
otherFollowersCount: Math.max(0, allSubCount - gotSubCount),
- topPubInstances: this.instanceEntityService.packMany(topPubInstances),
+ topPubInstances: this.instanceEntityService.packMany(topPubInstances, me),
otherFollowingCount: Math.max(0, allPubCount - gotPubCount),
});
});