diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-11-05 09:04:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-11-05 09:04:38 +0900 |
| commit | c2ddb649f841c48bca91db3fdee1e95f79e8bdf4 (patch) | |
| tree | 0be1e5dd36329063e6df9db964d099fa31288582 /packages/backend/src/core/AnnouncementService.ts | |
| parent | fix(backend): アーカイブしたお知らせがコントロールパネル... (diff) | |
| download | sharkey-c2ddb649f841c48bca91db3fdee1e95f79e8bdf4.tar.gz sharkey-c2ddb649f841c48bca91db3fdee1e95f79e8bdf4.tar.bz2 sharkey-c2ddb649f841c48bca91db3fdee1e95f79e8bdf4.zip | |
enhance: 非通知なお知らせを作成できるように
Diffstat (limited to 'packages/backend/src/core/AnnouncementService.ts')
| -rw-r--r-- | packages/backend/src/core/AnnouncementService.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index ec1a082d78..8c348e595d 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -47,6 +47,7 @@ export class AnnouncementService { const q = this.announcementsRepository.createQueryBuilder('announcement') .where('announcement.isActive = true') + .andWhere('announcement.silence = false') .andWhere(new Brackets(qb => { qb.orWhere('announcement.userId = :userId', { userId: user.id }); qb.orWhere('announcement.userId IS NULL'); @@ -73,6 +74,7 @@ export class AnnouncementService { icon: values.icon, display: values.display, forExistingUsers: values.forExistingUsers, + silence: values.silence, needConfirmationToRead: values.needConfirmationToRead, userId: values.userId, }).then(x => this.announcementsRepository.findOneByOrFail(x.identifiers[0])); @@ -124,6 +126,7 @@ export class AnnouncementService { display: values.display, icon: values.icon, forExistingUsers: values.forExistingUsers, + silence: values.silence, needConfirmationToRead: values.needConfirmationToRead, isActive: values.isActive, }); @@ -210,6 +213,7 @@ export class AnnouncementService { icon: announcement.icon, display: announcement.display, needConfirmationToRead: announcement.needConfirmationToRead, + silence: announcement.silence, forYou: announcement.userId === me?.id, isRead: reads.some(read => read.announcementId === announcement.id), })); |