Fix announcement filtering

DreamExposure · Mar 8, 2024 · dd3216f · dd3216f
1 parent 1ad42e3
commit dd3216f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/business/AnnouncementService.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/business/AnnouncementService.kt
@@ -83,10 +83,10 @@ class AnnouncementService(
         return announcements
     }
 
-    suspend fun getAllAnnouncements(guildId: Snowflake, type: Announcement.Type? = null, returnDisabled: Boolean? = true): List<Announcement> {
-        return getAllAnnouncements(guildId).filter {
-            type?.equals(it.type) ?: true
-        }.filter { returnDisabled?.equals(true) ?: it.enabled }
+    suspend fun getAllAnnouncements(guildId: Snowflake, type: Announcement.Type? = null, returnDisabled: Boolean = true): List<Announcement> {
+        return getAllAnnouncements(guildId)
+            .filter { if (type == null) true else it.type == type }
+            .filter { if (returnDisabled) true else it.enabled }
     }
 
     suspend fun getAnnouncement(guildId: Snowflake, id: String): Announcement? {