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

Message receiver is working!

Browse Source
This commit is contained in:
Him188moe 2019-09-01 00:04:50 +08:00
parent 0dbcd18ce8
commit 418f95db65
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt
View File

@ -232,10 +232,14 @@ class RobotNetworkHandler(val number: Int, private val password: String) {
//group message //group message
} }
is ServerUnknownEventPacket -> { is UnknownServerEventPacket -> {
//unknown message event //unknown message event
} }
is UnknownServerPacket -> {
}
is ServerVerificationCodePacketEncrypted -> onPacketReceived(packet.decrypt(this.token00BA)) is ServerVerificationCodePacketEncrypted -> onPacketReceived(packet.decrypt(this.token00BA))
is ServerLoginResponseVerificationCodePacketEncrypted -> onPacketReceived(packet.decrypt()) is ServerLoginResponseVerificationCodePacketEncrypted -> onPacketReceived(packet.decrypt())
is ServerLoginResponseResendPacketEncrypted -> onPacketReceived(packet.decrypt(this.tgtgtKey!!)) is ServerLoginResponseResendPacketEncrypted -> onPacketReceived(packet.decrypt(this.tgtgtKey!!))

6
mirai-core/src/main/java/net/mamoe/mirai/network/packet/MessageEvent.kt
View File

@ -29,7 +29,7 @@ open class ClientMessageResponsePacket(
/** /**
* 群聊和好友消息分析 * 群聊和好友消息分发
*/ */
@PacketId("00 17") @PacketId("00 17")
class ServerMessageEventPacketRaw( class ServerMessageEventPacketRaw(
@ -61,11 +61,11 @@ class ServerMessageEventPacketRaw(
//"02 10", "00 12" -> ServerUnknownEventPacket(this.input, packetId, eventIdentity) //"02 10", "00 12" -> ServerUnknownEventPacket(this.input, packetId, eventIdentity)
else -> ServerUnknownEventPacket(this.input, packetId, eventIdentity) else -> UnknownServerEventPacket(this.input, packetId, eventIdentity)
} }
} }
class ServerUnknownEventPacket(input: DataInputStream, packetId: ByteArray, eventIdentity: ByteArray) : ServerEventPacket(input, packetId, eventIdentity) class UnknownServerEventPacket(input: DataInputStream, packetId: ByteArray, eventIdentity: ByteArray) : ServerEventPacket(input, packetId, eventIdentity)
@PacketId("00 17") @PacketId("00 17")
class ServerMessageEventPacketRawEncoded(input: DataInputStream, val packetId: ByteArray) : ServerPacket(input) { class ServerMessageEventPacketRawEncoded(input: DataInputStream, val packetId: ByteArray) : ServerPacket(input) {

3
mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
View File

@ -1,5 +1,6 @@
package net.mamoe.mirai.network.packet package net.mamoe.mirai.network.packet
import net.mamoe.mirai.util.toUHexString
import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.MiraiLogger
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.DataInputStream import java.io.DataInputStream
@ -55,6 +56,8 @@ class ServerGroupMessageEventPacket(input: DataInputStream, packetId: ByteArray,
group = this.input.goto(51).readInt() group = this.input.goto(51).readInt()
qq = this.input.goto(56).readInt() qq = this.input.goto(56).readInt()
val fontLength = this.input.goto(108).readShort() val fontLength = this.input.goto(108).readShort()
println(this.input.goto(110 + fontLength).readNBytes(2).toUHexString())
messageType = when (val id = this.input.goto(110 + fontLength + 2).readByte().toInt()) { messageType = when (val id = this.input.goto(110 + fontLength + 2).readByte().toInt()) {
19 -> MessageType.NORMAL 19 -> MessageType.NORMAL
14 -> MessageType.XML 14 -> MessageType.XML