Merge branch 'develop' into feature/misskey-2024.07

fixing conflicts in `package.json`
2024-08-06 10:35:14 +01:00 · 2024-08-06 10:35:14 +01:00 · 34c1e9ea2b
commit 34c1e9ea2b
parent f0dd0b8993 712af44de4
12 changed files with 49 additions and 21 deletions
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@ -64,8 +64,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)));
 	}
 }