usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor: less sql calls

This commit is contained in:
taichanne30 2024-02-22 01:25:16 +09:00
parent e59be544e9
commit ed33ac7141
No known key found for this signature in database
GPG Key ID: 1D5EE39F870DC283
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/backend/src/core/entities/NotificationEntityService.ts
View File

@ -279,11 +279,13 @@ export class NotificationEntityService implements OnModuleInit {
notification: T, notification: T,
userIdsWhoMeMuting: Set<MiUser['id']>, userIdsWhoMeMuting: Set<MiUser['id']>,
userMutedInstances: Set<string>, userMutedInstances: Set<string>,
notifiers: MiUser[],
): Promise<boolean> { ): Promise<boolean> {
if (!('notifierId' in notification)) return true; if (!('notifierId' in notification)) return true;
if (userIdsWhoMeMuting.has(notification.notifierId)) return false; if (userIdsWhoMeMuting.has(notification.notifierId)) return false;
const notifier = await this.usersRepository.findOneBy({ id: notification.notifierId }); const notifier = notifiers.find(x => x.id === notification.notifierId) ?? null;
if (notifier === null) return false; if (notifier === null) return false;
if (notifier.host && userMutedInstances.has(notifier.host)) return false; if (notifier.host && userMutedInstances.has(notifier.host)) return false;
@ -307,7 +309,13 @@ export class NotificationEntityService implements OnModuleInit {
this.cacheService.userProfileCache.fetch(meId).then(p => new Set(p.mutedInstances)), this.cacheService.userProfileCache.fetch(meId).then(p => new Set(p.mutedInstances)),
]); ]);
return this.#validateNotifier(notification, userIdsWhoMeMuting, userMutedInstances); const notifiers = (await Promise.all([notification]
.map(x => 'notifierId' in x ? x.notifierId : null)
.filter(isNotNull)
.map(async id => await this.usersRepository.findOneBy({ id }))))
.filter(isNotNull);
return this.#validateNotifier(notification, userIdsWhoMeMuting, userMutedInstances, notifiers);
} }
/** /**
@ -325,8 +333,13 @@ export class NotificationEntityService implements OnModuleInit {
this.cacheService.userProfileCache.fetch(meId).then(p => new Set(p.mutedInstances)), this.cacheService.userProfileCache.fetch(meId).then(p => new Set(p.mutedInstances)),
]); ]);
const notifierIds = notifications.map(notification => 'notifierId' in notification ? notification.notifierId : null).filter(isNotNull);
const notifiers = notifierIds.length > 0 ? await this.usersRepository.find({
where: { id: In(notifierIds) },
}) : [];
const filteredNotifications = ((await Promise.all(notifications.map(async (notification) => { const filteredNotifications = ((await Promise.all(notifications.map(async (notification) => {
const isValid = await this.#validateNotifier(notification, userIdsWhoMeMuting, userMutedInstances); const isValid = await this.#validateNotifier(notification, userIdsWhoMeMuting, userMutedInstances, notifiers);
return isValid ? notification : null; return isValid ? notification : null;
}))) as [T|null] ).filter(isNotNull); }))) as [T|null] ).filter(isNotNull);