From 3fb45b0fa26203989597c587c273c31c5965c862 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Sat, 26 Dec 2020 20:30:08 +0800 Subject: [PATCH] clean --- client/client.go | 8 ++++---- client/group_msg.go | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/client.go b/client/client.go index 31df631d..7ddaa870 100644 --- a/client/client.go +++ b/client/client.go @@ -507,17 +507,17 @@ func (c *QQClient) GetForwardMessage(resId string) *message.ForwardMessage { if multiMsg.GetPbItemList() == nil { return nil } - var msg *msg.PbMultiMsgItem + var item *msg.PbMultiMsgItem for _, m := range multiMsg.GetPbItemList() { if m.GetFileName() == "MultiMsg" { - msg = m + item = m break } } - if msg == nil || msg.GetBuffer() == nil || msg.GetBuffer().GetMsg() == nil { + if item == nil || item.GetBuffer() == nil || item.GetBuffer().GetMsg() == nil { return nil } - for _, m := range msg.GetBuffer().GetMsg() { + for _, m := range item.GetBuffer().GetMsg() { ret.Nodes = append(ret.Nodes, &message.ForwardNode{ SenderId: m.Head.GetFromUin(), SenderName: func() string { diff --git a/client/group_msg.go b/client/group_msg.go index 68628585..049709eb 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -179,7 +179,6 @@ func (c *QQClient) UploadGroupForwardMessage(groupCode int64, m *message.Forward ts := time.Now().UnixNano() seq := c.nextGroupSeq() data, hash, items := m.CalculateValidationDataForward(seq, rand.Int31(), groupCode) - rsp, body, err := c.multiMsgApplyUp(groupCode, data, hash, 2) if err != nil { return nil