From a42218b851d84a1c3fb85734cfb32deaf6501c4c Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Sun, 5 Mar 2023 18:22:25 +0800 Subject: [PATCH] fix oicq subcmd 7 tlv --- client/builders.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/builders.go b/client/builders.go index d1609e0f..ec66a74c 100644 --- a/client/builders.go +++ b/client/builders.go @@ -347,7 +347,7 @@ func (c *QQClient) buildSMSRequestPacket() (uint16, []byte) { func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) { seq := c.nextSeq() - req := c.buildOicqRequestPacket(c.Uin, 0x0810, &oicq.TLV{ + t := &oicq.TLV{ Command: 7, List: [][]byte{ tlv.T8(2052), @@ -358,7 +358,11 @@ func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) { tlv.T401(c.sig.G), tlv.T198(), }, - }) + } + if warpper.DandelionEnergy != nil { + t.Append(tlv.T544(uint64(c.Uin), "810_7", 7, c.version().SdkVersion, c.Device().Guid, warpper.DandelionEnergy)) + } + req := c.buildOicqRequestPacket(c.Uin, 0x0810, t) r := network.Request{ Type: network.RequestTypeLogin, EncryptType: network.EncryptTypeEmptyKey, @@ -454,7 +458,7 @@ func (c *QQClient) buildRequestTgtgtNopicsigPacket() (uint16, []byte) { EncryptionMethod: oicq.EM_ST, Body: t.Marshal(), } - nreq := network.Request{ + req := network.Request{ Type: network.RequestTypeSimple, EncryptType: network.EncryptTypeEmptyKey, Uin: c.Uin, @@ -462,7 +466,7 @@ func (c *QQClient) buildRequestTgtgtNopicsigPacket() (uint16, []byte) { CommandName: "wtlogin.exchange_emp", Body: c.oicq.Marshal(&m), } - return seq, c.transport.PackPacket(&nreq) + return seq, c.transport.PackPacket(&req) } func (c *QQClient) buildRequestChangeSigPacket(changeD2 bool) (uint16, []byte) {