mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-27 22:39:33 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

凍結されたユーザーが含まれている場合一部の機能が誤動作する不具合を修正 (MisskeyIO#161)

Browse Source 
z-6561
This commit is contained in:
まっちゃとーにゅ 2023-09-03 23:20:18 +09:00 committed by GitHub
parent 58bbff3738
commit 545ab80363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/backend/src/core/entities/NoteReactionEntityService.ts
View File

@ -64,4 +64,17 @@ export class NoteReactionEntityService implements OnModuleInit {
} : {}),
};
}
@bindThis
public async packMany(
reactions: (MiNoteReaction['id'] | MiNoteReaction)[],
me: { id: MiUser['id'] } | null | undefined,
options?: {
withNote: boolean;
},
) : Promise<Packed<'NoteReaction'>[]> {
return (await Promise.allSettled(reactions.map(x => this.pack(x, me, options))))
.filter(result => result.status === 'fulfilled')
.map(result => (result as PromiseFulfilledResult<Packed<'NoteReaction'>>).value);
}
}

2
packages/backend/src/server/api/endpoints/drive/files/find.ts
View File

@ -55,7 +55,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
folderId: ps.folderId ?? IsNull(),
});
return await Promise.all(files.map(file => this.driveFileEntityService.pack(file, me, { self: true })));
return await this.driveFileEntityService.packMany(files, me, { self: true });
});
}
}

2
packages/backend/src/server/api/endpoints/notes/reactions.ts
View File

@ -83,7 +83,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
relations: ['user', 'note'],
});
return await Promise.all(reactions.map(reaction => this.noteReactionEntityService.pack(reaction, me)));
return await this.noteReactionEntityService.packMany(reactions, me);
});
}
}

2
packages/backend/src/server/api/endpoints/users/reactions.ts
View File

@ -81,7 +81,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
.limit(ps.limit)
.getMany();
return await Promise.all(reactions.map(reaction => this.noteReactionEntityService.pack(reaction, me, { withNote: true })));
return await this.noteReactionEntityService.packMany(reactions, me, { withNote: true });
});
}
}

7
packages/backend/src/server/api/endpoints/users/show.ts
View File

@ -113,12 +113,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
// リクエストされた通りに並べ替え
const _users: MiUser[] = [];
for (const id of ps.userIds) {
_users.push(users.find(x => x.id === id)!);
const user = users.find((u) => u.id === id);
if (user) _users.push(user);
}
return await Promise.all(_users.map(u => this.userEntityService.pack(u, me, {
return await this.userEntityService.packMany(_users, me, {
detail: true,
})));
});
} else {
// Lookup user
if (typeof ps.host === 'string' && typeof ps.username === 'string') {