chore: Release v1.6.0-dev.2 [skip ci]

# [1.6.0-dev.2](https://github.com/ReVanced/revanced-api/compare/v1.6.0-dev.1...v1.6.0-dev.2) (2024-12-20)

### Features

* Make some announcements schema fields nullable ([db22874](db22874f06))

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.6.0-dev.2](https://github.com/ReVanced/revanced-api/compare/v1.6.0-dev.1...v1.6.0-dev.2) (2024-12-20)
+
+
+### Features
+
+* Make some announcements schema fields nullable ([db22874](https://github.com/ReVanced/revanced-api/commit/db22874f063bae0c9e7f0c99a20cdf1b16addd89))
+
 # [1.6.0-dev.1](https://github.com/ReVanced/revanced-api/compare/v1.5.0...v1.6.0-dev.1) (2024-11-23)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.6.0-dev.1
+version = 1.6.0-dev.2

src/main/kotlin/app/revanced/api/configuration/APISchema.kt

@@ -63,9 +63,9 @@ class ApiAnnouncement(
     val title: String,
     val content: String? = null,
     // Using a list instead of a set because set semantics are unnecessary here.
-    val attachments: List<String> = emptyList(),
+    val attachments: List<String>? = null,
     // Using a list instead of a set because set semantics are unnecessary here.
-    val tags: List<String> = emptyList(),
+    val tags: List<String>? = null,
     val createdAt: LocalDateTime = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()),
     val archivedAt: LocalDateTime? = null,
     val level: Int = 0,
@@ -78,9 +78,9 @@ class ApiResponseAnnouncement(
     val title: String,
     val content: String? = null,
     // Using a list instead of a set because set semantics are unnecessary here.
-    val attachments: List<String> = emptyList(),
+    val attachments: List<String>? = null,
     // Using a list instead of a set because set semantics are unnecessary here.
-    val tags: List<String> = emptyList(),
+    val tags: List<String>? = null,
     val createdAt: LocalDateTime,
     val archivedAt: LocalDateTime? = null,
     val level: Int = 0,

src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt

@@ -69,8 +69,7 @@ internal class AnnouncementRepository(private val database: Database) {
 
     fun latestId() = latestAnnouncement?.id?.value.toApiResponseAnnouncementId()
 
-    fun latestId(tags: Set<String>) =
+    fun latestId(tags: Set<String>) = tags.map { tag -> latestAnnouncementByTag[tag]?.id?.value }.toApiResponseAnnouncementId()
-        tags.map { tag -> latestAnnouncementByTag[tag]?.id?.value }.toApiResponseAnnouncementId()
 
     suspend fun paged(cursor: Int, count: Int, tags: Set<String>?) = transaction {
         Announcement.find {
@@ -103,11 +102,13 @@ internal class AnnouncementRepository(private val database: Database) {
             createdAt = new.createdAt
             archivedAt = new.archivedAt
             level = new.level
+            if (new.tags != null) {
                 tags = SizedCollection(
                     new.tags.map { tag -> Tag.find { Tags.name eq tag }.firstOrNull() ?: Tag.new { name = tag } },
                 )
+            }
         }.apply {
-            new.attachments.map { attachmentUrl ->
+            new.attachments?.map { attachmentUrl ->
                 Attachment.new {
                     url = attachmentUrl
                     announcement = this@apply
@@ -125,6 +126,7 @@ internal class AnnouncementRepository(private val database: Database) {
             it.archivedAt = new.archivedAt
             it.level = new.level
 
+            if (new.tags != null) {
                 // Get the old tags, create new tags if they don't exist,
                 // and delete tags that are not in the new tags, after updating the announcement.
                 val oldTags = it.tags.toList()
@@ -136,8 +138,10 @@ internal class AnnouncementRepository(private val database: Database) {
                     if (tag in updatedTags || !tag.announcements.empty()) return@forEach
                     tag.delete()
                 }
+            }
 
             // Delete old attachments and create new attachments.
+            if (new.attachments != null) {
                 it.attachments.forEach { attachment -> attachment.delete() }
                 new.attachments.map { attachment ->
                     Attachment.new {
@@ -145,6 +149,7 @@ internal class AnnouncementRepository(private val database: Database) {
                         announcement = it
                     }
                 }
+            }
         }?.let(::updateLatestAnnouncement) ?: Unit
     }
 
@@ -175,8 +180,7 @@ internal class AnnouncementRepository(private val database: Database) {
         Tag.all().toList().toApiTag()
     }
 
-    private suspend fun <T> transaction(statement: suspend Transaction.() -> T) =
+    private suspend fun <T> transaction(statement: suspend Transaction.() -> T) = newSuspendedTransaction(Dispatchers.IO, database, statement = statement)
-        newSuspendedTransaction(Dispatchers.IO, database, statement = statement)
 
     private object Announcements : IntIdTable() {
         val author = varchar("author", 32).nullable()

src/test/kotlin/app/revanced/api/configuration/services/AnnouncementServiceTest.kt

@@ -135,7 +135,7 @@ private object AnnouncementServiceTest {
         val latestAnnouncement = announcementService.latest()!!
         val latestId = latestAnnouncement.id
 
-        val attachments = latestAnnouncement.attachments
+        val attachments = latestAnnouncement.attachments!!
         assertEquals(2, attachments.size)
         assert(attachments.any { it == "attachment1" })
         assert(attachments.any { it == "attachment2" })
@@ -144,7 +144,7 @@ private object AnnouncementServiceTest {
             latestId,
             ApiAnnouncement(title = "title", attachments = listOf("attachment1", "attachment3")),
         )
-        assert(announcementService.get(latestId)!!.attachments.any { it == "attachment3" })
+        assert(announcementService.get(latestId)!!.attachments!!.any { it == "attachment3" })
     }
 
     @Test