image url

Author: lz1998

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "net.lz1998"
-version = "0.0.7"
+version = "0.0.8"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 configurations {

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

@@ -17,5 +17,5 @@ interface RemoteBot {
     suspend fun onRemoteApi(req: BFrame): BFrame
 
     // 收到机器人事件
-    fun onBotEvent(botEvent: BotEvent)
+    suspend fun onBotEvent(botEvent: BotEvent)
 }

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

@@ -151,7 +151,7 @@ class WebsocketBotClient(override var botId: Long, override var password: String
         return respBuilder.build()
     }
 
-    override fun onBotEvent(botEvent: BotEvent) {
+    override suspend fun onBotEvent(botEvent: BotEvent) {
         val eventFrame = botEvent.toFrame() ?: return
         // TODO 写二进制还是json？配置
         val ok = wsClient.send(eventFrame.toByteArray().toByteString())

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

@@ -5,15 +5,15 @@ import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.message.*
 import net.mamoe.mirai.message.data.*
 
-fun BotEvent.toFrame(): BFrame? = when (this) {
+suspend fun BotEvent.toFrame(): BFrame? = when (this) {
     is GroupMessageEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is FriendMessageEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is MemberJoinEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     is MemberLeaveEvent -> this.toProtoMessage().toProtoFrame(this.bot.id)
     else -> null
 }
 
-fun GroupMessageEvent.toProtoMessage(): BGroupMessageEvent {
+suspend fun GroupMessageEvent.toProtoMessage(): BGroupMessageEvent {
     val sender = BGroupMessageSender.newBuilder()
             .setUserId(this.sender.id)
             .setNickname(this.sender.nick)
@@ -43,7 +43,7 @@ fun GroupMessageEvent.toProtoMessage(): BGroupMessageEvent {
             .build()
 }
 
-fun FriendMessageEvent.toProtoMessage(): BPrivateMessageEvent {
+suspend fun FriendMessageEvent.toProtoMessage(): BPrivateMessageEvent {
     val sender = BPrivateMessageSender.newBuilder()
             .setUserId(this.sender.id)
             .setNickname(this.sender.nick)

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

@@ -43,14 +43,14 @@ fun MessageChain.toRawMessage(): String {
     return rawMessage
 }
 
-fun MessageChain.toOnebotMessage(): List<BMessage> {
+suspend fun MessageChain.toOnebotMessage(): List<BMessage> {
     val messageChain = mutableListOf<BMessage>()
     this.forEachContent { 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()
             is Face -> BMessage.newBuilder().setType("face").putAllData(mapOf("id" to content.id.toString())).build()
-            is Image -> BMessage.newBuilder().setType("image").putAllData(mapOf("file" to content.imageId)).build()
+            is Image -> BMessage.newBuilder().setType("image").putAllData(mapOf("file" to content.queryUrl())).build()
             is Voice -> BMessage.newBuilder().setType("record").putAllData(mapOf("file" to content.fileName)).build()
             else -> BMessage.newBuilder().setType("unknown").build()
         }