diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-02 18:40:53 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-02 18:40:53 +0000 |
| commit | d9c23e92fd937085ee422b8aaa861e7b36ce8692 (patch) | |
| tree | f57c4b814eab9382b58ca78099564df2742dfec0 /packages/backend/src/server/api | |
| parent | merge: rate limit all password checks - fixes #540 (!568) (diff) | |
| parent | fix: pass current user into `InstanceEntityService.packMany` (diff) | |
| download | sharkey-d9c23e92fd937085ee422b8aaa861e7b36ce8692.tar.gz sharkey-d9c23e92fd937085ee422b8aaa861e7b36ce8692.tar.bz2 sharkey-d9c23e92fd937085ee422b8aaa861e7b36ce8692.zip | |
merge: fix: pass current user into `InstanceEntityService.packMany` (!582)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/backend/src/server/api')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/federation/instances.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/federation/stats.ts | 4 |
2 files changed, 3 insertions, 3 deletions
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), }); }); |