From b8399fa706dc4919eaa15231eaeedab1321cf2fc Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Fri, 13 Aug 2021 15:48:20 +0800 Subject: [PATCH] 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) } ' --- client/decoders.go | 2 +- client/online_push.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/decoders.go b/client/decoders.go index 5bee5cce..6c5e4123 100644 --- a/client/decoders.go +++ b/client/decoders.go @@ -307,7 +307,7 @@ func decodePushReqPacket(c *QQClient, _ *incomingPacketInfo, payload []byte) (in data.ReadFrom(jce.NewJceReader(request.SBuffer)) r := jce.NewJceReader(data.Map["PushReq"]["ConfigPush.PushReq"][1:]) t := r.ReadInt32(1) - jceBuf := r.ReadAny(2).([]byte) + jceBuf := r.ReadBytes(2) if len(jceBuf) > 0 { switch t { case 1: diff --git a/client/online_push.go b/client/online_push.go index 63efe624..b85848a5 100644 --- a/client/online_push.go +++ b/client/online_push.go @@ -113,7 +113,7 @@ func decodeOnlinePushReqPacket(c *QQClient, info *incomingPacketInfo, payload [] if m.MsgType == 528 { vr := jce.NewJceReader(m.VMsg) subType := vr.ReadInt64(0) - protobuf := vr.ReadAny(10).([]byte) + protobuf := vr.ReadBytes(10) if decoder, ok := msg0x210Decoders[subType]; ok { if err := decoder(c, protobuf); err != nil { return nil, errors.Wrap(err, "decode online push 0x210 error")