fix: 优化代码及修复bug

subitlab · Sep 8, 2024 · e4c7df7 · e4c7df7
1 parent 74ce5e7
commit e4c7df7
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 14 deletions.
diff --git a/src/main/kotlin/subit/ForumBackend.kt b/src/main/kotlin/subit/ForumBackend.kt
@@ -1,8 +1,6 @@
 package subit
 
 import io.ktor.server.application.*
-import io.ktor.server.config.*
-import io.ktor.server.config.ConfigLoader.Companion.load
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import net.mamoe.yamlkt.Yaml

diff --git a/src/main/kotlin/subit/database/Database.kt b/src/main/kotlin/subit/database/Database.kt
@@ -10,7 +10,6 @@ import subit.database.sqlImpl.SqlDatabaseImpl
 import subit.logger.ForumLogger
 import subit.utils.Power.shutdown
 import kotlin.reflect.KClass
-import kotlin.reflect.KType
 
 val databaseImpls: List<IDatabase> = listOf(
     SqlDatabaseImpl,

diff --git a/src/main/kotlin/subit/database/memoryImpl/PostVersionsImpl.kt b/src/main/kotlin/subit/database/memoryImpl/PostVersionsImpl.kt
@@ -4,16 +4,13 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Instant
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import subit.dataClasses.*
 import subit.database.PostVersions
-import subit.database.Posts
 import subit.dataClasses.Slice.Companion.asSlice
 import subit.utils.toInstant
 
 class PostVersionsImpl: PostVersions, KoinComponent
 {
-    private val posts: Posts by inject()
 
     private val lock = Mutex()
     internal val list: MutableList<PostVersionInfo> = mutableListOf()

diff --git a/src/main/kotlin/subit/database/memoryImpl/PostsImpl.kt b/src/main/kotlin/subit/database/memoryImpl/PostsImpl.kt
@@ -25,7 +25,7 @@ class PostsImpl: Posts, KoinComponent
         block: BlockId,
         parent: PostId?,
         top: Boolean
-    ): PostId?
+    ): PostId
     {
         val id = (map.size + 1).toPostId()
         map[id] = PostInfo(

diff --git a/src/main/kotlin/subit/database/sqlImpl/SqlDatabaseImpl.kt b/src/main/kotlin/subit/database/sqlImpl/SqlDatabaseImpl.kt
@@ -14,7 +14,6 @@ import org.koin.core.module.dsl.singleOf
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
-import org.koin.ktor.ext.get
 import subit.console.AnsiStyle.Companion.RESET
 import subit.console.SimpleAnsiColor.Companion.CYAN
 import subit.console.SimpleAnsiColor.Companion.GREEN

diff --git a/src/main/kotlin/subit/plugin/RateLimit.kt b/src/main/kotlin/subit/plugin/RateLimit.kt
@@ -3,10 +3,8 @@ package subit.plugin
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.ratelimit.*
-import io.ktor.server.request.*
 import io.ktor.server.response.*
 import subit.dataClasses.PostId.Companion.toPostId
-import subit.dataClasses.PostId.Companion.toPostIdOrNull
 import subit.utils.HttpStatus
 import subit.utils.respond
 import java.util.*

diff --git a/src/main/kotlin/subit/router/Home.kt b/src/main/kotlin/subit/router/Home.kt
@@ -2,7 +2,8 @@
 
 package subit.router.home
 
-import io.github.smiley4.ktorswaggerui.dsl.routing.*
+import io.github.smiley4.ktorswaggerui.dsl.routing.get
+import io.github.smiley4.ktorswaggerui.dsl.routing.route
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.ratelimit.*
@@ -13,7 +14,6 @@ import subit.JWTAuth.getLoginUser
 import subit.dataClasses.*
 import subit.database.Blocks
 import subit.database.Posts
-import subit.database.Users
 import subit.database.receiveAndCheckBody
 import subit.plugin.RateLimit
 import subit.router.*

diff --git a/src/main/kotlin/subit/router/Posts.kt b/src/main/kotlin/subit/router/Posts.kt
@@ -5,7 +5,6 @@ package subit.router.posts
 import io.github.smiley4.ktorswaggerui.dsl.routing.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.ratelimit.*
-import io.ktor.server.request.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
 import subit.JWTAuth.getLoginUser
@@ -332,6 +331,8 @@ private suspend fun Context.editPost()
             content = newContent.toString()
         )
 
+        markings.map { it.copy(postVersion = newVersion) }
+
         //////////////////////////// 以下为对划词评论的处理 ////////////////////////////
 
         val pre = IntArray(oldVersionInfo.content.length + 1)

diff --git a/src/main/kotlin/subit/router/User.kt b/src/main/kotlin/subit/router/User.kt
@@ -130,7 +130,7 @@ private suspend fun Context.getUserInfo()
     {
         val user = SSO.getBasicUserInfo(id) ?: return call.respond(HttpStatus.NotFound)
         // 这里需要判断类型并转换再返回, 因为respond的返回体类型是编译时确定的
-        if (user is UserFull) return call.respond(HttpStatus.OK, user as UserFull)
+        if (user is UserFull) return call.respond<UserFull>(HttpStatus.OK, user)
         return call.respond(HttpStatus.OK, user as BasicUserInfo)
     }
 }