update

Author: lz1998

build.gradle.kts

@@ -51,14 +51,14 @@ 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-dev-4") {
+    implementation("net.mamoe:mirai-core-jvm:2.0-M2") {
         exclude("net.mamoe","mirai-core-api")
         exclude("net.mamoe","mirai-core-utils")
     }
-    implementation("net.mamoe:mirai-core-api-jvm:2.0-M2-dev-4") {
+    implementation("net.mamoe:mirai-core-api-jvm:2.0-M2") {
         exclude("net.mamoe", "mirai-core-utils")
     }
-    implementation("net.mamoe:mirai-core-utils-jvm:2.0-M2-dev-4")
+    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")
 

onebot_idl

@@ -13,14 +13,9 @@ import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent
 import net.mamoe.mirai.event.events.MemberJoinRequestEvent
 import net.mamoe.mirai.event.events.NewFriendRequestEvent
-import net.mamoe.mirai.event.subscribeAlways
-import net.mamoe.mirai.newBot
-import net.mamoe.mirai.utils.BotConfiguration
 import okhttp3.*
-import okhttp3.internal.ws.WebSocketProtocol
 import okio.ByteString
 import okio.ByteString.Companion.toByteString
-import java.lang.Thread.sleep
 import java.util.concurrent.TimeUnit
 
 class WebsocketBotClient(override var botId: Long, override var password: String, wsUrl: String) : RemoteBot {
@@ -114,26 +109,26 @@ class WebsocketBotClient(override var botId: Long, override var password: String
         wsClient = httpClient.newWebSocket(wsRequest, wsListener)
         bot = BotFactory.newBot(botId, password) {
 //            fileStrBasedDeviceInfo("device/${botId}.json")
-            fileBasedDeviceInfo("device/${botId}.json")
+            fileBasedDeviceInfo("device/bot-${botId}.json")
 //            protocol=BotConfiguration.MiraiProtocol.ANDROID_WATCH
             loginSolver = MyLoginSolver
 //            noNetworkLog()
         }.alsoLogin()
-        bot.subscribeAlways<BotEvent> {
+        bot.eventChannel.subscribeAlways<BotEvent> {
             onBotEvent(this)
         }
-        bot.subscribeAlways<net.mamoe.mirai.event.events.MessageEvent> {
+        bot.eventChannel.subscribeAlways<net.mamoe.mirai.event.events.MessageEvent> {
             val messageSource = this.source // 撤回消息用
             val messageId = if (messageSource.ids.isNotEmpty()) messageSource.ids[0] else 0
             bot.messageSourceLru.put(messageId, messageSource)
         }
-        bot.subscribeAlways<MemberJoinRequestEvent> {
+        bot.eventChannel.subscribeAlways<MemberJoinRequestEvent> {
             bot.groupRequestLru.put(it.eventId, it)
         }
-        bot.subscribeAlways<BotInvitedJoinGroupRequestEvent> {
+        bot.eventChannel.subscribeAlways<BotInvitedJoinGroupRequestEvent> {
             bot.botInvitedGroupRequestLru.put(it.eventId, it)
         }
-        bot.subscribeAlways<NewFriendRequestEvent> {
+        bot.eventChannel.subscribeAlways<NewFriendRequestEvent> {
             bot.friendRequestLru.put(it.eventId, it)
         }
     }

src/main/kotlin/net/lz1998/mirai/entity/WebSocketBotClient.kt

@@ -9,8 +9,6 @@ import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Friend
 import net.mamoe.mirai.contact.Member
 import net.mamoe.mirai.contact.MemberPermission
-import net.mamoe.mirai.getFriendOrNull
-import net.mamoe.mirai.getGroupOrNull
 import net.mamoe.mirai.message.data.MessageSource.Key.recall
 import net.mamoe.mirai.message.data.asMessageChain
 
@@ -107,8 +105,8 @@ suspend fun handleGetMsg(bot: Bot, req: BGetMsgReq): BGetMsgResp? {
 
 suspend fun handleSetGroupKick(bot: Bot, req: BSetGroupKickReq): BSetGroupKickResp? {
     val group = bot.getGroup(req.groupId) ?: return null
-    val member = group.get(req.userId) ?: return null
-    member.kick()
+    val member = group[req.userId] ?: return null
+    member.kick("")
     return BSetGroupKickResp.newBuilder().build()
 }
 

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

@@ -6,12 +6,11 @@ import net.lz1998.mirai.alias.BMessage
 import net.lz1998.mirai.ext.messageSourceLru
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Contact
+import net.mamoe.mirai.contact.Contact.Companion.uploadImage
 import net.mamoe.mirai.contact.Group
-import net.mamoe.mirai.getGroupOrNull
 import net.mamoe.mirai.message.data.*
 import net.mamoe.mirai.message.data.Image.Key.queryUrl
-import net.mamoe.mirai.utils.uploadAsGroupVoice
-import net.mamoe.mirai.utils.uploadAsImage
+import net.mamoe.mirai.utils.ExternalResource.Companion.toExternalResource
 import java.net.URL
 import javax.xml.parsers.DocumentBuilderFactory
 
@@ -50,8 +49,8 @@ fun protoTextToMiraiText(dataMap: Map<String, String>): Message {
 suspend fun protoImageToMiraiImage(dataMap: Map<String, String>, contact: Contact): Message {
     return try {
         withContext(Dispatchers.IO) {
-            val img = URL(dataMap["url"] ?: dataMap["file"]
-            ?: "").openConnection().getInputStream().uploadAsImage(contact)
+            val img = contact.uploadImage(URL(dataMap["url"] ?: dataMap["file"]
+            ?: "").openConnection().getInputStream())
             if (dataMap["type"] == "flash") img.flash() else img
         }
     } catch (e: Exception) {
@@ -63,7 +62,7 @@ fun protoAtToMiraiAt(dataMap: Map<String, String>, bot: Bot, contact: Contact):
     return if (dataMap["qq"] == "all")
         AtAll
     else
-        dataMap["qq"]?.toLong()?.let { userId -> bot.getGroupOrNull(contact.id)?.getOrNull(userId)?.let { At(it) } }
+        dataMap["qq"]?.toLong()?.let { userId -> bot.getGroup(contact.id)?.get(userId)?.let { At(it) } }
                 ?: MSG_EMPTY
 }
 
@@ -77,7 +76,7 @@ suspend fun protoVoiceToMiraiVoice(dataMap: Map<String, String>, contact: Contac
             val url = dataMap["url"] ?: return MSG_EMPTY
             return try {
                 withContext(Dispatchers.IO) {
-                    URL(url).openStream().uploadAsGroupVoice(contact)
+                    contact.uploadVoice(URL(url).openStream().toExternalResource())
                 }
             } catch (e: Exception) {
                 MSG_EMPTY