summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-08-11 11:28:07 +0900
committerGitHub <noreply@github.com>2024-08-11 11:28:07 +0900
commit0aaf74ee22da1b8e4b690075c45c166d96f1b0aa (patch)
tree65025f51d0a4b4eb381dfa4c0bea00c34ff19f51 /packages/backend/src
parentfix(frontend): mCaptchaを使用していてもbotプロテクションに関... (diff)
downloadsharkey-0aaf74ee22da1b8e4b690075c45c166d96f1b0aa.tar.gz
sharkey-0aaf74ee22da1b8e4b690075c45c166d96f1b0aa.tar.bz2
sharkey-0aaf74ee22da1b8e4b690075c45c166d96f1b0aa.zip
fix(backend): InstanceEntityService.packMany に me が渡っていないのを修正 (#14360)
* fix: pass current user into `InstanceEntityService.packMany` (cherry picked from commit 858ba188768017764c61c4a5591bdf2524a850e7) * Update Changelog * origin * Update Changelog --------- Co-authored-by: Hazel K <acomputerdog@gmail.com>
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/core/entities/InstanceEntityService.ts3
-rw-r--r--packages/backend/src/server/api/endpoints/federation/instances.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/federation/stats.ts4
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 4c45c13167..4956bc22ce 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 36f4bf5aa6..41954129e6 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -170,7 +170,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),
});
});