update to v2.3.8

simple-robot · Feb 25, 2022 · 2055cee · 2055cee
1 parent 98024f6
commit 2055cee
Showing 30 changed files with 44 additions and 46 deletions.
diff --git a/component/component-ding/pom.xml b/component/component-ding/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>component-parent</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/component/component-kaiheila-parent/pom.xml b/component/component-kaiheila-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>component-parent</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/component/component-lovelycat-httpapi/pom.xml b/component/component-lovelycat-httpapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>component-parent</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/component/component-mirai/pom.xml b/component/component-mirai/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>love.forte.simple-robot</groupId>
         <artifactId>component-parent</artifactId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
     <url>https://github.com/ForteScarlet/simpler-robot/tree/dev/component/component-mirai</url>
 
     <properties>
-        <mirai.version>2.8.2</mirai.version>
+        <mirai.version>2.10.0</mirai.version>
     </properties>
 
 

diff --git a/...rai/src/main/java/love/forte/simbot/component/mirai/message/MiraiForwardMessageBuilder.kt b/...rai/src/main/java/love/forte/simbot/component/mirai/message/MiraiForwardMessageBuilder.kt
@@ -13,6 +13,7 @@
  */
 
 @file:JvmName("MiraiForwardMessageUtil")
+@file:Suppress("unused")
 
 package love.forte.simbot.component.mirai.message
 
@@ -25,28 +26,25 @@ import love.forte.simbot.api.message.events.MessageGet
 import love.forte.simbot.component.mirai.message.event.MiraiMessageMsgGet
 import love.forte.simbot.component.mirai.utils.toMiraiMessageContent
 import love.forte.simbot.processor.RemoteResourceInProcessor
-import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.message.data.*
-import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime
 
-@OptIn(ExperimentalTime::class)
 private inline val nowSecond
-    get() = Duration.milliseconds(System.currentTimeMillis()).inWholeSeconds.toInt()
+    get() = System.currentTimeMillis().milliseconds.inWholeSeconds.toInt()
 
 /**
  *
  * @author ForteScarlet
  */
