From 63b69df3ea11ea3bb6567e90818002e44d137a3d Mon Sep 17 00:00:00 2001 From: MrXiaoM Date: Thu, 8 Feb 2024 14:51:14 +0800 Subject: [PATCH] fix missing `guild_id` and `channel_id` --- .../shamrock/remote/service/api/GlobalEventTransmitter.kt | 2 ++ .../fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt index 97e2e963..9eb548c8 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt @@ -172,6 +172,8 @@ internal object GlobalEventTransmitter: BaseSvc() { postType = postType, messageType = MsgType.Guild, subType = MsgSubType.Channel, + guildId = record.guildId, + channelId = record.channelId, messageId = msgHash, targetId = record.peerUin, peerId = botUin, diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt index 1c4fc946..68575247 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt @@ -53,6 +53,8 @@ internal data class MessageEvent ( @SerialName("sub_type") val subType: MsgSubType, @SerialName("message_id") val messageId: Int, @SerialName("group_id") val groupId: Long = 0, + @SerialName("guild_id") val guildId: String? = null, + @SerialName("channel_id") val channelId: String? = null, @SerialName("target_id") val targetId: Long = 0, @SerialName("peer_id") val peerId: Long, @SerialName("user_id") val userId: Long,