1
0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00

clean(client): use new ReadBytes rather than ReadAny.

use rsc.io/rf tool:

rf '
  ex {
    import "github.com/Mrs4s/MiraiGo/binary/jce"
    var reader *jce.JceReader
    var tag int
    reader.ReadAny(tag).([]byte) -> reader.ReadBytes(tag)
  }
'
This commit is contained in:
wdvxdr 2021-08-13 15:48:20 +08:00
parent ad174508ff
commit b8399fa706
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
2 changed files with 2 additions and 2 deletions

View File

@ -307,7 +307,7 @@ func decodePushReqPacket(c *QQClient, _ *incomingPacketInfo, payload []byte) (in
data.ReadFrom(jce.NewJceReader(request.SBuffer)) data.ReadFrom(jce.NewJceReader(request.SBuffer))
r := jce.NewJceReader(data.Map["PushReq"]["ConfigPush.PushReq"][1:]) r := jce.NewJceReader(data.Map["PushReq"]["ConfigPush.PushReq"][1:])
t := r.ReadInt32(1) t := r.ReadInt32(1)
jceBuf := r.ReadAny(2).([]byte) jceBuf := r.ReadBytes(2)
if len(jceBuf) > 0 { if len(jceBuf) > 0 {
switch t { switch t {
case 1: case 1:

View File

@ -113,7 +113,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *incomingPacketInfo, payload []
if m.MsgType == 528 { if m.MsgType == 528 {
vr := jce.NewJceReader(m.VMsg) vr := jce.NewJceReader(m.VMsg)
subType := vr.ReadInt64(0) subType := vr.ReadInt64(0)
protobuf := vr.ReadAny(10).([]byte) protobuf := vr.ReadBytes(10)
if decoder, ok := msg0x210Decoders[subType]; ok { if decoder, ok := msg0x210Decoders[subType]; ok {
if err := decoder(c, protobuf); err != nil { if err := decoder(c, protobuf); err != nil {
return nil, errors.Wrap(err, "decode online push 0x210 error") return nil, errors.Wrap(err, "decode online push 0x210 error")