github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-12 14:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change friend list on FriendDeleteEvent

Browse Source
This commit is contained in:
Him188 2020-04-10 19:02:38 +08:00
parent 918ede1fa6
commit c65350e9cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View File

@ -410,13 +410,14 @@ internal class OnlinePush {
} }
} }
println(msg._miraiContentToString()) bot.network.logger.debug { msg._miraiContentToString() }
return@lambda528 emptySequence() return@lambda528 emptySequence()
}, },
0x27L to lambda528 { bot -> 0x27L to lambda528 { bot ->
fun Submsgtype0x27.SubMsgType0x27.ModFriendRemark.transform(bot: QQAndroidBot): Sequence<Packet> { fun Submsgtype0x27.SubMsgType0x27.ModFriendRemark.transform(bot: QQAndroidBot): Sequence<Packet> {
return this.msgFrdRmk?.asSequence()?.mapNotNull { return this.msgFrdRmk?.asSequence()?.mapNotNull {
val friend = bot.getFriendOrNull(it.fuin) ?: return@mapNotNull null val friend = bot.getFriendOrNull(it.fuin) ?: return@mapNotNull null
// TODO: 2020/4/10 ADD REMARK QUERY
FriendRemarkChangeEvent(bot, friend, it.rmkName) FriendRemarkChangeEvent(bot, friend, it.rmkName)
} ?: emptySequence() } ?: emptySequence()
} }
@ -424,7 +425,9 @@ internal class OnlinePush {
fun Submsgtype0x27.SubMsgType0x27.DelFriend.transform(bot: QQAndroidBot): Sequence<Packet> { fun Submsgtype0x27.SubMsgType0x27.DelFriend.transform(bot: QQAndroidBot): Sequence<Packet> {
return this.uint64Uins?.asSequence()?.mapNotNull { return this.uint64Uins?.asSequence()?.mapNotNull {
val friend = bot.getFriendOrNull(it) ?: return@mapNotNull null val friend = bot.getFriendOrNull(it) ?: return@mapNotNull null
if (bot.friends.delegate.remove(friend)) {
FriendDeleteEvent(friend) FriendDeleteEvent(friend)
} else null
} ?: emptySequence() } ?: emptySequence()
} }