update mirai

Author: lz1998

.gitignore

@@ -45,4 +45,5 @@ src/main/java/dto/
 
 
 device/
-.wakatime-project
+.wakatime-project
+bots.json

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.13"
+version = "0.0.14"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {
@@ -51,15 +51,16 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC")
 //    api("net.mamoe:mirai-core:2.0-M1-1")
-    implementation("net.mamoe:mirai-core-jvm:2.0-M2") {
-        exclude("net.mamoe","mirai-core-api")
-        exclude("net.mamoe","mirai-core-utils")
+    val miraiVersion="2.0-RC-dev-9"
+    implementation("net.mamoe", "mirai-core-jvm", miraiVersion) {
+        exclude("net.mamoe", "mirai-core-api")
+        exclude("net.mamoe", "mirai-core-utils")
     }
-    implementation("net.mamoe:mirai-core-api-jvm:2.0-M2") {
+    implementation("net.mamoe", "mirai-core-api-jvm", miraiVersion) {
         exclude("net.mamoe", "mirai-core-utils")
     }
+    implementation("net.mamoe", "mirai-core-utils-jvm", miraiVersion)
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm:1.0.1")
-    implementation("net.mamoe:mirai-core-utils-jvm:2.0-M2")
     implementation("com.squareup.okhttp3:okhttp:4.8.0")
 //    implementation("com.google.protobuf:protobuf-javalite:3.8.0")
 

src/main/kotlin/net/lz1998/mirai/utils/ApiHandler.kt

@@ -10,12 +10,12 @@ import net.mamoe.mirai.contact.Friend
 import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.contact.MemberPermission
 import net.mamoe.mirai.message.data.MessageSource.Key.recall
-import net.mamoe.mirai.message.data.asMessageChain
+import net.mamoe.mirai.message.data.toMessageChain
 
 
 suspend fun handleSendPrivateMsg(bot: Bot, req: BSendPrivateMsgReq): BSendPrivateMsgResp? {
     val contact = bot.getFriend(req.userId) ?: return null
-    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).asMessageChain()
+    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).toMessageChain()
     val messageSource = contact.sendMessage(messageChain).source
     val messageId = if (messageSource.ids.isNotEmpty()) messageSource.ids[0] else 0
     bot.messageSourceLru.put(messageId, messageSource)
@@ -24,7 +24,7 @@ suspend fun handleSendPrivateMsg(bot: Bot, req: BSendPrivateMsgReq): BSendPrivat
 
 suspend fun handleSendGroupMsg(bot: Bot, req: BSendGroupMsgReq): BSendGroupMsgResp? {
     val contact = bot.getGroup(req.groupId) ?: return null
-    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).asMessageChain()
+    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).toMessageChain()
     val messageSource = contact.sendMessage(messageChain).source
     val messageId = if (messageSource.ids.isNotEmpty()) messageSource.ids[0] else 0
     bot.messageSourceLru.put(messageId, messageSource)
@@ -43,7 +43,7 @@ suspend fun handleSendMsgReq(bot: Bot, req: BSendMsgReq): BSendMsgResp? {
             bot.getGroup(req.groupId) ?: bot.getFriend(req.userId)
         }
     } ?: return null
-    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).asMessageChain()
+    val messageChain = protoMessageToMiraiMessage(req.messageList, bot, contact, req.autoEscape).toMessageChain()
     val messageSource = contact.sendMessage(messageChain).source
     val messageId = if (messageSource.ids.isNotEmpty()) messageSource.ids[0] else 0
     bot.messageSourceLru.put(messageId, messageSource)

src/main/kotlin/net/lz1998/mirai/utils/MsgConverter.kt

@@ -151,7 +151,7 @@ suspend fun MessageChain.toRawMessage(): String {
 
 suspend fun MessageChain.toOnebotMessage(): List<BMessage> {
     val messageChain = mutableListOf<BMessage>()
-    this.forEachContent { content ->
+    this.forEach { content ->
         val message = when (content) {
             is At -> BMessage.newBuilder().setType("at").putAllData(mapOf("qq" to content.target.toString())).build()
             is PlainText -> BMessage.newBuilder().setType("text").putAllData(mapOf("text" to content.content)).build()