shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00
Code Issues Projects Releases Wiki Activity

fix oicq subcmd 7 tlv

Browse Source
This commit is contained in:
Mrs4s 2023-03-05 18:22:25 +08:00
parent b8f6dadd53
commit a42218b851
No known key found for this signature in database
GPG Key ID: 3186E98FA19CE3A7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/builders.go
View File

@ -347,7 +347,7 @@ func (c *QQClient) buildSMSRequestPacket() (uint16, []byte) {
func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) { func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) {
seq := c.nextSeq() seq := c.nextSeq()
req := c.buildOicqRequestPacket(c.Uin, 0x0810, &oicq.TLV{ t := &oicq.TLV{
Command: 7, Command: 7,
List: [][]byte{ List: [][]byte{
tlv.T8(2052), tlv.T8(2052),
@ -358,7 +358,11 @@ func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) {
tlv.T401(c.sig.G), tlv.T401(c.sig.G),
tlv.T198(), 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{ r := network.Request{
Type: network.RequestTypeLogin, Type: network.RequestTypeLogin,
EncryptType: network.EncryptTypeEmptyKey, EncryptType: network.EncryptTypeEmptyKey,
@ -454,7 +458,7 @@ func (c *QQClient) buildRequestTgtgtNopicsigPacket() (uint16, []byte) {
EncryptionMethod: oicq.EM_ST, EncryptionMethod: oicq.EM_ST,
Body: t.Marshal(), Body: t.Marshal(),
} }
nreq := network.Request{ req := network.Request{
Type: network.RequestTypeSimple, Type: network.RequestTypeSimple,
EncryptType: network.EncryptTypeEmptyKey, EncryptType: network.EncryptTypeEmptyKey,
Uin: c.Uin, Uin: c.Uin,
@ -462,7 +466,7 @@ func (c *QQClient) buildRequestTgtgtNopicsigPacket() (uint16, []byte) {
CommandName: "wtlogin.exchange_emp", CommandName: "wtlogin.exchange_emp",
Body: c.oicq.Marshal(&m), 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) { func (c *QQClient) buildRequestChangeSigPacket(changeD2 bool) (uint16, []byte) {