build: 2.3.5

cssxsh · Jul 12, 2022 · db4df64 · db4df64
1 parent 0ad3dc9
commit db4df64
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,15 +8,14 @@ plugins {
 }
 
 group = "xyz.cssxsh.mirai"
-version = "2.3.4"
+version = "2.3.5"
 
 mavenCentralPublish {
     useCentralS01()
     singleDevGithubProject("cssxsh", "mirai-hibernate-plugin")
     licenseFromGitHubProject("AGPL-3.0", "master")
     publication {
         artifact(tasks.getByName("buildPlugin"))
-        artifact(tasks.getByName("buildPluginLegacy"))
     }
 }
 

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/hibernate/MiraiHibernatePlugin.kt b/src/main/kotlin/xyz/cssxsh/mirai/hibernate/MiraiHibernatePlugin.kt
@@ -10,7 +10,7 @@ public object MiraiHibernatePlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "xyz.cssxsh.mirai.plugin.mirai-hibernate-plugin",
         name = "mirai-hibernate-plugin",
-        version = "2.3.4",
+        version = "2.3.5",
     ) {
         author("cssxsh")
 

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/hibernate/entry/MessageRecord.kt b/src/main/kotlin/xyz/cssxsh/mirai/hibernate/entry/MessageRecord.kt
@@ -6,6 +6,7 @@ import net.mamoe.mirai.*
 import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.message.code.*
 import net.mamoe.mirai.message.data.*
+import net.mamoe.mirai.utils.*
 
 @Entity
 @Table(name = "message_record")
@@ -105,7 +106,7 @@ public data class MessageRecord(
             return if (isNullOrEmpty()) {
                 IntArray(0)
             } else {
-                splitToSequence(',').map { it.toInt() }.toMutableList().toIntArray()
+                split(',').mapToIntArray { it.toInt() }
             }
         }
     }

diff --git a/src/test/kotlin/xyz/cssxsh/mirai/hibernate/entry/DatabaseTest.kt b/src/test/kotlin/xyz/cssxsh/mirai/hibernate/entry/DatabaseTest.kt
@@ -102,12 +102,13 @@ abstract class DatabaseTest {
             session.withCriteria<MessageRecord> { criteria ->
                 val record = criteria.from<MessageRecord>()
                 val id = record.get<Long>("id")
-                val subquery = criteria.subquery<Long>()
-                val rand = dice(subquery.select(max(subquery.from<MessageRecord>().get("id"))))
+                val max = criteria.subquery<Long>().apply {
+                    select(max(from<MessageRecord>().get("id")))
+                }
 
                 criteria.select(record)
                     .where(
-                        ge(id, rand)
+                        ge(id, dice(max))
                     )
             }.setMaxResults(3).list()
         }