kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

Merge remote-tracking branch 'misskey/develop' into future-2024-03-14

Browse Source
This commit is contained in:
dakkar
2024-03-14 16:28:56 +00:00
parent 760df9ebf0 71d0538647
commit 9478fc0095
57 changed files with 1082 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/src/server/api/endpoints/users/relation.ts
+3 -5
View File
@@ -132,11 +132,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private userEntityService: UserEntityService,
) {
super(meta, paramDef, async (ps, me) => {
const ids = Array.isArray(ps.userId) ? ps.userId : [ps.userId];
const relations = await Promise.all(ids.map(id => this.userEntityService.getRelation(me.id, id)));
return Array.isArray(ps.userId) ? relations : relations[0];
return Array.isArray(ps.userId)
? await this.userEntityService.getRelations(me.id, ps.userId).then(it => [...it.values()])
: await this.userEntityService.getRelation(me.id, ps.userId).then(it => [it]);
});
}
}