github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 07:30:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #856, also fix wrong comment in PbPushTransMsg.kt (#859)

Browse Source
This commit is contained in:
sandtechnology 2021-01-13 21:46:16 +08:00 committed by GitHub
parent 72ca12a347
commit 3cc3f52e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/receive/MessageSvc.PbGetMsg.kt
View File

@ -244,7 +244,7 @@ internal suspend fun MsgComm.Msg.transform(bot: QQAndroidBot, fromSync: Boolean
when (msgHead.msgType) {
33 -> bot.groupListModifyLock.withLock {
msgBody.msgContent.read {
val groupUin = readUInt().toLong()
val groupUin = Mirai.calculateGroupUinByGroupCode(readUInt().toLong())
val group = bot.getGroupByUinOrNull(groupUin) ?: bot.createGroupForBot(groupUin) ?: return null
discardExact(1)
val joinedMemberUin = readUInt().toLong()

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/receive/OnlinePush.PbPushTransMsg.kt
View File

@ -209,7 +209,7 @@ internal object OnlinePushPbPushTransMsg :
A8 32 51 A1
83 3E 03 3F A2 06 B4 B4 BD A8 D5 DF 00 30 39 32 46 45 30 36 31 41 33 37 36 43 44 35 37 35 37 39 45 37 32 34 44 37 37 30 36 46 39 39 43 35 35 33 33 31 34 44 32 44 46 35 45 42 43 31 31 36
*/
readUInt().toLong() // groupUin
readUInt().toLong() // groupCode
readByte().toInt() // follow type
val target = readUInt().toLong()
val type = readUByte().toInt()