+@Suppress("unused")
 public class MiraiForwardMessageBuilder(
     private val cache: MiraiMessageCache? = null,
     private val remoteResourceInProcessor: RemoteResourceInProcessor,
 ) {
     private val nodes = mutableListOf<suspend (Contact) -> ForwardMessage.Node>()
 
-    private val b = ForwardMessageBuilder(Bot.instances[0].asFriend)
-
     @JvmSynthetic
     public fun add(nodeBlock: suspend (Contact) -> ForwardMessage.Node): MiraiForwardMessageBuilder = also {
         nodes.add(nodeBlock)
@@ -107,7 +105,8 @@ public class MiraiForwardMessageBuilder(
                 add(senderId, senderName, time, message::getMessage)
             }
             else -> {
-                add(senderId,
+                add(
+                    senderId,
                     senderName,
                     time,
                     message.toMiraiMessageContent(null, cache, remoteResourceInProcessor)::getMessage
@@ -119,7 +118,6 @@ public class MiraiForwardMessageBuilder(
     }
 
 
-    @OptIn(ExperimentalTime::class)
     @JvmOverloads
     public fun add(
         senderId: Long? = null,
@@ -156,7 +154,7 @@ public class MiraiForwardMessageBuilder(
 
         val senderId0 = senderId ?: event.accountInfo.accountCodeNumber
         val senderName0 = senderName ?: event.accountInfo.accountRemarkOrNickname ?: " "
-        val time0 = time ?: Duration.milliseconds(event.time).inWholeSeconds.toInt()
+        val time0 = time ?: event.time.milliseconds.inWholeSeconds.toInt()
 
         return add(senderId0, senderName0, time0, messageGetter)
     }
@@ -174,7 +172,6 @@ public class MiraiForwardMessageBuilder(
         add(senderId, senderName, time, messageGetter::invoke)
 
 
-
     /**
      * 添加一条消息。
      */
@@ -188,7 +185,6 @@ public class MiraiForwardMessageBuilder(
         add(senderId, senderName, time, message.toMiraiMessageContent(null, cache, remoteResourceInProcessor))
 
 
-
     /**
      * 添加一条消息。
      */
@@ -303,7 +299,6 @@ public class MiraiForwardMessageBuilder(
 
 
 @JvmOverloads
-@OptIn(ExperimentalTime::class)
 public fun MessageGet.toForwardMessage(
     cache: MiraiMessageCache? = null,
     remoteResourceInProcessor: RemoteResourceInProcessor = RemoteResourceInProcessor.Default,
@@ -337,7 +332,7 @@ public fun MessageGet.toForwardMessage(
 
     val senderId = this.accountInfo.accountCodeNumber
     val senderName = this.accountInfo.accountRemarkOrNickname ?: " "
-    val time = Duration.milliseconds(time).inWholeSeconds.toInt()
+    val time = time.milliseconds.inWholeSeconds.toInt()
 
     return MiraiForwardMessage(listOf { c ->
         ForwardMessage.Node(

diff --git a/...nent-mirai/src/main/java/love/forte/simbot/component/mirai/message/MiraiMessageContent.kt b/...nent-mirai/src/main/java/love/forte/simbot/component/mirai/message/MiraiMessageContent.kt
@@ -392,12 +392,12 @@ constructor(
 @Deprecated("Use MiraiAudioMessageContent", replaceWith = ReplaceWith("MiraiAudioMessageContent"))
 public class MiraiVoiceMessageContent(
     override val neko: Neko,
-    @Suppress("DEPRECATION") private val voiceFunction: suspend (Contact) -> Voice,
+    @Suppress("DEPRECATION") private val voiceFunction: suspend (Contact) -> Audio,
 ) : MiraiMessageContent(), NekoAble {
 
     @Suppress("DEPRECATION")
     @Volatile
-    private lateinit var voice: Voice
+    private lateinit var voice: Audio
 
     /** lock */
     private val lock = Mutex()

diff --git a/component/pom.xml b/component/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/core-api/api/pom.xml b/core-api/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/core-api/core/pom.xml b/core-api/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/http/client-core/pom.xml b/http/client-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>http-parent</artifactId>
         <groupId>love.forte.simple-robot.http</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/http/client-ktor/pom.xml b/http/client-ktor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>http-parent</artifactId>
         <groupId>love.forte.simple-robot.http</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/http/client-restTemplate/pom.xml b/http/client-restTemplate/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>http-parent</artifactId>
         <groupId>love.forte.simple-robot.http</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/http/client-restTemplate/src/test/java/Generator.kt b/http/client-restTemplate/src/test/java/Generator.kt
@@ -99,6 +99,7 @@ class GeneratorIterator<T>(
         println("resume")
         when (val currentState = state) {
             is State.NotReady -> currentState.continuation.resume(Unit)
+            else -> {}
         }
     }
 

diff --git a/http/client-restTemplate/src/test/java/TestCoroutine.kt b/http/client-restTemplate/src/test/java/TestCoroutine.kt
@@ -103,6 +103,7 @@ class WaitImpl<T>(
                 currentState.continuation.resume(value)
                 println("resume: $value")
             }
+            else -> {}
         }
     }
 
@@ -117,6 +118,7 @@ class WaitImpl<T>(
                 is WaitState.Init -> {
                     state = WaitState.Waiting(continuation)
                 }
+                else -> {}
             }
         }
     }

diff --git a/http/pom.xml b/http/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>love.forte.simple-robot</groupId>
     <artifactId>parent</artifactId>
-    <version>2.3.7<!--v--></version>
+    <version>2.3.8<!--v--></version>
     <packaging>pom</packaging>
 
     <modules>
@@ -23,7 +23,7 @@
     <description>simple-robot是一个通用bot开发框架，以同一种灵活的标准来编写不同平台的bot应用。而simpler-robot便是simple-robot 2.x版本命名。</description>
 
     <properties>
-        <simbot.version>2.3.7<!--v--></simbot.version>
+        <simbot.version>2.3.8<!--v--></simbot.version>
         <simbot.khl.version>0.0.1-ALPHA.1<!--khlv--></simbot.khl.version>
 
         <maven.compiler.source>8</maven.compiler.source>
@@ -34,10 +34,10 @@
         <project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
         <!--</editor-fold>-->
         <!--<editor-fold desc="kt prop">-->
-        <kotlin.version>1.5.20</kotlin.version>
+        <kotlin.version>1.6.0</kotlin.version>
         <ktor.version>1.6.2</ktor.version>
-        <kotlinx.version>1.5.0</kotlinx.version>
-        <kotlinx-serialization.version>1.2.1</kotlinx-serialization.version>
+        <kotlinx.version>1.6.0</kotlinx.version>
+        <kotlinx-serialization.version>1.3.2</kotlinx-serialization.version>
         <!--<kotlinx-atomicfu.version>0.15.0</kotlinx-atomicfu.version>-->
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>love.forte.simple-robot</groupId>
         <artifactId>parent</artifactId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>./parent/pom.xml</relativePath>
     </parent>
 

diff --git a/serialization/json-core/pom.xml b/serialization/json-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>serialization-parent</artifactId>
         <groupId>love.forte.simple-robot.serialization</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/serialization/json-fastjson/pom.xml b/serialization/json-fastjson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>serialization-parent</artifactId>
         <groupId>love.forte.simple-robot.serialization</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/serialization/json-jackson/pom.xml b/serialization/json-jackson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>serialization-parent</artifactId>
         <groupId>love.forte.simple-robot.serialization</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/serialization/json-moshi/pom.xml b/serialization/json-moshi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>serialization-parent</artifactId>
         <groupId>love.forte.simple-robot.serialization</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/serialization/pom.xml b/serialization/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/simbot-x/plugin-core/pom.xml b/simbot-x/plugin-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/spring-boot-starter/component-lovelycat-httpapi-spring-boot-starter/pom.xml b/spring-boot-starter/component-lovelycat-httpapi-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-boot-starter</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/spring-boot-starter/component-mirai-spring-boot-starter/pom.xml b/spring-boot-starter/component-mirai-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-starter</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/spring-boot-starter/core-spring-boot-starter/pom.xml b/spring-boot-starter/core-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-starter</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/time-task/pom.xml b/time-task/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>love.forte.simple-robot</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/time-task/time-task-core/pom.xml b/time-task/time-task-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>time-task-parent</artifactId>
         <groupId>love.forte.simple-robot.time-task</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/time-task/time-task-quartz/pom.xml b/time-task/time-task-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>time-task-parent</artifactId>
         <groupId>love.forte.simple-robot.time-task</groupId>
-        <version>2.3.7<!--v--></version>
+        <version>2.3.8<!--v--></version>
     </parent>
     <modelVersion>4.0.0</modelVersion>