fix: 修复错误

subitlab · Sep 15, 2024 · 05c9ad1 · 05c9ad1
1 parent 292de7c
commit 05c9ad1
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 16 deletions.
diff --git a/src/main/kotlin/subit/console/command/TestDatabase.kt b/src/main/kotlin/subit/console/command/TestDatabase.kt
@@ -35,6 +35,7 @@ object TestDatabase: Command, KoinComponent
             "Prohibits" to dao<Prohibits>(),
             "Reports" to dao<Reports>(),
             "Stars" to dao<Stars>(),
+            "Tags" to dao<Tags>(),
             "Users" to dao<Users>(),
             "WordMarkings" to dao<WordMarkings>(),
         )

diff --git a/src/main/kotlin/subit/dataClasses/Post.kt b/src/main/kotlin/subit/dataClasses/Post.kt
@@ -3,7 +3,6 @@ package subit.dataClasses
 import kotlinx.serialization.Serializable
 import org.koin.core.component.KoinComponent
 import subit.dataClasses.PostFullBasicInfo.Companion.SUB_CONTENT_LENGTH
-import subit.database.Tags
 
 @Serializable
 data class PostVersionInfo(

diff --git a/src/main/kotlin/subit/database/memoryImpl/MemoryDatabaseImpl.kt b/src/main/kotlin/subit/database/memoryImpl/MemoryDatabaseImpl.kt
@@ -52,6 +52,7 @@ object MemoryDatabaseImpl: IDatabase, KoinComponent
             singleOf(::ProhibitsImpl).bind<Prohibits>()
             singleOf(::ReportsImpl).bind<Reports>()
             singleOf(::StarsImpl).bind<Stars>()
+            singleOf(::TagsImpl).bind<Tags>()
             singleOf(::UsersImpl).bind<Users>()
             singleOf(::WordMarkingsImpl).bind<WordMarkings>()
         }

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

diff --git a/src/main/kotlin/subit/database/sqlImpl/BannedWordsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/BannedWordsImpl.kt
@@ -7,7 +7,6 @@ import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.update
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
 import subit.database.BannedWords
 import subit.database.sqlImpl.utils.asSlice
 

diff --git a/src/main/kotlin/subit/database/sqlImpl/PostVersionsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/PostVersionsImpl.kt
@@ -7,10 +7,9 @@ import org.jetbrains.exposed.sql.kotlin.datetime.timestamp
 import org.koin.core.component.KoinComponent
 import subit.dataClasses.*
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
-import subit.database.sqlImpl.utils.singleOrNull
 import subit.database.PostVersions
 import subit.database.sqlImpl.utils.asSlice
+import subit.database.sqlImpl.utils.singleOrNull
 
 class PostVersionsImpl: DaoSqlImpl<PostVersionsImpl.PostVersionsTable>(PostVersionsTable), PostVersions, KoinComponent
 {

diff --git a/src/main/kotlin/subit/database/sqlImpl/PostsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/PostsImpl.kt
@@ -7,7 +7,6 @@ import kotlinx.datetime.Instant
 import org.intellij.lang.annotations.Language
 import org.jetbrains.exposed.dao.id.IdTable
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.coalesce
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.div
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.minus
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
@@ -22,18 +21,16 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import subit.dataClasses.*
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
-import subit.database.sqlImpl.utils.singleOrNull
 import subit.database.*
 import subit.database.Posts.PostListSort.*
 import subit.database.sqlImpl.PostVersionsImpl.PostVersionsTable
 import subit.database.sqlImpl.PostsImpl.PostsTable.view
 import subit.database.sqlImpl.utils.asSlice
+import subit.database.sqlImpl.utils.singleOrNull
 import subit.router.home.AdvancedSearchData
 import subit.utils.toInstant
 import subit.utils.toTimestamp
 import java.sql.ResultSet
-import java.time.OffsetDateTime
 import kotlin.reflect.typeOf
 import kotlin.time.Duration.Companion.days
 

diff --git a/src/main/kotlin/subit/database/sqlImpl/PrivateChatsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/PrivateChatsImpl.kt
@@ -8,11 +8,10 @@ import org.jetbrains.exposed.sql.kotlin.datetime.CurrentTimestamp
 import org.jetbrains.exposed.sql.kotlin.datetime.timestamp
 import subit.dataClasses.PrivateChat
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
-import subit.database.sqlImpl.utils.singleOrNull
 import subit.dataClasses.UserId
 import subit.database.PrivateChats
 import subit.database.sqlImpl.utils.asSlice
+import subit.database.sqlImpl.utils.singleOrNull
 
 class PrivateChatsImpl: DaoSqlImpl<PrivateChatsImpl.PrivateChatsTable>(PrivateChatsTable), PrivateChats
 {

diff --git a/src/main/kotlin/subit/database/sqlImpl/ProhibitsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/ProhibitsImpl.kt
@@ -12,7 +12,6 @@ import org.jetbrains.exposed.sql.kotlin.datetime.timestamp
 import org.jetbrains.exposed.sql.selectAll
 import subit.dataClasses.Prohibit
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
 import subit.dataClasses.UserId
 import subit.database.Prohibits
 import subit.database.sqlImpl.utils.asSlice

diff --git a/src/main/kotlin/subit/database/sqlImpl/StarsImpl.kt b/src/main/kotlin/subit/database/sqlImpl/StarsImpl.kt
@@ -6,7 +6,6 @@ import org.jetbrains.exposed.sql.kotlin.datetime.CurrentTimestamp
 import org.jetbrains.exposed.sql.kotlin.datetime.timestamp
 import subit.dataClasses.PostId
 import subit.dataClasses.Slice
-import subit.dataClasses.Slice.Companion.asSlice
 import subit.dataClasses.Star
 import subit.dataClasses.UserId
 import subit.database.Stars

diff --git a/src/main/kotlin/subit/router/Comment.kt b/src/main/kotlin/subit/router/Comment.kt
@@ -121,7 +121,11 @@ private suspend fun Context.commentPost()
     val posts = get<Posts>()
 
     val parent = posts.getPostInfo(postId) ?: return call.respond(HttpStatus.NotFound.subStatus("目标帖子不存在"))
-    withPermission { checkCanComment(parent) }
+    val block = get<Blocks>().getBlock(parent.block) ?: return call.respond(HttpStatus.NotFound.subStatus("目标板块不存在"))
+    withPermission {
+        checkCanComment(parent)
+        if (newComment.anonymous) checkCanAnonymous(block)
+    }
 
     val commentId = posts.createPost(
         parent = postId,

diff --git a/src/main/kotlin/subit/router/Tag.kt b/src/main/kotlin/subit/router/Tag.kt
@@ -2,10 +2,12 @@
 
 package subit.router.tags
 
-import io.github.smiley4.ktorswaggerui.dsl.routing.*
+import io.github.smiley4.ktorswaggerui.dsl.routing.delete
+import io.github.smiley4.ktorswaggerui.dsl.routing.get
+import io.github.smiley4.ktorswaggerui.dsl.routing.post
+import io.github.smiley4.ktorswaggerui.dsl.routing.route
 import io.ktor.server.application.*
 import io.ktor.server.request.*
-import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.Serializable
 import subit.dataClasses.PostId