Commit d16a6998 authored by Him188's avatar Him188

Fix `BotFaceChangedEvent`, Add `FriendFaceChangedEvent`

parent 6db2c23a
...@@ -493,8 +493,13 @@ private object Transformers528 : Map<Long, MsgType0x210.(QQAndroidBot) -> Sequen ...@@ -493,8 +493,13 @@ private object Transformers528 : Map<Long, MsgType0x210.(QQAndroidBot) -> Sequen
} ?: emptySequence() } ?: emptySequence()
} }
fun ModCustomFace.transform(): Sequence<Packet> = fun ModCustomFace.transform(bot: QQAndroidBot): Sequence<Packet> {
sequenceOf(BotFaceChangedEvent(Bot.getInstance(uin))) if (uin == bot.id) {
return sequenceOf(BotFaceChangedEvent(bot))
}
val friend = bot.getFriendOrNull(uin) ?: return emptySequence()
return sequenceOf(FriendFaceChangedEvent(friend))
}
return@lambda528 vProtobuf.loadAs(SubMsgType0x27MsgBody.serializer()).msgModInfos.asSequence() return@lambda528 vProtobuf.loadAs(SubMsgType0x27MsgBody.serializer()).msgModInfos.asSequence()
...@@ -504,7 +509,7 @@ private object Transformers528 : Map<Long, MsgType0x210.(QQAndroidBot) -> Sequen ...@@ -504,7 +509,7 @@ private object Transformers528 : Map<Long, MsgType0x210.(QQAndroidBot) -> Sequen
it.msgDelFriend != null -> it.msgDelFriend.transform(bot) it.msgDelFriend != null -> it.msgDelFriend.transform(bot)
it.msgModGroupProfile != null -> it.msgModGroupProfile.transform(bot) it.msgModGroupProfile != null -> it.msgModGroupProfile.transform(bot)
it.msgModGroupMemberProfile != null -> it.msgModGroupMemberProfile.transform(bot) it.msgModGroupMemberProfile != null -> it.msgModGroupMemberProfile.transform(bot)
it.msgModCustomFace != null -> it.msgModCustomFace.transform() it.msgModCustomFace != null -> it.msgModCustomFace.transform(bot)
else -> { else -> {
bot.network.logger.debug { bot.network.logger.debug {
"Transformers528 0x27L: new data: ${it._miraiContentToString()}" "Transformers528 0x27L: new data: ${it._miraiContentToString()}"
......
...@@ -95,6 +95,13 @@ data class BotFaceChangedEvent( ...@@ -95,6 +95,13 @@ data class BotFaceChangedEvent(
override val bot: Bot override val bot: Bot
) : BotEvent, Packet, AbstractEvent() ) : BotEvent, Packet, AbstractEvent()
/**
* [Friend] 头像被修改
*/
data class FriendFaceChangedEvent(
override val friend: Friend
) : FriendEvent, Packet, AbstractEvent()
// endregion // endregion
// region 消息 // region 消息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment