chore: Remove dead code and add todos at places where things have to be fixed

Author: ammodev

.idea/misc.xml

@@ -51,6 +51,7 @@ ktor-server-resources = { module = "io.ktor:ktor-server-resources" }
 kotlin-css = { module = "org.jetbrains.kotlin-wrappers:kotlin-css" }
 ktor-server-websockets = { module = "io.ktor:ktor-server-websockets" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" }
+ktor-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation" }
 ktor-server-auth = { module = "io.ktor:ktor-server-auth" }
 bson-kotlinx = { module = "org.mongodb:bson-kotlinx", version.ref = "bson-kotlinx" }
 aspectjweaver = { module = "org.aspectj:aspectjweaver" }
@@ -84,5 +85,5 @@ jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin
 exposed-api-server = ["exposed-spring-boot-starter", "exposed-java-time", "exposed-migration"]
 maven-libraries = ["maven-impl", "maven-resolver"]
 console-api = ["jline", "brigadier", "terminalconsoleappender"]
-ktor-api-server = ["ktor-server-core-jvm", "ktor-server-netty", "ktor-server-core", "ktor-server-html-builder", "kotlin-css", "ktor-server-websockets", "ktor-serialization-kotlinx-json", "ktor-server-resources", "ktor-server-auth"]
+ktor-api-server = ["ktor-server-core-jvm", "ktor-server-netty", "ktor-server-core", "ktor-server-html-builder", "kotlin-css", "ktor-server-websockets", "ktor-content-negotiation", "ktor-serialization-kotlinx-json", "ktor-server-resources", "ktor-server-auth"]
 flyway = ["flyway-core", "flyway-mysql"]

gradle/libs.versions.toml

@@ -33,7 +33,8 @@ val sanitizeLibs by tasks.registering {
                 inJar.copyTo(dest, overwrite = true)
             } else {
                 // entpacken -> problematische Einträge ausschließen -> wieder zippen
-                val tmp = layout.buildDirectory.dir("tmp/sanitize/${inJar.nameWithoutExtension}").get().asFile
+                val tmp = layout.buildDirectory.dir("tmp/sanitize/${inJar.nameWithoutExtension}")
+                    .get().asFile
                 tmp.deleteRecursively(); tmp.mkdirs()
 
                 copy {
@@ -44,7 +45,10 @@ val sanitizeLibs by tasks.registering {
                     )
                     into(tmp)
                 }
-                ant.invokeMethod("zip", mapOf("basedir" to tmp.absolutePath, "destfile" to dest.absolutePath))
+                ant.invokeMethod(
+                    "zip",
+                    mapOf("basedir" to tmp.absolutePath, "destfile" to dest.absolutePath)
+                )
             }
         }
     }

surf-cloud-standalone/build.gradle.kts

@@ -1,6 +1,8 @@
 package dev.slne.surf.cloud.standalone
 
 import dev.slne.surf.cloud.api.server.exposed.migration.generateSimpleExposedMigration
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerNameHistoryTable
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerPlaytimesTable
 import dev.slne.surf.cloud.standalone.player.db.exposed.punishment.table.*
 import dev.slne.surf.cloud.standalone.player.db.exposed.whitelist.WhitelistTable
 
@@ -16,6 +18,8 @@ fun main() {
         MutePunishmentNoteTable,
         WarnPunishmentNoteTable,
         WhitelistTable,
-        scriptName = "V8__rename_tables_and_use_cloud_player_references",
+        CloudPlayerNameHistoryTable,
+        CloudPlayerPlaytimesTable,
+        scriptName = "V1__create_tables",
     )
 }

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/GenerateExposedMigrationScript.kt

@@ -8,17 +8,24 @@ import dev.slne.surf.cloud.core.common.spring.CloudLifecycleAware
 import dev.slne.surf.cloud.standalone.config.StandaloneConfigHolder
 import dev.slne.surf.cloud.standalone.ktor.routes.punish.punishRoutes
 import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.auth.*
 import io.ktor.server.engine.*
 import io.ktor.server.html.*
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.*
+import io.ktor.server.plugins.ContentTransformationException
+import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.statuspages.*
+import io.ktor.server.request.*
 import io.ktor.server.resources.*
