misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

simplify dialog announcement check

Browse source
This commit is contained in:
bunnybeam 2025-07-23 20:56:50 +01:00
parent 47f44a0d4c
commit e5aabb2978
No known key found for this signature in database
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,11 +70,11 @@ export class AnnouncementService {
public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
if (values.display === 'dialog') {
// Check how many active dialog queries already exist, to enforce a limit
const query = this.announcementsRepository.createQueryBuilder('announcement');
query.andWhere('announcement.isActive = true');
query.andWhere('announcement.display = \'dialog\'');
const count = await query.getCount();
if (count >= 5) {
const dialogCount = await this.announcementsRepository.createQueryBuilder('announcement')
.where({ isActive: true })
.where({ display: 'dialog' })
.getCount();
if (dialogCount >= 5) {
throw new IdentifiableError('c0d15f15-f18e-4a40-bcb1-f310d58204ee', 'Too many dialog announcements.');
}
}
@ -135,11 +135,11 @@ export class AnnouncementService {
// Check if this operation would produce an active dialog announcement
if ((values.display ?? announcement.display) === 'dialog' && (values.isActive ?? announcement.isActive)) {
// Check how many active dialog queries already exist, to enforce a limit
const query = this.announcementsRepository.createQueryBuilder('announcement');
query.andWhere('announcement.isActive = true');
query.andWhere('announcement.display = \'dialog\'');
const count = await query.getCount();
if (count >= 5) {
const dialogCount = await this.announcementsRepository.createQueryBuilder('announcement')
.where({ isActive: true })
.where({ display: 'dialog' })
.getCount();
if (dialogCount >= 5) {
throw new IdentifiableError('c0d15f15-f18e-4a40-bcb1-f310d58204ee', 'Too many dialog announcements.');
}
}