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

Remove unnecessary prints

Browse Source
This commit is contained in:
Him188 2019-12-15 15:13:10 +08:00
parent 796b1ca7c8
commit 50e9dac339
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/MessageEvent.kt
View File

@ -17,7 +17,10 @@ import net.mamoe.mirai.network.protocol.tim.packet.PacketVersion
import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink
import net.mamoe.mirai.utils.* import net.mamoe.mirai.utils.*
import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
import net.mamoe.mirai.utils.io.* import net.mamoe.mirai.utils.io.printTLVMap
import net.mamoe.mirai.utils.io.read
import net.mamoe.mirai.utils.io.readTLVMap
import net.mamoe.mirai.utils.io.readUShortLVByteArray
import net.mamoe.mirai.withSession import net.mamoe.mirai.withSession
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
@ -140,42 +143,42 @@ internal object GroupMessageEventParserAndHandler : KnownEventParserAndHandler<G
readUShortLVByteArray() readUShortLVByteArray()
discardExact(2)//2个0x00 discardExact(2)//2个0x00
with(this.debugPrint("群消息")) { //debugPrintIfFail {
val message = readMessageChain() val message = readMessageChain()
var senderPermission: MemberPermission = MemberPermission.MEMBER var senderPermission: MemberPermission = MemberPermission.MEMBER
var senderName = "" var senderName = ""
val map = readTLVMap(true) val map = readTLVMap(true)
if (map.containsKey(18u)) { if (map.containsKey(18u)) {
map.getValue(18u).read { map.getValue(18u).read {
val tlv = readTLVMap(true) val tlv = readTLVMap(true)
senderPermission = when (tlv.takeIf { it.containsKey(0x04u) }?.get(0x04u)?.getOrNull(3)?.toUInt()) { senderPermission = when (tlv.takeIf { it.containsKey(0x04u) }?.get(0x04u)?.getOrNull(3)?.toUInt()) {
null -> MemberPermission.MEMBER null -> MemberPermission.MEMBER
0x08u -> MemberPermission.OWNER 0x08u -> MemberPermission.OWNER
0x10u -> MemberPermission.ADMINISTRATOR 0x10u -> MemberPermission.ADMINISTRATOR
else -> { else -> {
tlv.printTLVMap("TLV(tag=18) Map") tlv.printTLVMap("TLV(tag=18) Map")
MiraiLogger.warning("Could not determine member permission, default permission MEMBER is being used") MiraiLogger.warning("Could not determine member permission, default permission MEMBER is being used")
MemberPermission.MEMBER MemberPermission.MEMBER
}
} }
}
senderName = when { senderName = when {
tlv.containsKey(0x01u) -> String(tlv.getValue(0x01u))//这个人的qq昵称 tlv.containsKey(0x01u) -> String(tlv.getValue(0x01u))//这个人的qq昵称
tlv.containsKey(0x02u) -> String(tlv.getValue(0x02u))//这个人的群名片 tlv.containsKey(0x02u) -> String(tlv.getValue(0x02u))//这个人的群名片
else -> { else -> {
tlv.printTLVMap("TLV(tag=18) Map") tlv.printTLVMap("TLV(tag=18) Map")
MiraiLogger.warning("Could not determine senderName") MiraiLogger.warning("Could not determine senderName")
"null" "null"
}
} }
} }
} }
val group = bot.getGroup(groupNumber)
return GroupMessage(group, senderName, senderPermission, group.getMember(qq), message).apply { this.botVar = bot }
} }
val group = bot.getGroup(groupNumber)
return GroupMessage(group, senderName, senderPermission, group.getMember(qq), message).apply { this.botVar = bot }
// }
} }
} }