From c5d7c9ca8c81b2bddc250090739d7c7d0c110328 Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Sat, 11 Feb 2023 00:20:27 +0800 Subject: [PATCH] release: v2.5.2 --- component/component-ding/pom.xml | 2 +- component/component-kaiheila-parent/pom.xml | 2 +- component/component-lovelycat-httpapi/pom.xml | 2 +- component/component-mirai/pom.xml | 4 ++-- .../component/mirai/message/result/MiraiAuthInfo.kt | 4 ---- .../simbot/component/mirai/sender/MiraiSenderUtil.kt | 4 ++-- component/pom.xml | 2 +- core-api/api/pom.xml | 2 +- .../love/forte/simbot/api/message/results/AuthInfo.kt | 6 ++---- .../java/love/forte/simbot/api/sender/FailedSender.kt | 2 -- .../java/love/forte/simbot/api/sender/WarnSender.kt | 5 +---- core-api/core/pom.xml | 2 +- .../java/love/forte/simbot/core/filter/KeywordImpl.kt | 1 + http/client-core/pom.xml | 2 +- http/client-ktor/pom.xml | 2 +- http/client-restTemplate/pom.xml | 2 +- http/pom.xml | 2 +- parent/pom.xml | 10 +++++----- pom.xml | 2 +- serialization/json-core/pom.xml | 2 +- serialization/json-fastjson/pom.xml | 2 +- serialization/json-jackson/pom.xml | 2 +- serialization/json-moshi/pom.xml | 2 +- serialization/pom.xml | 2 +- simbot-x/plugin-core/pom.xml | 2 +- .../pom.xml | 2 +- .../component-mirai-spring-boot-starter/pom.xml | 2 +- spring-boot-starter/core-spring-boot-starter/pom.xml | 2 +- spring-boot-starter/pom.xml | 2 +- time-task/pom.xml | 2 +- time-task/time-task-core/pom.xml | 2 +- time-task/time-task-quartz/pom.xml | 2 +- 32 files changed, 37 insertions(+), 47 deletions(-) diff --git a/component/component-ding/pom.xml b/component/component-ding/pom.xml index ab79b421..f9a45326 100644 --- a/component/component-ding/pom.xml +++ b/component/component-ding/pom.xml @@ -19,7 +19,7 @@ component-parent love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/component/component-kaiheila-parent/pom.xml b/component/component-kaiheila-parent/pom.xml index a22c6201..d01bae71 100644 --- a/component/component-kaiheila-parent/pom.xml +++ b/component/component-kaiheila-parent/pom.xml @@ -5,7 +5,7 @@ component-parent love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml diff --git a/component/component-lovelycat-httpapi/pom.xml b/component/component-lovelycat-httpapi/pom.xml index b840fbad..9c421257 100644 --- a/component/component-lovelycat-httpapi/pom.xml +++ b/component/component-lovelycat-httpapi/pom.xml @@ -5,7 +5,7 @@ component-parent love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/component/component-mirai/pom.xml b/component/component-mirai/pom.xml index 941015c4..059321cd 100644 --- a/component/component-mirai/pom.xml +++ b/component/component-mirai/pom.xml @@ -5,7 +5,7 @@ love.forte.simple-robot component-parent - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 @@ -22,7 +22,7 @@ https://github.com/ForteScarlet/simpler-robot/tree/dev/component/component-mirai - 2.13.2 + 2.14.0 diff --git a/component/component-mirai/src/main/java/love/forte/simbot/component/mirai/message/result/MiraiAuthInfo.kt b/component/component-mirai/src/main/java/love/forte/simbot/component/mirai/message/result/MiraiAuthInfo.kt index 61182909..9d305e81 100644 --- a/component/component-mirai/src/main/java/love/forte/simbot/component/mirai/message/result/MiraiAuthInfo.kt +++ b/component/component-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/component-mirai/src/main/java/love/forte/simbot/component/mirai/sender/MiraiSenderUtil.kt b/component/component-mirai/src/main/java/love/forte/simbot/component/mirai/sender/MiraiSenderUtil.kt index 8a0abf9c..8eaebb77 100644 --- a/component/component-mirai/src/main/java/love/forte/simbot/component/mirai/sender/MiraiSenderUtil.kt +++ b/component/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 index d7b206f4..2a08fc9d 100644 --- a/component/pom.xml +++ b/component/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/core-api/api/pom.xml b/core-api/api/pom.xml index 2c7aac59..a408f38e 100644 --- a/core-api/api/pom.xml +++ b/core-api/api/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../../pom.xml 4.0.0 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 index 3e9bedbf..20b370f0 100644 --- 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 index b8409d8c..442eb91e 100644 --- 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 = FalseCarrier - - override fun sendGroupSign(group: String, title: String, message: String): Carrier = 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 index 5407aecd..614d5590 100644 --- 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 = apiWarn("sendGroupNotice") { null }.let { Carrier.empty() } - - override fun sendGroupSign(group: String, title: String, message: String): Carrier = - apiWarn("sendGroupSign") { null }.let { Carrier.empty() } -} \ No newline at end of file +} diff --git a/core-api/core/pom.xml b/core-api/core/pom.xml index 5825bede..d4d789a9 100644 --- a/core-api/core/pom.xml +++ b/core-api/core/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../../pom.xml 4.0.0 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 index bc892efa..f53633a6 100644 --- 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 = emptyMap() override fun getParameters(text: String?): FilterParameters = EmptyFilterParameters } diff --git a/http/client-core/pom.xml b/http/client-core/pom.xml index 4d160128..2ce1d57a 100644 --- a/http/client-core/pom.xml +++ b/http/client-core/pom.xml @@ -5,7 +5,7 @@ http-parent love.forte.simple-robot.http - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/http/client-ktor/pom.xml b/http/client-ktor/pom.xml index 2d2cd3c2..c2979d12 100644 --- a/http/client-ktor/pom.xml +++ b/http/client-ktor/pom.xml @@ -5,7 +5,7 @@ http-parent love.forte.simple-robot.http - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/http/client-restTemplate/pom.xml b/http/client-restTemplate/pom.xml index 3c37b029..184eabcf 100644 --- a/http/client-restTemplate/pom.xml +++ b/http/client-restTemplate/pom.xml @@ -6,7 +6,7 @@ http-parent love.forte.simple-robot.http - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/http/pom.xml b/http/pom.xml index 761c30a3..6f472666 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -6,7 +6,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/parent/pom.xml b/parent/pom.xml index ea9df36e..e9481f6d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -6,7 +6,7 @@ love.forte.simple-robot parent - 2.5.1 + 2.5.2 pom @@ -23,7 +23,7 @@ simple-robot是一个通用bot开发框架，以同一种灵活的标准来编写不同平台的bot应用。而simpler-robot便是simple-robot 2.x版本命名。 - 2.5.1 + 2.5.2 0.0.1-ALPHA.1 8 @@ -34,10 +34,10 @@ utf-8 - 1.6.21 + 1.7.21 1.6.8 - 1.6.3 - 1.3.3 + 1.6.4 + 1.4.1 1.8 true diff --git a/pom.xml b/pom.xml index 5862b6af..7b659d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ love.forte.simple-robot parent - 2.5.1 + 2.5.2 ./parent/pom.xml diff --git a/serialization/json-core/pom.xml b/serialization/json-core/pom.xml index 30c8698c..0a9f275b 100644 --- a/serialization/json-core/pom.xml +++ b/serialization/json-core/pom.xml @@ -5,7 +5,7 @@ serialization-parent love.forte.simple-robot.serialization - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/serialization/json-fastjson/pom.xml b/serialization/json-fastjson/pom.xml index b326ba1b..9682319d 100644 --- a/serialization/json-fastjson/pom.xml +++ b/serialization/json-fastjson/pom.xml @@ -5,7 +5,7 @@ serialization-parent love.forte.simple-robot.serialization - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/serialization/json-jackson/pom.xml b/serialization/json-jackson/pom.xml index ea3f26c8..900f821c 100644 --- a/serialization/json-jackson/pom.xml +++ b/serialization/json-jackson/pom.xml @@ -5,7 +5,7 @@ serialization-parent love.forte.simple-robot.serialization - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/serialization/json-moshi/pom.xml b/serialization/json-moshi/pom.xml index 325773c4..23382c21 100644 --- a/serialization/json-moshi/pom.xml +++ b/serialization/json-moshi/pom.xml @@ -5,7 +5,7 @@ serialization-parent love.forte.simple-robot.serialization - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/serialization/pom.xml b/serialization/pom.xml index 339c20f1..4516edb8 100644 --- a/serialization/pom.xml +++ b/serialization/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/simbot-x/plugin-core/pom.xml b/simbot-x/plugin-core/pom.xml index 028e78e1..6403cdc1 100644 --- a/simbot-x/plugin-core/pom.xml +++ b/simbot-x/plugin-core/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../../pom.xml 4.0.0 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 index 11eff55a..ec61caa2 100644 --- 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 @@ spring-boot-starter love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/spring-boot-starter/component-mirai-spring-boot-starter/pom.xml b/spring-boot-starter/component-mirai-spring-boot-starter/pom.xml index 7f5f8ecd..118b4955 100644 --- 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 @@ spring-boot-starter love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/spring-boot-starter/core-spring-boot-starter/pom.xml b/spring-boot-starter/core-spring-boot-starter/pom.xml index dc6c075c..4a0c0be8 100644 --- a/spring-boot-starter/core-spring-boot-starter/pom.xml +++ b/spring-boot-starter/core-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ spring-boot-starter love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml index 0f2a4619..a861b6e0 100644 --- a/spring-boot-starter/pom.xml +++ b/spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 ../pom.xml 4.0.0 diff --git a/time-task/pom.xml b/time-task/pom.xml index 570341a8..0621ee2a 100644 --- a/time-task/pom.xml +++ b/time-task/pom.xml @@ -5,7 +5,7 @@ project love.forte.simple-robot - 2.5.1 + 2.5.2 4.0.0 diff --git a/time-task/time-task-core/pom.xml b/time-task/time-task-core/pom.xml index 620da26c..bcdc2afe 100644 --- a/time-task/time-task-core/pom.xml +++ b/time-task/time-task-core/pom.xml @@ -6,7 +6,7 @@ time-task-parent love.forte.simple-robot.time-task - 2.5.1 + 2.5.2 4.0.0 diff --git a/time-task/time-task-quartz/pom.xml b/time-task/time-task-quartz/pom.xml index 9185c85f..d9f301f2 100644 --- a/time-task/time-task-quartz/pom.xml +++ b/time-task/time-task-quartz/pom.xml @@ -5,7 +5,7 @@ time-task-parent love.forte.simple-robot.time-task - 2.5.1 + 2.5.2 4.0.0