Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: お知らせの未読通知が消えない不具合を修正

Browse source
This commit is contained in:
Nafu Satsuki 2023-10-28 22:34:13 +09:00 committed by riku6460
parent f85b80f376
commit 9fb3966b53
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/AnnouncementService.ts
View file

@ -51,7 +51,6 @@ export class AnnouncementService {
'read."announcementId" = announcement.id AND read."userId" = :userId', 'read."announcementId" = announcement.id AND read."userId" = :userId',
{ userId: user.id }, { userId: user.id },
); );
q.andWhere('read.id IS NULL');
q q
.where('announcement.isActive = true') .where('announcement.isActive = true')
@ -62,7 +61,8 @@ export class AnnouncementService {
.andWhere(new Brackets(qb => { .andWhere(new Brackets(qb => {
qb.orWhere('announcement.forExistingUsers = false'); qb.orWhere('announcement.forExistingUsers = false');
qb.orWhere('announcement.id > :userId', { userId: user.id }); qb.orWhere('announcement.id > :userId', { userId: user.id });
})); }))
.andWhere('read.id IS NULL');
q.orderBy({ q.orderBy({
'announcement."displayOrder"': 'DESC', 'announcement."displayOrder"': 'DESC',