+import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.coroutines.launch
 import kotlinx.html.*
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
 import org.springframework.core.annotation.Order
 import org.springframework.stereotype.Component
 import java.security.MessageDigest
@@ -50,6 +57,12 @@ class KtorServer(private val configHolder: StandaloneConfigHolder) : CloudLifecy
 //                pingPeriod = 15.seconds
 //            }
             install(Resources)
+            install(ContentNegotiation) {
+                json(Json {
+                    isLenient = true
+                    ignoreUnknownKeys = true
+                })
+            }
             authentication {
                 bearer {
                     realm = "Access to the '/' path"
@@ -78,11 +91,24 @@ class KtorServer(private val configHolder: StandaloneConfigHolder) : CloudLifecy
                     }
                     punishRoutes()
                 }
+
+                trace {
+                    println(it.buildText())
+                }
+
+                post("/test") {
+                    val testData = call.receive<TestData>()
+                    println("Received test data: ${testData.name}")
+                    call.respondText("Test data received successfully.", status = HttpStatusCode.OK)
+                }
             }
         }
         server.start(wait = true)
     }
 
+    @Serializable
+    data class TestData(val name: String)
+
     private fun StatusPagesConfig.configure() {
         status(HttpStatusCode.NotFound) { call, _ ->
             call.respondErrorPage(

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/KtorServer.kt

@@ -6,17 +6,30 @@ import dev.slne.surf.cloud.standalone.ktor.routes.punish.create.ban.CreateBanPun
 import dev.slne.surf.cloud.standalone.ktor.routes.punish.create.kick.CreateKickPunishmentRoute
 import dev.slne.surf.cloud.standalone.ktor.routes.punish.create.mute.CreateMutePunishmentRoute
 import dev.slne.surf.cloud.standalone.ktor.routes.punish.create.warn.CreateWarnPunishmentRoute
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.ktor.http.*
+import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
-fun Routing.createPunishRoutes() = route("/create") {
+fun Route.createPunishRoutes() = route("/create") {
     post<CreateBanPunishmentRoute> { banMeta ->
         bean<PunishmentManager>().broadcastBan(banMeta.toApiObject())
         call.respond(HttpStatusCode.OK, "Ban punishment broadcasted successfully.")
     }
 
-    post<CreateKickPunishmentRoute> { kickMeta ->
+    get("/kick") {
+        logger().atInfo().log("Received GET request for kick punishment creation.")
+        call.respond(
+            HttpStatusCode.MethodNotAllowed,
+            "GET method is not allowed for kick punishment creation. Use POST instead."
+        )
+    }
+
+    post("/kick") {
+        val kickMeta = call.receive<CreateKickPunishmentRoute>()
+
+        logger().atInfo().log("Broadcasting kick punishment: $kickMeta")
         bean<PunishmentManager>().broadcastKick(kickMeta.toApiObject())
         call.respond(HttpStatusCode.OK, "Kick punishment broadcasted successfully.")
     }

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/routes/punish/create/CreatePunishRoute.kt

@@ -3,9 +3,10 @@ package dev.slne.surf.cloud.standalone.ktor.routes.punish.create.kick
 import dev.slne.surf.cloud.core.common.player.punishment.type.PunishmentKickImpl
 import dev.slne.surf.cloud.standalone.ktor.types.ZonedDateTimeAsString
 import dev.slne.surf.surfapi.core.api.service.UUIDAsString
-import io.ktor.resources.*
+import kotlinx.serialization.Serializable
 
-@Resource("/kick")
+//@Resource("/kick")
+@Serializable
 class CreateKickPunishmentRoute(
     val id: Long,
     val punishmentId: String,

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/routes/punish/create/kick/CreateKickPunishmentRoute.kt

@@ -19,7 +19,6 @@ abstract class AbstractUnpunishableExpirablePunishmentTable(name: String) :
     val permanent = bool("permanent").default(false)
 
     init {
-        index("idx_punished_uuid_unpunished", false, punishedPlayerId, unpunished)
         index("idx_permanent_exp", false, permanent, expirationDate)
     }
 }