diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt index 1fb4c8db8..f8d014d3a 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt @@ -403,7 +403,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler { } - is ServerCatchaPacket.Encrypted -> socket.distributePacket(packet.decrypt()) + is ServerCaptchaPacket.Encrypted -> socket.distributePacket(packet.decrypt()) is ServerLoginResponseVerificationCodeInitPacket.Encrypted -> socket.distributePacket(packet.decrypt()) is ServerLoginResponseKeyExchangePacket.Encrypted -> socket.distributePacket(packet.decrypt(this.randomprivateKey)) is ServerLoginResponseSuccessPacket.Encrypted -> socket.distributePacket(packet.decrypt(this.randomprivateKey)) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt index 19ecb20f2..69e40c8a3 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ServerPacket.kt @@ -109,7 +109,7 @@ abstract class ServerPacket(val input: DataInputStream) : Packet { "00 58" -> ServerHeartbeatResponsePacket(stream) - "00 BA" -> ServerCatchaPacket.Encrypted(stream, idHex) + "00 BA" -> ServerCaptchaPacket.Encrypted(stream, idHex) "00 CE", "00 17" -> ServerEventPacket.Raw.Encrypted(stream, idHex.hexToBytes()) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt index 82d0f1dbe..996b16389 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt @@ -10,7 +10,6 @@ import java.io.DataInputStream /** * 客户端请求验证码图片数据的第几部分 */ - @PacketId("00 BA 31") class ClientVerificationCodeTransmissionRequestPacket( private val packetId: Int, @@ -47,7 +46,6 @@ class ClientVerificationCodeTransmissionRequestPacket( * 提交验证码 */ @PacketId("00 BA 32") - class ClientVerificationCodeSubmitPacket( private val packetIdLast: Int, private val qq: Long, @@ -94,7 +92,6 @@ class ClientVerificationCodeSubmitPacket( * 刷新验证码 */ @PacketId("00 BA 31") - class ClientVerificationCodeRefreshPacket( private val packetIdLast: Int, private val qq: Long, @@ -135,7 +132,7 @@ class ServerCaptchaWrongPacket(input: DataInputStream, dataSize: Int, packetId: * @author Him188moe */ @PacketId("00 BA 31") -open class ServerCaptchaTransmissionPacket(input: DataInputStream, private val dataSize: Int, private val packetId: ByteArray) : ServerCatchaPacket(input) { +open class ServerCaptchaTransmissionPacket(input: DataInputStream, private val dataSize: Int, private val packetId: ByteArray) : ServerCaptchaPacket(input) { lateinit var captchaSectionN: ByteArray lateinit var verificationToken: ByteArray//56bytes @@ -178,7 +175,7 @@ fun main() { * @author Him188moe */ @PacketId("00 BA 32") -class ServerCaptchaCorrectPacket(input: DataInputStream) : ServerCatchaPacket(input) { +class ServerCaptchaCorrectPacket(input: DataInputStream) : ServerCaptchaPacket(input) { lateinit var token00BA: ByteArray//56 bytes @@ -188,12 +185,12 @@ class ServerCaptchaCorrectPacket(input: DataInputStream) : ServerCatchaPacket(in } } -abstract class ServerCatchaPacket(input: DataInputStream) : ServerPacket(input) { +abstract class ServerCaptchaPacket(input: DataInputStream) : ServerPacket(input) { @PacketId("00 BA") class Encrypted(input: DataInputStream, private val id: String) : ServerPacket(input) { - fun decrypt(): ServerCatchaPacket { + fun decrypt(): ServerCaptchaPacket { this.input goto 14 val data = TEA.decrypt(this.input.readAllBytes().cutTail(1), TIMProtocol.key00BA.hexToBytes()) if (id.startsWith("00 BA 32")) {