fuck this stupid request

Bumer-32 · Bumer-32 · commit eba0ae5793d7 · 2025-06-06T20:56:34.000+03:00
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/ApiListG.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/ApiListG.kt
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/CheckLogin.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/CheckLogin.kt
@@ -12,7 +12,7 @@ import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransacti
 import ua.pp.lumivoid.iwtcms.ktor.cookie.UserSession
 import ua.pp.lumivoid.iwtcms.ktor.tables.Users
 
-object CheckLoginG : Request() {
+object CheckLogin : Request() {
     override val path = "/api/checkLogin"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Configs.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Configs.kt
@@ -13,7 +13,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import ua.pp.lumivoid.iwtcms.Constants
 import ua.pp.lumivoid.iwtcms.ktor.api.doAuth
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.ApiListG.registerAPI
 import java.io.File
 
 object Configs : Request() {
@@ -33,8 +32,6 @@ object Configs : Request() {
         availableConfigsSettings.forEach {
             val configPath = "$path/${it.value.selector_name}"
             logger.info("       - config ${it.key} url: $configPath")
-            registerAPI("${it.value.selector_name}GPUT", configPath)
-            registerAPI("${it.value.selector_name}StrategyG", configPath)
 
             get(configPath) {
                 doAuth(
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/CreateUser.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/CreateUser.kt
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/DeleteUser.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/DeleteUser.kt
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/EditPermissions.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/EditPermissions.kt
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Files.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Files.kt
@@ -3,7 +3,7 @@ package ua.pp.lumivoid.iwtcms.ktor.api.requests
 import io.ktor.server.http.content.staticResources
 import io.ktor.server.routing.Routing
 
-object FilesG : Request() {
+object Files : Request() {
     override val path = "/files"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/IsAllowed.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/IsAllowed.kt
@@ -7,7 +7,7 @@ import io.ktor.server.routing.get
 import kotlinx.coroutines.runBlocking
 import ua.pp.lumivoid.iwtcms.ktor.api.doAuth
 
-object IsAllowedG : Request() {
+object IsAllowed : Request() {
     override val path = "/api/isAllowed/{permission}"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/IsDevEnabled.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/IsDevEnabled.kt
@@ -6,7 +6,7 @@ import io.ktor.server.routing.Routing
 import io.ktor.server.routing.get
 import ua.pp.lumivoid.iwtcms.ktor.util.Config
 
-object IsDevEnabledG : Request() {
+object IsDevEnabled : Request() {
     override val path = "/api/isDevEnabled"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Login.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Login.kt
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Logout.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Logout.kt
@@ -8,7 +8,7 @@ import io.ktor.server.sessions.get
 import io.ktor.server.sessions.sessions
 import ua.pp.lumivoid.iwtcms.ktor.cookie.UserSession
 
-object LogoutP : Request() {
+object Logout : Request() {
     override val path = "/api/logout"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/LogsHistory.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/LogsHistory.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import ua.pp.lumivoid.iwtcms.ktor.api.doAuth
 
-object LogsHistoryG : Request() {
+object LogsHistory : Request() {
     override val path = "/api/logsHistory"
 
     private val json = Json { prettyPrint = true }
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Main.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Main.kt
@@ -4,7 +4,7 @@ import io.ktor.server.http.content.staticResources
 import io.ktor.server.routing.Routing
 import ua.pp.lumivoid.iwtcms.ktor.util.Config
 
-object MainG : Request() {
+object Main : Request() {
     override val path = "/"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Request.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Request.kt
@@ -3,7 +3,6 @@ package ua.pp.lumivoid.iwtcms.ktor.api.requests
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.RoutingRoot
 import ua.pp.lumivoid.iwtcms.Constants
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.ApiListG.registerAPI
 
 abstract class Request {
     protected val logger = Constants.EMBEDDED_SERVER_LOGGER
@@ -13,7 +12,6 @@ abstract class Request {
 
     fun register(routing: RoutingRoot) {
         logger.info("Initializing ${this.javaClass.simpleName} request: $path")
-        registerAPI(this.javaClass.simpleName, path)
         request.invoke(routing)
     }
 }
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Version.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/requests/Version.kt
@@ -6,7 +6,7 @@ import io.ktor.server.routing.Routing
 import io.ktor.server.routing.get
 import ua.pp.lumivoid.iwtcms.Constants
 
-object VersionG : Request() {
+object Version : Request() {
     override val path = "/api/version"
 
     override val request: Routing.() -> Unit = {
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/websockets/WebSocket.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/api/websockets/WebSocket.kt
@@ -3,7 +3,6 @@ package ua.pp.lumivoid.iwtcms.ktor.api.websockets
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.RoutingRoot
 import ua.pp.lumivoid.iwtcms.Constants
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.ApiListG.registerAPI
 
 abstract class WebSocket {
     protected val logger = Constants.EMBEDDED_SERVER_LOGGER
@@ -16,7 +15,6 @@ abstract class WebSocket {
 
     fun register(routing: RoutingRoot) {
         logger.info("Initializing ${this.javaClass.simpleName} websocket: $path")
-        registerAPI(this.javaClass.simpleName, path)
         ws.invoke(routing)
     }
 }
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/plugins/Routing.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/ktor/plugins/Routing.kt
@@ -15,20 +15,19 @@ import io.ktor.server.websocket.WebSockets
 import io.ktor.server.websocket.pingPeriod
 import io.ktor.server.websocket.timeout
 import ua.pp.lumivoid.iwtcms.Constants
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.ApiListG
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.CheckLoginG
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.CheckLogin
 import ua.pp.lumivoid.iwtcms.ktor.api.requests.Configs
 import ua.pp.lumivoid.iwtcms.ktor.api.requests.CreateUserP
 import ua.pp.lumivoid.iwtcms.ktor.api.requests.DeleteUserP
 import ua.pp.lumivoid.iwtcms.ktor.api.requests.EditPermissionsP
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.FilesG
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.IsAllowedG
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.IsDevEnabledG
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.Files
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.IsAllowed
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.IsDevEnabled
 import ua.pp.lumivoid.iwtcms.ktor.api.requests.LoginP
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.LogoutP
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.LogsHistoryG
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.MainG
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.VersionG
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.Logout
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.LogsHistory
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.Main
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.Version
 import ua.pp.lumivoid.iwtcms.ktor.api.websockets.ConsoleWS
 import ua.pp.lumivoid.iwtcms.ktor.api.websockets.ServerStatsWS
 import ua.pp.lumivoid.iwtcms.ktor.cookie.UserSession
@@ -75,16 +74,15 @@ fun Application.configureRouting() {
 
     logger.info("-=-=-=-=-=-=-=-=-=- Registering routes -=-=-=-=-=-=-=-=-=-")
 
-    MainG.register(r)
-    LogsHistoryG.register(r)
+    Main.register(r)
+    LogsHistory.register(r)
     LoginP.register(r)
-    ApiListG.register(r)
-    IsAllowedG.register(r)
-    FilesG.register(r)
-    VersionG.register(r)
-    CheckLoginG.register(r)
-    IsDevEnabledG.register(r)
-    LogoutP.register(r)
+    IsAllowed.register(r)
+    Files.register(r)
+    Version.register(r)
+    CheckLogin.register(r)
+    IsDevEnabled.register(r)
+    Logout.register(r)
     Configs.register(r)
     CreateUserP.register(r)
     DeleteUserP.register(r)
diff --git a/src/main/kotlin/ua/pp/lumivoid/iwtcms/util/CustomLogger.kt b/src/main/kotlin/ua/pp/lumivoid/iwtcms/util/CustomLogger.kt
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.core.appender.WriterAppender
 import org.apache.logging.log4j.core.config.Configurator
 import org.apache.logging.log4j.core.layout.PatternLayout
 import ua.pp.lumivoid.iwtcms.Constants
-import ua.pp.lumivoid.iwtcms.ktor.api.requests.LogsHistoryG
+import ua.pp.lumivoid.iwtcms.ktor.api.requests.LogsHistory
 import ua.pp.lumivoid.iwtcms.ktor.api.websockets.ConsoleWS
 import ua.pp.lumivoid.iwtcms.ktor.util.Config
 import java.io.IOException
@@ -62,7 +62,7 @@ object CustomLogger {
                     @Suppress("Deprecation")
                     val log = output.toString()
                     if (log.isNotEmpty()) {
-                        LogsHistoryG.addLog(log)
+                        LogsHistory.addLog(log)
                         ConsoleWS.asWs()?.sendMessage(log)
                         output.reset()
                     }
