PostsSystem/core
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

try to fix ktor update

Browse Source
This commit is contained in:
InsanusMokrassar 2022-05-18 23:32:37 +06:00
parent c238f391a8
commit 9216c013ec
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/dev/inmo/postssystem/server/ClientStaticRoutingConfiguration.kt
View File

@ -1,18 +1,16 @@
package dev.inmo.postssystem.server
import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
import io.ktor.application.call
import io.ktor.http.content.*
import io.ktor.response.respondRedirect
import io.ktor.routing.Route
import io.ktor.routing.get
import io.ktor.server.http.content.defaultResource
import io.ktor.server.http.content.resources
import io.ktor.server.routing.Route
import java.io.File
class ClientStaticRoutingConfiguration(
private val clientStatic: String?
) : ApplicationRoutingConfigurator.Element {
override fun Route.invoke() {
resources("web")
defaultResource("/web/index.html")
resources(clientStatic)
defaultResource("${clientStatic ?.let { "/$it" } ?: ""}/index.html")
}
}

10
server/src/main/java/dev/inmo/postssystem/server/DI.kt
View File

@ -32,10 +32,10 @@ import dev.inmo.postssystem.features.content.server.storage.*
import dev.inmo.postssystem.features.posts.server.*
import dev.inmo.postssystem.features.publication.server.PublicationManager
import dev.inmo.postssystem.services.posts.server.*
import io.ktor.application.featureOrNull
import io.ktor.application.log
import io.ktor.routing.Route
import io.ktor.routing.Routing
import io.ktor.server.application.pluginOrNull
import io.ktor.server.application.log
import io.ktor.server.routing.Route
import io.ktor.server.routing.Routing
import io.ktor.server.engine.ApplicationEngine
import io.ktor.server.netty.Netty
import kotlinx.coroutines.CoroutineScope
@ -194,7 +194,7 @@ fun getDIModule(
it.apply { configure() }
}
if (config.debugMode) {
featureOrNull(Routing) ?.print()
pluginOrNull(Routing) ?.print()
}
}
}

10
server/src/main/java/dev/inmo/postssystem/server/NotFoundStatusPageRedirectToIndex.kt
View File

@ -1,16 +1,16 @@
package dev.inmo.postssystem.server
import dev.inmo.micro_utils.ktor.server.configurators.StatusPagesConfigurator
import io.ktor.application.call
import io.ktor.features.StatusPages
import io.ktor.server.application.call
import io.ktor.http.HttpStatusCode
import io.ktor.response.respondRedirect
import io.ktor.server.plugins.statuspages.StatusPagesConfig
import io.ktor.server.response.respondRedirect
data class NotFoundStatusPageRedirectToIndex(
val redirectTo: String
) : StatusPagesConfigurator.Element {
override fun StatusPages.Configuration.invoke() {
status(HttpStatusCode.NotFound) {
override fun StatusPagesConfig.invoke() {
status(HttpStatusCode.NotFound) { _ ->
call.respondRedirect(redirectTo)
}
}

6
server/src/main/java/dev/inmo/postssystem/server/WebSocketsConfigurator.kt
View File

@ -1,9 +1,9 @@
package dev.inmo.postssystem.server
import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
import io.ktor.application.Application
import io.ktor.application.install
import io.ktor.websocket.WebSockets
import io.ktor.server.application.Application
import io.ktor.server.application.install
import io.ktor.server.websocket.WebSockets
object WebSocketsConfigurator : KtorApplicationConfigurator {
override fun Application.configure() {