diff --git a/client/builders.go b/client/builders.go index 0896ff9b..0e183c6e 100644 --- a/client/builders.go +++ b/client/builders.go @@ -127,7 +127,7 @@ func (c *QQClient) buildCaptchaPacket(result string, sign []byte) (uint16, []byt return seq, packet } -func (c *QQClient) buildSMSRequestPacket() (uint16, []byte) { +func (c *QQClient) buildSNSRequestPacket() (uint16, []byte) { seq := c.nextSeq() req := packets.BuildOicqRequestPacket(c.Uin, 0x810, crypto.ECDH, c.RandomKey, func(w *binary.Writer) { w.WriteUInt16(8) @@ -145,7 +145,7 @@ func (c *QQClient) buildSMSRequestPacket() (uint16, []byte) { return seq, packet } -func (c *QQClient) buildSMSCodeSubmitPacket(code string) (uint16, []byte) { +func (c *QQClient) buildSNSCodeSubmitPacket(code string) (uint16, []byte) { seq := c.nextSeq() req := packets.BuildOicqRequestPacket(c.Uin, 0x810, crypto.ECDH, c.RandomKey, func(w *binary.Writer) { w.WriteUInt16(7) diff --git a/client/client.go b/client/client.go index adc1d8bb..b817a302 100644 --- a/client/client.go +++ b/client/client.go @@ -233,8 +233,8 @@ func (c *QQClient) SubmitCaptcha(result string, sign []byte) (*LoginResponse, er return &l, nil } -func (c *QQClient) SubmitSMS(code string) (*LoginResponse, error) { - rsp, err := c.sendAndWait(c.buildSMSCodeSubmitPacket(code)) +func (c *QQClient) SubmitSNS(code string) (*LoginResponse, error) { + rsp, err := c.sendAndWait(c.buildSNSCodeSubmitPacket(code)) if err != nil { return nil, err } @@ -248,13 +248,13 @@ func (c *QQClient) SubmitSMS(code string) (*LoginResponse, error) { return &l, nil } -func (c *QQClient) RequestSMS() bool { - rsp, err := c.sendAndWait(c.buildSMSRequestPacket()) +func (c *QQClient) RequestSNS() bool { + rsp, err := c.sendAndWait(c.buildSNSRequestPacket()) if err != nil { c.Error("request sms error: %v", err) return false } - return rsp.(LoginResponse).Error == SMSNeededError + return rsp.(LoginResponse).Error == SNSNeededError } func (c *QQClient) GetVipInfo(target int64) (*VipInfo, error) { diff --git a/client/decoders.go b/client/decoders.go index 5505e8c3..4327ef95 100644 --- a/client/decoders.go +++ b/client/decoders.go @@ -92,7 +92,7 @@ func decodeLoginResponse(c *QQClient, _ uint16, payload []byte) (interface{}, er if t204, ok := m[0x204]; ok { // 同时支持扫码验证 ? return LoginResponse{ Success: false, - Error: SMSNeededError | UnsafeDeviceError, + Error: SNSNeededError | UnsafeDeviceError, VerifyUrl: string(t204), SMSPhone: phone, ErrorMessage: string(m[0x17e]), @@ -100,7 +100,7 @@ func decodeLoginResponse(c *QQClient, _ uint16, payload []byte) (interface{}, er } return LoginResponse{ Success: false, - Error: SMSNeededError, + Error: SNSNeededError, SMSPhone: phone, ErrorMessage: string(m[0x17e]), }, nil @@ -110,7 +110,7 @@ func decodeLoginResponse(c *QQClient, _ uint16, payload []byte) (interface{}, er c.t104 = m[0x104] return LoginResponse{ Success: false, - Error: SMSNeededError, + Error: SNSNeededError, }, nil } diff --git a/client/entities.go b/client/entities.go index 1ba97af2..d70c22bc 100644 --- a/client/entities.go +++ b/client/entities.go @@ -252,7 +252,7 @@ const ( NeedCaptcha LoginError = 1 OtherLoginError LoginError = 3 UnsafeDeviceError LoginError = 4 - SMSNeededError LoginError = 5 + SNSNeededError LoginError = 5 TooManySMSRequestError LoginError = 6 UnknownLoginError LoginError = -1