release: v2.5.2

simple-robot · Feb 10, 2023 · c5d7c9c · c5d7c9c
1 parent da78cc9
commit c5d7c9c
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 47 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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.13.2</mirai.version>
+        <mirai.version>2.14.0</mirai.version>
     </properties>
 
 

diff --git a/...ent-mirai/src/main/java/love/forte/simbot/component/mirai/message/result/MiraiAuthInfo.kt b/...ent-mirai/src/main/java/love/forte/simbot/component/mirai/message/result/MiraiAuthInfo.kt
@@ -15,7 +15,6 @@
 package love.forte.simbot.component.mirai.message.result
 
 import love.forte.simbot.api.message.results.AuthInfo
-import love.forte.simbot.api.message.results.asCookies
 import love.forte.simbot.component.mirai.sender.Cookies
 import love.forte.simbot.thing.StructuralThingWithName
 
@@ -29,9 +28,6 @@ open class MiraiAuthInfo(private val _cookies: Cookies) : AuthInfo {
         _cookies.toCookiesMap()
     }
 
-    /** cookies信息。 */
-    override val cookies: AuthInfo.Cookies get() = auths.asCookies()
-
     override val auths: AuthInfo.Auths by lazy(LazyThreadSafetyMode.PUBLICATION) {
         MiraiAuthInfoCookies()
     }

diff --git a/...component-mirai/src/main/java/love/forte/simbot/component/mirai/sender/MiraiSenderUtil.kt b/...component-mirai/src/main/java/love/forte/simbot/component/mirai/sender/MiraiSenderUtil.kt
@@ -17,9 +17,9 @@ package love.forte.simbot.component.mirai.sender
 import love.forte.simbot.component.mirai.message.EmptySingleMessage
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.message.data.EmptyMessageChain
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.data.MessageChain
+import net.mamoe.mirai.message.data.emptyMessageChain
 
 /**
  * 获取某个群的群员。
@@ -41,7 +41,7 @@ internal inline fun Bot.getGroupMemberOrNull(groupCode: Long, memberCode: Long):
  */
 internal fun Message.isNotEmptyMsg(): Boolean =
             this !== EmptySingleMessage &&
-            this !== EmptyMessageChain &&
+            this !== emptyMessageChain() &&
             if (this is MessageChain) this.isNotEmpty() else true
 
 

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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--v--></version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/core-api/api/src/main/java/love/forte/simbot/api/message/results/AuthInfo.kt b/core-api/api/src/main/java/love/forte/simbot/api/message/results/AuthInfo.kt
@@ -25,8 +25,8 @@ import love.forte.simbot.thing.resolveValue
  */
 public interface AuthInfo : Result {
 
-    @Deprecated("Use property 'auths'.")
-    val cookies: Cookies
+    @Deprecated("Use property 'auths'.", ReplaceWith("auths"))
+    val cookies: Cookies get() = auths.asCookies()
 
     /**
      * 得到权限信息。不保证其内部存在信息。
@@ -99,8 +99,6 @@ public fun emptyAuthInfo(): AuthInfo = EmptyAuthInfo
  * 空值实现。
  */
 private object EmptyAuthInfo : AuthInfo {
-    override val cookies: AuthInfo.Cookies
-        get() = EmptyCookie
     override val auths: AuthInfo.Auths
         get() = EmptyAuth
     override val token: String?

diff --git a/core-api/api/src/main/java/love/forte/simbot/api/sender/FailedSender.kt b/core-api/api/src/main/java/love/forte/simbot/api/sender/FailedSender.kt
@@ -46,8 +46,6 @@ public object FailedSender : Sender.Def {
         toNewMember: Boolean,
         confirm: Boolean,
     ): Carrier<Boolean> = FalseCarrier
-
-    override fun sendGroupSign(group: String, title: String, message: String): Carrier<Boolean> = FalseCarrier
 }
 
 

diff --git a/core-api/api/src/main/java/love/forte/simbot/api/sender/WarnSender.kt b/core-api/api/src/main/java/love/forte/simbot/api/sender/WarnSender.kt
@@ -58,7 +58,4 @@ public object WarnSender : LogAble, Sender.Def {
         toNewMember: Boolean,
         confirm: Boolean,
     ): Carrier<Boolean> = apiWarn("sendGroupNotice") { null }.let { Carrier.empty() }
-
-    override fun sendGroupSign(group: String, title: String, message: String): Carrier<Boolean> =
-        apiWarn("sendGroupSign") { null }.let { Carrier.empty() }
-}
+}
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.5.1<!--v--></version>
+        <version>2.5.2<!--v--></version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/core-api/core/src/main/java/love/forte/simbot/core/filter/KeywordImpl.kt b/core-api/core/src/main/java/love/forte/simbot/core/filter/KeywordImpl.kt
@@ -42,6 +42,7 @@ internal object EmptyFilterParameterMatcher : FilterParameterMatcher {
     override fun getPattern(): Pattern = EmptyRegex.toPattern()
     override fun matches(text: String?): Boolean = false
     override fun getParam(name: String?, text: String?): String? = null
+    @Deprecated("Deprecated in Java", ReplaceWith("emptyMap()"))
     override fun getParams(text: String?): Map<String, String> = emptyMap()
     override fun getParameters(text: String?): FilterParameters = EmptyFilterParameters
 }

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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--v--></version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+    <version>2.5.2<!--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.5.1<!--v--></simbot.version>
+        <simbot.version>2.5.2<!--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.6.21</kotlin.version>
+        <kotlin.version>1.7.21</kotlin.version>
         <ktor.version>1.6.8</ktor.version>
-        <kotlinx.version>1.6.3</kotlinx.version>
-        <kotlinx-serialization.version>1.3.3</kotlinx-serialization.version>
+        <kotlinx.version>1.6.4</kotlinx.version>
+        <kotlinx-serialization.version>1.4.1</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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--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.5.1<!--v--></version>
+        <version>2.5.2<!--v--></version>
     </parent>
     <modelVersion>4.0.0</modelVersion>