chore: Release v1.4.0 [skip ci]

# [1.4.0](https://github.com/ReVanced/revanced-api/compare/v1.3.0...v1.4.0) (2024-11-06)

### Bug Fixes

* Add missing logging level environment variable to .env.example ([3b62120](3b6212065a))
* Use new patches file extension ([d42a3a3](d42a3a3933))

### Features

* Add URL and use friendly name for `APIContributable` ([a5498ab](a5498aba2b))
* Allow versioning by arbitrary path string ([814d3c9](814d3c946e))
* Improve announcements API ([#192](https://github.com/ReVanced/revanced-api/issues/192)) ([56a00dd](56a00ddb85))
* Make backend configurable ([f91f3a6](f91f3a65c5))
* Remove "archived" query parameter ([8ad614e](8ad614ef4f))
* Remove deprecated routes and old API ([eca40a6](eca40a6979))
* Remove ReVanced Integrations ([f1c1092](f1c10928ae))
* Use tag name directly instead of ID ([fc40427](fc40427fba))

CHANGELOG.md

@@ -1,3 +1,48 @@
+# [1.4.0](https://github.com/ReVanced/revanced-api/compare/v1.3.0...v1.4.0) (2024-11-06)
+
+
+### Bug Fixes
+
+* Add missing logging level environment variable to .env.example ([3b62120](https://github.com/ReVanced/revanced-api/commit/3b6212065a5cfb95c303b6d0551747ba1eb317f6))
+* Use new patches file extension ([d42a3a3](https://github.com/ReVanced/revanced-api/commit/d42a3a393396a0f4e9085cda46e0af2c12b63cb1))
+
+
+### Features
+
+* Add URL and use friendly name for `APIContributable` ([a5498ab](https://github.com/ReVanced/revanced-api/commit/a5498aba2b99db89c28a65738cc58cc4c852c327))
+* Allow versioning by arbitrary path string ([814d3c9](https://github.com/ReVanced/revanced-api/commit/814d3c946e31068e12e3886aa8beb3238ef126ae))
+* Improve announcements API ([#192](https://github.com/ReVanced/revanced-api/issues/192)) ([56a00dd](https://github.com/ReVanced/revanced-api/commit/56a00ddb85f302d441f0b222a9902ea2c1c18897))
+* Make backend configurable ([f91f3a6](https://github.com/ReVanced/revanced-api/commit/f91f3a65c5e07b5b58ccbff1d4b0a5ba9b15fc50))
+* Remove "archived" query parameter ([8ad614e](https://github.com/ReVanced/revanced-api/commit/8ad614ef4fdaf45af87a3316ef4db7e7236fd64a))
+* Remove deprecated routes and old API ([eca40a6](https://github.com/ReVanced/revanced-api/commit/eca40a69799240f7803aa8851eb3ee961937e4d6))
+* Remove ReVanced Integrations ([f1c1092](https://github.com/ReVanced/revanced-api/commit/f1c10928ae3be1c6b1d675819755b3046fad70d8))
+* Use tag name directly instead of ID ([fc40427](https://github.com/ReVanced/revanced-api/commit/fc40427fbaafb523045eb6f5285d90949b206b8b))
+
+# [1.4.0-dev.6](https://github.com/ReVanced/revanced-api/compare/v1.4.0-dev.5...v1.4.0-dev.6) (2024-11-06)
+
+
+### Features
+
+* Allow versioning by arbitrary path string ([814d3c9](https://github.com/ReVanced/revanced-api/commit/814d3c946e31068e12e3886aa8beb3238ef126ae))
+* Remove deprecated routes and old API ([eca40a6](https://github.com/ReVanced/revanced-api/commit/eca40a69799240f7803aa8851eb3ee961937e4d6))
+
+# [1.4.0-dev.5](https://github.com/ReVanced/revanced-api/compare/v1.4.0-dev.4...v1.4.0-dev.5) (2024-11-05)
+
+# [1.4.0-dev.4](https://github.com/ReVanced/revanced-api/compare/v1.4.0-dev.3...v1.4.0-dev.4) (2024-11-01)
+
+
+### Features
+
+* Remove "archived" query parameter ([8ad614e](https://github.com/ReVanced/revanced-api/commit/8ad614ef4fdaf45af87a3316ef4db7e7236fd64a))
+* Use tag name directly instead of ID ([fc40427](https://github.com/ReVanced/revanced-api/commit/fc40427fbaafb523045eb6f5285d90949b206b8b))
+
+# [1.4.0-dev.3](https://github.com/ReVanced/revanced-api/compare/v1.4.0-dev.2...v1.4.0-dev.3) (2024-11-01)
+
+
+### Bug Fixes
+
+* Use new patches file extension ([d42a3a3](https://github.com/ReVanced/revanced-api/commit/d42a3a393396a0f4e9085cda46e0af2c12b63cb1))
+
 # [1.4.0-dev.2](https://github.com/ReVanced/revanced-api/compare/v1.4.0-dev.1...v1.4.0-dev.2) (2024-11-01)
 
 

README.md

@@ -81,7 +81,6 @@ Some of the features ReVanced API include:
   and links of the hoster of ReVanced API
 - 🧩 **Patches**: Get the latest updates of ReVanced Patches, directly from ReVanced API
 - 👥 **Contributors**: List all contributors involved in the project
-- 🔄 **Backwards compatibility**: Proxy an old API for migration purposes and backwards compatibility
 
 ## 🚀 How to get started
 

configuration.example.toml

@@ -1,10 +1,9 @@
-api-version = 1
+api-version = "v1"
 cors-allowed-hosts = [
     "revanced.app",
     "*.revanced.app"
 ]
 endpoint = "https://api.revanced.app"
-old-api-endpoint = "https://old-api.revanced.app"
 static-files-path = "static/root"
 versioned-static-files-path = "static/versioned"
 backend-service-name = "GitHub"
@@ -13,7 +12,7 @@ organization = "revanced"
 
 [patches]
 repository = "revanced-patches"
-asset-regex = "jar$"
+asset-regex = "rvp$"
 signature-asset-regex = "asc$"
 public-key-file = "static/root/keys.asc"
 public-key-id = 3897925568445097277

gradle.properties

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

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kompendium-core = "3.14.4"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 logback = "1.5.6"
 exposed = "0.52.0"
 h2 = "2.2.224"
@@ -10,8 +10,8 @@ ktor = "2.3.7"
 ktoml = "0.5.2"
 picocli = "4.7.6"
 datetime = "0.6.0"
-revanced-patcher = "20.0.0"
-revanced-library = "3.0.1-dev.1"
+revanced-patcher = "21.0.0"
+revanced-library = "3.0.2"
 caffeine = "3.1.8"
 bouncy-castle = "1.78.1"
 

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

@@ -1,4 +1,4 @@
-package app.revanced.api.configuration.schema
+package app.revanced.api.configuration
 
 import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
@@ -76,7 +76,7 @@ class ApiResponseAnnouncement(
     // Using a list instead of a set because set semantics are unnecessary here.
     val attachments: List<String> = emptyList(),
     // Using a list instead of a set because set semantics are unnecessary here.
-    val tags: List<Int> = emptyList(),
+    val tags: List<String> = emptyList(),
     val createdAt: LocalDateTime,
     val archivedAt: LocalDateTime? = null,
     val level: Int = 0,
@@ -94,7 +94,6 @@ class ApiAnnouncementArchivedAt(
 
 @Serializable
 class ApiAnnouncementTag(
-    val id: Int,
     val name: String,
 )
 

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

@@ -51,7 +51,6 @@ fun Application.configureDependencies(
 
             AuthenticationService(issuer, validityInMin, jwtSecret, authSHA256DigestString)
         }
-        singleOf(::OldApiService)
         singleOf(::AnnouncementService)
         singleOf(::SignatureService)
         singleOf(::PatchesService)

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

@@ -4,7 +4,6 @@ import app.revanced.api.configuration.repository.ConfigurationRepository
 import app.revanced.api.configuration.routes.*
 import app.revanced.api.configuration.routes.announcementsRoute
 import app.revanced.api.configuration.routes.apiRoute
-import app.revanced.api.configuration.routes.oldApiRoute
 import app.revanced.api.configuration.routes.patchesRoute
 import io.bkbn.kompendium.core.routes.redoc
 import io.bkbn.kompendium.core.routes.swagger
@@ -19,7 +18,7 @@ internal fun Application.configureRouting() = routing {
 
     installCache(5.minutes)
 
-    route("/v${configuration.apiVersion}") {
+    route("/${configuration.apiVersion}") {
         announcementsRoute()
         patchesRoute()
         managerRoute()
@@ -55,7 +54,4 @@ internal fun Application.configureRouting() = routing {
 
     swagger(pageTitle = "ReVanced API", path = "/")
     redoc(pageTitle = "ReVanced API", path = "/redoc")
-
-    // TODO: Remove, once migration period from v2 API is over (In 1-2 years).
-    oldApiRoute()
 }

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

@@ -1,12 +1,11 @@
 package app.revanced.api.configuration.repository
 
-import app.revanced.api.configuration.schema.ApiAnnouncement
-import app.revanced.api.configuration.schema.ApiAnnouncementTag
-import app.revanced.api.configuration.schema.ApiResponseAnnouncement
-import app.revanced.api.configuration.schema.ApiResponseAnnouncementId
+import app.revanced.api.configuration.ApiAnnouncement
+import app.revanced.api.configuration.ApiAnnouncementTag
+import app.revanced.api.configuration.ApiResponseAnnouncement
+import app.revanced.api.configuration.ApiResponseAnnouncementId
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
-import kotlinx.datetime.*
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
@@ -15,12 +14,11 @@ import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.kotlin.datetime.CurrentDateTime
 import org.jetbrains.exposed.sql.kotlin.datetime.datetime
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
-import java.time.LocalDateTime
 
 internal class AnnouncementRepository(private val database: Database) {
     // This is better than doing a maxByOrNull { it.id } on every request.
     private var latestAnnouncement: Announcement? = null
-    private val latestAnnouncementByTag = mutableMapOf<Int, Announcement>()
+    private val latestAnnouncementByTag = mutableMapOf<String, Announcement>()
 
     init {
         runBlocking {
@@ -40,22 +38,23 @@ internal class AnnouncementRepository(private val database: Database) {
     private fun initializeLatestAnnouncements() {
         latestAnnouncement = Announcement.all().orderBy(Announcements.id to SortOrder.DESC).firstOrNull()
 
-        Tag.all().map { it.id.value }.forEach(::updateLatestAnnouncementForTag)
+        Tag.all().map { it.name }.forEach(::updateLatestAnnouncementForTag)
     }
 
     private fun updateLatestAnnouncement(new: Announcement) {
         if (latestAnnouncement == null || latestAnnouncement!!.id.value <= new.id.value) {
             latestAnnouncement = new
-            new.tags.forEach { tag -> latestAnnouncementByTag[tag.id.value] = new }
+            new.tags.forEach { tag -> latestAnnouncementByTag[tag.name] = new }
         }
     }
 
-    private fun updateLatestAnnouncementForTag(tag: Int) {
-        val latestAnnouncementForTag = AnnouncementTags.select(AnnouncementTags.announcement)
-            .where { AnnouncementTags.tag eq tag }
-            .map { it[AnnouncementTags.announcement] }
-            .mapNotNull { Announcement.findById(it) }
-            .maxByOrNull { it.id }
+    private fun updateLatestAnnouncementForTag(tag: String) {
+        val latestAnnouncementForTag = Tags.innerJoin(AnnouncementTags)
+            .select(AnnouncementTags.announcement)
+            .where { Tags.name eq tag }
+            .orderBy(AnnouncementTags.announcement to SortOrder.DESC)
+            .limit(1)
+            .firstNotNullOfOrNull { Announcement.findById(it[AnnouncementTags.announcement]) }
 
         latestAnnouncementForTag?.let { latestAnnouncementByTag[tag] = it }
     }
@@ -64,42 +63,30 @@ internal class AnnouncementRepository(private val database: Database) {
         latestAnnouncement.toApiResponseAnnouncement()
     }
 
-    suspend fun latest(tags: Set<Int>) = transaction {
+    suspend fun latest(tags: Set<String>) = transaction {
         tags.mapNotNull { tag -> latestAnnouncementByTag[tag] }.toApiAnnouncement()
     }
 
     fun latestId() = latestAnnouncement?.id?.value.toApiResponseAnnouncementId()
 
-    fun latestId(tags: Set<Int>) =
+    fun latestId(tags: Set<String>) =
         tags.map { tag -> latestAnnouncementByTag[tag]?.id?.value }.toApiResponseAnnouncementId()
 
-    suspend fun paged(cursor: Int, count: Int, tags: Set<Int>?, archived: Boolean) = transaction {
+    suspend fun paged(cursor: Int, count: Int, tags: Set<String>?) = transaction {
         Announcement.find {
             fun idLessEq() = Announcements.id lessEq cursor
-            fun archivedAtIsNull() = Announcements.archivedAt.isNull()
-            fun archivedAtGreaterNow() = Announcements.archivedAt greater LocalDateTime.now().toKotlinLocalDateTime()
 
             if (tags == null) {
-                if (archived) {
-                    idLessEq()
-                } else {
-                    idLessEq() and (archivedAtIsNull() or archivedAtGreaterNow())
-                }
+                idLessEq()
             } else {
-                fun archivedAtGreaterOrNullOrTrue() = if (archived) {
-                    Op.TRUE
-                } else {
-                    archivedAtIsNull() or archivedAtGreaterNow()
-                }
-
-                fun hasTags() = tags.mapNotNull { Tag.findById(it)?.id }.let { tags ->
-                    Announcements.id inSubQuery Announcements.leftJoin(AnnouncementTags)
+                fun hasTags() = Announcements.id inSubQuery (
+                    AnnouncementTags.innerJoin(Tags)
                         .select(AnnouncementTags.announcement)
-                        .where { AnnouncementTags.tag inList tags }
                         .withDistinct()
-                }
+                        .where { Tags.name inList tags }
+                    )
 
-                idLessEq() and archivedAtGreaterOrNullOrTrue() and hasTags()
+                idLessEq() and hasTags()
             }
         }.orderBy(Announcements.id to SortOrder.DESC).limit(count).toApiAnnouncement()
     }
@@ -165,7 +152,7 @@ internal class AnnouncementRepository(private val database: Database) {
         // Delete the tag if no other announcements are referencing it.
         // One count means that the announcement is the only one referencing the tag.
         announcement.tags.filter { tag -> tag.announcements.count() == 1L }.forEach { tag ->
-            latestAnnouncementByTag -= tag.id.value
+            latestAnnouncementByTag -= tag.name
             tag.delete()
         }
 
@@ -250,7 +237,7 @@ internal class AnnouncementRepository(private val database: Database) {
             title,
             content,
             attachments.map { it.url },
-            tags.map { it.id.value },
+            tags.map { it.name },
             createdAt,
             archivedAt,
             level,
@@ -259,7 +246,7 @@ internal class AnnouncementRepository(private val database: Database) {
 
     private fun Iterable<Announcement>.toApiAnnouncement() = map { it.toApiResponseAnnouncement()!! }
 
-    private fun Iterable<Tag>.toApiTag() = map { ApiAnnouncementTag(it.id.value, it.name) }
+    private fun Iterable<Tag>.toApiTag() = map { ApiAnnouncementTag(it.name) }
 
     private fun Int?.toApiResponseAnnouncementId() = this?.let { ApiResponseAnnouncementId(this) }
 

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

@@ -1,6 +1,6 @@
 package app.revanced.api.configuration.repository
 
-import app.revanced.api.configuration.schema.APIAbout
+import app.revanced.api.configuration.APIAbout
 import app.revanced.api.configuration.services.ManagerService
 import app.revanced.api.configuration.services.PatchesService
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -30,7 +30,6 @@ import kotlin.io.path.createDirectories
  * @property apiVersion The version to use for the API.
  * @property corsAllowedHosts The hosts allowed to make requests to the API.
  * @property endpoint The endpoint of the API.
- * @property oldApiEndpoint The endpoint of the old API to proxy requests to.
  * @property staticFilesPath The path to the static files to be served under the root path.
  * @property versionedStaticFilesPath The path to the static files to be served under a versioned path.
  * @property about The path to the json file deserialized to [APIAbout]
@@ -46,12 +45,10 @@ internal class ConfigurationRepository(
     @SerialName("backend-service-name")
     val backendServiceName: String,
     @SerialName("api-version")
-    val apiVersion: Int = 1,
+    val apiVersion: String = "v1",
     @SerialName("cors-allowed-hosts")
     val corsAllowedHosts: Set<String>,
     val endpoint: String,
-    @SerialName("old-api-endpoint")
-    val oldApiEndpoint: String,
     @Serializable(with = PathSerializer::class)
     @SerialName("static-files-path")
     val staticFilesPath: Path,

src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt

@@ -1,14 +1,17 @@
 package app.revanced.api.configuration.routes
 
+import app.revanced.api.configuration.ApiAnnouncement
+import app.revanced.api.configuration.ApiResponseAnnouncement
+import app.revanced.api.configuration.ApiResponseAnnouncementId
 import app.revanced.api.configuration.canRespondUnauthorized
 import app.revanced.api.configuration.installCache
 import app.revanced.api.configuration.installNotarizedRoute
 import app.revanced.api.configuration.respondOrNotFound
-import app.revanced.api.configuration.schema.ApiAnnouncement
-import app.revanced.api.configuration.schema.ApiResponseAnnouncement
-import app.revanced.api.configuration.schema.ApiResponseAnnouncementId
 import app.revanced.api.configuration.services.AnnouncementService
-import io.bkbn.kompendium.core.metadata.*
+import io.bkbn.kompendium.core.metadata.DeleteInfo
+import io.bkbn.kompendium.core.metadata.GetInfo
+import io.bkbn.kompendium.core.metadata.PatchInfo
+import io.bkbn.kompendium.core.metadata.PostInfo
 import io.bkbn.kompendium.json.schema.definition.TypeDefinition
 import io.bkbn.kompendium.oas.payload.Parameter
 import io.ktor.http.*
@@ -33,9 +36,8 @@ internal fun Route.announcementsRoute() = route("announcements") {
             val cursor = call.parameters["cursor"]?.toInt() ?: Int.MAX_VALUE
             val count = call.parameters["count"]?.toInt() ?: 16
             val tags = call.parameters.getAll("tag")
-            val archived = call.parameters["archived"]?.toBoolean() ?: true
 
-            call.respond(announcementService.paged(cursor, count, tags?.map { it.toInt() }?.toSet(), archived))
+            call.respond(announcementService.paged(cursor, count, tags?.toSet()))
         }
     }
 
@@ -55,7 +57,7 @@ internal fun Route.announcementsRoute() = route("announcements") {
                 val tags = call.parameters.getAll("tag")
 
                 if (tags?.isNotEmpty() == true) {
-                    call.respond(announcementService.latest(tags.map { it.toInt() }.toSet()))
+                    call.respond(announcementService.latest(tags.toSet()))
                 } else {
                     call.respondOrNotFound(announcementService.latest())
                 }
@@ -68,7 +70,7 @@ internal fun Route.announcementsRoute() = route("announcements") {
                     val tags = call.parameters.getAll("tag")
 
                     if (tags?.isNotEmpty() == true) {
-                        call.respond(announcementService.latestId(tags.map { it.toInt() }.toSet()))
+                        call.respond(announcementService.latestId(tags.toSet()))
                     } else {
                         call.respondOrNotFound(announcementService.latestId())
                     }
@@ -146,15 +148,8 @@ private fun Route.installAnnouncementsRouteDocumentation() = installNotarizedRou
             Parameter(
                 name = "tag",
                 `in` = Parameter.Location.query,
-                schema = TypeDefinition.INT,
-                description = "The tag IDs to filter the announcements by. Default is all tags",
-                required = false,
-            ),
-            Parameter(
-                name = "archived",
-                `in` = Parameter.Location.query,
-                schema = TypeDefinition.BOOLEAN,
-                description = "Whether to include archived announcements. Default is true",
+                schema = TypeDefinition.STRING,
+                description = "The tags to filter the announcements by. Default is all tags",
                 required = false,
             ),
         )
@@ -193,8 +188,8 @@ private fun Route.installAnnouncementsLatestRouteDocumentation() = installNotari
             Parameter(
                 name = "tag",
                 `in` = Parameter.Location.query,
-                schema = TypeDefinition.INT,
-                description = "The tag IDs to filter the latest announcements by",
+                schema = TypeDefinition.STRING,
+                description = "The tags to filter the latest announcements by",
                 required = false,
             ),
         )
@@ -228,8 +223,8 @@ private fun Route.installAnnouncementsLatestIdRouteDocumentation() = installNota
             Parameter(
                 name = "tag",
                 `in` = Parameter.Location.query,
-                schema = TypeDefinition.INT,
-                description = "The tag IDs to filter the latest announcements by",
+                schema = TypeDefinition.STRING,
+                description = "The tags to filter the latest announcements by",
                 required = false,
             ),
         )

src/main/kotlin/app/revanced/api/configuration/routes/ApiRoute.kt

@@ -6,7 +6,6 @@ import app.revanced.api.configuration.installNoCache
 import app.revanced.api.configuration.installNotarizedRoute
 import app.revanced.api.configuration.repository.ConfigurationRepository
 import app.revanced.api.configuration.respondOrNotFound
-import app.revanced.api.configuration.schema.*
 import app.revanced.api.configuration.services.ApiService
 import app.revanced.api.configuration.services.AuthenticationService
 import io.bkbn.kompendium.core.metadata.*
@@ -184,7 +183,7 @@ private fun Route.installTokenRouteDocumentation() = installNotarizedRoute {
                             "username=\"ReVanced\", " +
                             "realm=\"ReVanced\", " +
                             "nonce=\"abc123\", " +
-                            "uri=\"/v${configuration.apiVersion}/token\", " +
+                            "uri=\"/${configuration.apiVersion}/token\", " +
                             "algorithm=SHA-256, " +
                             "response=\"yxz456\"",
                     ),

src/main/kotlin/app/revanced/api/configuration/routes/ManagerRoute.kt

@@ -1,8 +1,8 @@
 package app.revanced.api.configuration.routes
 
+import app.revanced.api.configuration.ApiRelease
+import app.revanced.api.configuration.ApiReleaseVersion
 import app.revanced.api.configuration.installNotarizedRoute
-import app.revanced.api.configuration.schema.ApiRelease
-import app.revanced.api.configuration.schema.ApiReleaseVersion
 import app.revanced.api.configuration.services.ManagerService
 import io.bkbn.kompendium.core.metadata.GetInfo
 import io.ktor.http.*
@@ -13,18 +13,9 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.get as koinGet
 
 internal fun Route.managerRoute() = route("manager") {
-    configure()
-
-    // TODO: Remove this deprecated route eventually.
-    route("latest") {
-        configure(deprecated = true)
-    }
-}
-
-private fun Route.configure(deprecated: Boolean = false) {
     val managerService = koinGet<ManagerService>()
 
-    installManagerRouteDocumentation(deprecated)
+    installManagerRouteDocumentation()
 
     rateLimit(RateLimitName("weak")) {
         get {
@@ -32,7 +23,7 @@ private fun Route.configure(deprecated: Boolean = false) {
         }
 
         route("version") {
-            installManagerVersionRouteDocumentation(deprecated)
+            installManagerVersionRouteDocumentation()
 
             get {
                 call.respond(managerService.latestVersion())
@@ -41,11 +32,10 @@ private fun Route.configure(deprecated: Boolean = false) {
     }
 }
 
-private fun Route.installManagerRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installManagerRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Manager")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the current manager release")
         summary("Get current manager release")
         response {
@@ -57,11 +47,10 @@ private fun Route.installManagerRouteDocumentation(deprecated: Boolean) = instal
     }
 }
 
-private fun Route.installManagerVersionRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installManagerVersionRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Manager")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the current manager release version")
         summary("Get current manager release version")
         response {

src/main/kotlin/app/revanced/api/configuration/routes/OldApi.kt

@@ -1,19 +0,0 @@
-package app.revanced.api.configuration.routes
-
-import app.revanced.api.configuration.services.OldApiService
-import io.ktor.server.application.*
-import io.ktor.server.plugins.ratelimit.*
-import io.ktor.server.routing.*
-import org.koin.ktor.ext.get
-
-internal fun Route.oldApiRoute() {
-    val oldApiService = get<OldApiService>()
-
-    rateLimit(RateLimitName("weak")) {
-        route(Regex("/(v2|tools|contributors).*")) {
-            handle {
-                oldApiService.proxy(call)
-            }
-        }
-    }
-}

src/main/kotlin/app/revanced/api/configuration/routes/PatchesRoute.kt

@@ -1,10 +1,10 @@
 package app.revanced.api.configuration.routes
 
+import app.revanced.api.configuration.ApiAssetPublicKey
+import app.revanced.api.configuration.ApiRelease
+import app.revanced.api.configuration.ApiReleaseVersion
 import app.revanced.api.configuration.installCache
 import app.revanced.api.configuration.installNotarizedRoute
-import app.revanced.api.configuration.schema.ApiAssetPublicKey
-import app.revanced.api.configuration.schema.ApiRelease
-import app.revanced.api.configuration.schema.ApiReleaseVersion
 import app.revanced.api.configuration.services.PatchesService
 import io.bkbn.kompendium.core.metadata.GetInfo
 import io.ktor.http.*
@@ -16,18 +16,9 @@ import kotlin.time.Duration.Companion.days
 import org.koin.ktor.ext.get as koinGet
 
 internal fun Route.patchesRoute() = route("patches") {
-    configure()
-
-    // TODO: Remove this deprecated route eventually.
-    route("latest") {
-        configure(deprecated = true)
-    }
-}
-
-private fun Route.configure(deprecated: Boolean = false) {
     val patchesService = koinGet<PatchesService>()
 
-    installPatchesRouteDocumentation(deprecated)
+    installPatchesRouteDocumentation()
 
     rateLimit(RateLimitName("weak")) {
         get {
@@ -35,7 +26,7 @@ private fun Route.configure(deprecated: Boolean = false) {
         }
 
         route("version") {
-            installPatchesVersionRouteDocumentation(deprecated)
+            installPatchesVersionRouteDocumentation()
 
             get {
                 call.respond(patchesService.latestVersion())
@@ -45,7 +36,7 @@ private fun Route.configure(deprecated: Boolean = false) {
 
     rateLimit(RateLimitName("strong")) {
         route("list") {
-            installPatchesListRouteDocumentation(deprecated)
+            installPatchesListRouteDocumentation()
 
             get {
                 call.respondBytes(ContentType.Application.Json) { patchesService.list() }
@@ -57,7 +48,7 @@ private fun Route.configure(deprecated: Boolean = false) {
         route("keys") {
             installCache(356.days)
 
-            installPatchesPublicKeyRouteDocumentation(deprecated)
+            installPatchesPublicKeyRouteDocumentation()
 
             get {
                 call.respond(patchesService.publicKey())
@@ -66,11 +57,10 @@ private fun Route.configure(deprecated: Boolean = false) {
     }
 }
 
-private fun Route.installPatchesRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installPatchesRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Patches")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the current patches release")
         summary("Get current patches release")
         response {
@@ -82,11 +72,10 @@ private fun Route.installPatchesRouteDocumentation(deprecated: Boolean) = instal
     }
 }
 
-private fun Route.installPatchesVersionRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installPatchesVersionRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Patches")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the current patches release version")
         summary("Get current patches release version")
         response {
@@ -98,11 +87,10 @@ private fun Route.installPatchesVersionRouteDocumentation(deprecated: Boolean) =
     }
 }
 
-private fun Route.installPatchesListRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installPatchesListRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Patches")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the list of patches from the current patches release")
         summary("Get list of patches from current patches release")
         response {
@@ -114,11 +102,10 @@ private fun Route.installPatchesListRouteDocumentation(deprecated: Boolean) = in
     }
 }
 
-private fun Route.installPatchesPublicKeyRouteDocumentation(deprecated: Boolean) = installNotarizedRoute {
+private fun Route.installPatchesPublicKeyRouteDocumentation() = installNotarizedRoute {
     tags = setOf("Patches")
 
     get = GetInfo.builder {
-        if (deprecated) isDeprecated()
         description("Get the public keys for verifying patches assets")
         summary("Get patches public keys")
         response {

src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt

@@ -1,21 +1,21 @@
 package app.revanced.api.configuration.services
 
+import app.revanced.api.configuration.ApiAnnouncement
 import app.revanced.api.configuration.repository.AnnouncementRepository
-import app.revanced.api.configuration.schema.ApiAnnouncement
 
 internal class AnnouncementService(
     private val announcementRepository: AnnouncementRepository,
 ) {
-    suspend fun latest(tags: Set<Int>) = announcementRepository.latest(tags)
+    suspend fun latest(tags: Set<String>) = announcementRepository.latest(tags)
 
     suspend fun latest() = announcementRepository.latest()
 
-    fun latestId(tags: Set<Int>) = announcementRepository.latestId(tags)
+    fun latestId(tags: Set<String>) = announcementRepository.latestId(tags)
 
     fun latestId() = announcementRepository.latestId()
 
-    suspend fun paged(cursor: Int, limit: Int, tags: Set<Int>?, archived: Boolean) =
-        announcementRepository.paged(cursor, limit, tags, archived)
+    suspend fun paged(cursor: Int, limit: Int, tags: Set<String>?) =
+        announcementRepository.paged(cursor, limit, tags)
 
     suspend fun get(id: Int) = announcementRepository.get(id)
 

src/main/kotlin/app/revanced/api/configuration/services/ApiService.kt

@@ -1,8 +1,8 @@
 package app.revanced.api.configuration.services
 
+import app.revanced.api.configuration.*
 import app.revanced.api.configuration.repository.BackendRepository
 import app.revanced.api.configuration.repository.ConfigurationRepository
-import app.revanced.api.configuration.schema.*
 import io.ktor.http.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async

src/main/kotlin/app/revanced/api/configuration/services/AuthenticationService.kt

@@ -1,6 +1,6 @@
 package app.revanced.api.configuration.services
 
-import app.revanced.api.configuration.schema.ApiToken
+import app.revanced.api.configuration.ApiToken
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
 import io.ktor.server.auth.*

src/main/kotlin/app/revanced/api/configuration/services/ManagerService.kt

@@ -1,10 +1,10 @@
 package app.revanced.api.configuration.services
 
+import app.revanced.api.configuration.ApiRelease
+import app.revanced.api.configuration.ApiReleaseVersion
 import app.revanced.api.configuration.repository.BackendRepository
 import app.revanced.api.configuration.repository.BackendRepository.BackendOrganization.BackendRepository.BackendRelease.Companion.first
 import app.revanced.api.configuration.repository.ConfigurationRepository
-import app.revanced.api.configuration.schema.ApiRelease
-import app.revanced.api.configuration.schema.ApiReleaseVersion
 
 internal class ManagerService(
     private val backendRepository: BackendRepository,

src/main/kotlin/app/revanced/api/configuration/services/OldApiService.kt

@@ -1,76 +0,0 @@
-package app.revanced.api.configuration.services
-
-import app.revanced.api.configuration.repository.ConfigurationRepository
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.*
-import io.ktor.client.plugins.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
-import io.ktor.http.content.*
-import io.ktor.server.application.*
-import io.ktor.server.request.*
-import io.ktor.server.response.*
-import io.ktor.util.*
-import io.ktor.utils.io.*
-
-internal class OldApiService(configurationRepository: ConfigurationRepository) {
-    private val client = HttpClient(OkHttp) {
-        defaultRequest { url(configurationRepository.oldApiEndpoint) }
-    }
-
-    @OptIn(InternalAPI::class)
-    suspend fun proxy(call: ApplicationCall) {
-        val channel = call.request.receiveChannel()
-        val size = channel.availableForRead
-        val byteArray = ByteArray(size)
-        channel.readFully(byteArray)
-
-        val response: HttpResponse = client.request(call.request.uri) {
-            method = call.request.httpMethod
-
-            headers {
-                appendAll(
-                    call.request.headers.filter { key, _ ->
-                        !(
-                            key.equals(HttpHeaders.ContentType, ignoreCase = true) ||
-                                key.equals(HttpHeaders.ContentLength, ignoreCase = true) ||
-                                key.equals(HttpHeaders.Host, ignoreCase = true)
-                            )
-                    },
-                )
-            }
-
-            when (call.request.httpMethod) {
-                HttpMethod.Post,
-                HttpMethod.Put,
-                HttpMethod.Patch,
-                HttpMethod.Delete,
-                -> body = ByteArrayContent(byteArray, call.request.contentType())
-            }
-        }
-
-        val headers = response.headers
-
-        call.respond(object : OutgoingContent.WriteChannelContent() {
-            override val contentLength: Long? = headers[HttpHeaders.ContentLength]?.toLong()
-            override val contentType = headers[HttpHeaders.ContentType]?.let { ContentType.parse(it) }
-            override val headers: Headers = Headers.build {
-                appendAll(
-                    headers.filter { key, _ ->
-                        !key.equals(
-                            HttpHeaders.ContentType,
-                            ignoreCase = true,
-                        ) &&
-                            !key.equals(HttpHeaders.ContentLength, ignoreCase = true)
-                    },
-                )
-            }
-            override val status = response.status
-
-            override suspend fun writeTo(channel: ByteWriteChannel) {
-                response.content.copyAndClose(channel)
-            }
-        })
-    }
-}

src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt

@@ -1,11 +1,11 @@
 package app.revanced.api.configuration.services
 
+import app.revanced.api.configuration.ApiAssetPublicKey
+import app.revanced.api.configuration.ApiRelease
+import app.revanced.api.configuration.ApiReleaseVersion
 import app.revanced.api.configuration.repository.BackendRepository
 import app.revanced.api.configuration.repository.BackendRepository.BackendOrganization.BackendRepository.BackendRelease.Companion.first
 import app.revanced.api.configuration.repository.ConfigurationRepository
-import app.revanced.api.configuration.schema.ApiAssetPublicKey
-import app.revanced.api.configuration.schema.ApiRelease
-import app.revanced.api.configuration.schema.ApiReleaseVersion
 import app.revanced.library.serializeTo
 import app.revanced.patcher.patch.loadPatchesFromJar
 import com.github.benmanes.caffeine.cache.Caffeine

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

@@ -1,12 +1,14 @@
 package app.revanced.api.configuration.services
 
+import app.revanced.api.configuration.ApiAnnouncement
 import app.revanced.api.configuration.repository.AnnouncementRepository
-import app.revanced.api.configuration.schema.ApiAnnouncement
 import kotlinx.coroutines.runBlocking
 import kotlinx.datetime.toKotlinLocalDateTime
 import org.jetbrains.exposed.sql.Database
-import org.junit.jupiter.api.*
 import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 import java.time.LocalDateTime
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
@@ -84,27 +86,22 @@ private object AnnouncementServiceTest {
         announcementService.new(ApiAnnouncement(title = "2", tags = listOf("tag1", "tag3")))
         announcementService.new(ApiAnnouncement(title = "3", tags = listOf("tag1", "tag4")))
 
-        val tag2 = announcementService.tags().find { it.name == "tag2" }!!.id
-        assert(announcementService.latest(setOf(tag2)).first().title == "1")
+        assert(announcementService.latest(setOf("tag2")).first().title == "1")
+        assert(announcementService.latest(setOf("tag3")).last().title == "2")
 
-        val tag3 = announcementService.tags().find { it.name == "tag3" }!!.id
-        assert(announcementService.latest(setOf(tag3)).last().title == "2")
-
-        val tag1and3 =
-            announcementService.tags().filter { it.name == "tag1" || it.name == "tag3" }.map { it.id }.toSet()
-        val announcement2and3 = announcementService.latest(tag1and3)
+        val announcement2and3 = announcementService.latest(setOf("tag1", "tag3"))
         assert(announcement2and3.size == 2)
         assert(announcement2and3.any { it.title == "2" })
         assert(announcement2and3.any { it.title == "3" })
 
         announcementService.delete(announcementService.latestId()!!.id)
-        assert(announcementService.latest(tag1and3).first().title == "2")
+        assert(announcementService.latest(setOf("tag1", "tag3")).first().title == "2")
 
         announcementService.delete(announcementService.latestId()!!.id)
-        assert(announcementService.latest(tag1and3).first().title == "1")
+        assert(announcementService.latest(setOf("tag1", "tag3")).first().title == "1")
 
         announcementService.delete(announcementService.latestId()!!.id)
-        assert(announcementService.latest(tag1and3).isEmpty())
+        assert(announcementService.latest(setOf("tag1", "tag3")).isEmpty())
         assert(announcementService.tags().isEmpty())
     }
 
@@ -156,11 +153,11 @@ private object AnnouncementServiceTest {
             announcementService.new(ApiAnnouncement(title = "title$it"))
         }
 
-        val announcements = announcementService.paged(Int.MAX_VALUE, 5, null, true)
+        val announcements = announcementService.paged(Int.MAX_VALUE, 5, null)
         assertEquals(5, announcements.size, "Returns correct number of announcements")
         assertEquals("title9", announcements.first().title, "Starts from the latest announcement")
 
-        val announcements2 = announcementService.paged(5, 5, null, true)
+        val announcements2 = announcementService.paged(5, 5, null)
         assertEquals(5, announcements2.size, "Returns correct number of announcements when starting from the cursor")
         assertEquals("title4", announcements2.first().title, "Starts from the cursor")
 
@@ -183,10 +180,7 @@ private object AnnouncementServiceTest {
         val tags = announcementService.tags()
         assertEquals(5, tags.size, "Returns correct number of newly created tags")
 
-        val announcements3 = announcementService.paged(5, 5, setOf(tags[1].id), true)
+        val announcements3 = announcementService.paged(5, 5, setOf(tags[1].name))
         assertEquals(4, announcements3.size, "Filters announcements by tag")
-
-        val announcements4 = announcementService.paged(Int.MAX_VALUE, 10, null, false)
-        assertEquals(8, announcements4.size, "Filters out archived announcements")
     }
 }