summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/entities/NotificationEntityService.ts14
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index f74594ff0c..e723ea5a55 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -198,12 +198,14 @@ export class NotificationEntityService implements OnModuleInit {
});
} else if (notification.type === 'renote:grouped') {
const users = await Promise.all(notification.userIds.map(userId => {
- const user = hint?.packedUsers != null
- ? hint.packedUsers.get(userId)
- : this.userEntityService.pack(userId!, { id: meId }, {
- detail: false,
- });
- return user;
+ const packedUser = hint?.packedUsers != null ? hint.packedUsers.get(userId) : null;
+ if (packedUser) {
+ return packedUser;
+ }
+
+ return this.userEntityService.pack(userId, { id: meId }, {
+ detail: false,
+ });
}));
return await awaitAll({
id: notification.id,