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

Merge branch 'Mrs4s:master' into master

Browse Source
This commit is contained in:
A lucky guy 2023-03-13 19:15:59 +08:00 committed by GitHub
commit 933005a6aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/builders.go
View File

@ -116,7 +116,7 @@ func (c *QQClient) buildLoginPacket() (uint16, []byte) {
t.Append(t544) t.Append(t544)
} }
} }
if c.Device().QImei36 != "" { if c.Device().QImei16 != "" {
t.Append(tlv.T545([]byte(c.Device().QImei16))) t.Append(tlv.T545([]byte(c.Device().QImei16)))
} else { } else {
t.Append(tlv.T545([]byte(c.Device().IMEI))) t.Append(tlv.T545([]byte(c.Device().IMEI)))
@ -463,7 +463,7 @@ func (c *QQClient) buildRequestTgtgtNopicsigPacket() (uint16, []byte) {
tlv.T525(tlv.T536([]byte{0x01, 0x00})), tlv.T525(tlv.T536([]byte{0x01, 0x00})),
}, },
} }
if c.Device().QImei36 != "" { if c.Device().QImei16 != "" {
t.Append(tlv.T545([]byte(c.Device().QImei16))) t.Append(tlv.T545([]byte(c.Device().QImei16)))
} else { } else {
t.Append(tlv.T545([]byte(c.Device().IMEI))) t.Append(tlv.T545([]byte(c.Device().IMEI)))

2
client/global.go
View File

@ -110,7 +110,7 @@ func UpdateAppVersion(protocolType auth.ProtocolType, data []byte) error {
if _, ok := auth.AppVersions[protocolType]; !ok { if _, ok := auth.AppVersions[protocolType]; !ok {
return errors.New("unknown protocol type: " + strconv.Itoa(int(protocolType))) return errors.New("unknown protocol type: " + strconv.Itoa(int(protocolType)))
} }
return auth.AppVersions[protocolType].ReadJson(data) return auth.AppVersions[protocolType].UpdateFromJson(data)
} }
func getSSOAddress(device *auth.Device) ([]netip.AddrPort, error) { func getSSOAddress(device *auth.Device) ([]netip.AddrPort, error) {

2
client/internal/auth/auth.go
View File

@ -168,7 +168,7 @@ func (v *AppVersion) String() string {
return fmt.Sprintf("%s %s - %v", v.Protocol.String(), v.SortVersionName, v.BuildTime) return fmt.Sprintf("%s %s - %v", v.Protocol.String(), v.SortVersionName, v.BuildTime)
} }
func (v *AppVersion) ReadJson(d []byte) error { func (v *AppVersion) UpdateFromJson(d []byte) error {
var f appVersionFile var f appVersionFile
if err := json.Unmarshal(d, &f); err != nil { if err := json.Unmarshal(d, &f); err != nil {
return errors.Wrap(err, "failed to unmarshal json message") return errors.Wrap(err, "failed to unmarshal json message")