amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: fix: pass current user into InstanceEntityService.packMany (!582)

Browse Source 
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>
This commit is contained in:
dakkar 2024-08-02 18:40:53 +00:00
commit d9c23e92fd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/backend/src/core/entities/InstanceEntityService.ts
View File

@ -63,8 +63,9 @@ export class InstanceEntityService {
@bindThis @bindThis
public packMany( public packMany(
instances: MiInstance[], 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)));
} }
} }

2
packages/backend/src/server/api/endpoints/federation/instances.ts
View File

@ -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(); const instances = await query.limit(ps.limit).offset(ps.offset).getMany();
return await this.instanceEntityService.packMany(instances); return await this.instanceEntityService.packMany(instances, me);
}); });
} }
} }

4
packages/backend/src/server/api/endpoints/federation/stats.ts
View File

@ -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); const gotPubCount = topPubInstances.map(x => x.followingCount).reduce((a, b) => a + b, 0);
return await awaitAll({ return await awaitAll({
topSubInstances: this.instanceEntityService.packMany(topSubInstances), topSubInstances: this.instanceEntityService.packMany(topSubInstances, me),
otherFollowersCount: Math.max(0, allSubCount - gotSubCount), otherFollowersCount: Math.max(0, allSubCount - gotSubCount),
topPubInstances: this.instanceEntityService.packMany(topPubInstances), topPubInstances: this.instanceEntityService.packMany(topPubInstances, me),
otherFollowingCount: Math.max(0, allPubCount - gotPubCount), otherFollowingCount: Math.max(0, allPubCount - gotPubCount),
}); });
}); });