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

clean

Browse Source
This commit is contained in:
wdvxdr 2020-12-26 20:30:08 +08:00
parent 123b118788
commit 3fb45b0fa2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client.go
View File

@ -507,17 +507,17 @@ func (c *QQClient) GetForwardMessage(resId string) *message.ForwardMessage {
if multiMsg.GetPbItemList() == nil { if multiMsg.GetPbItemList() == nil {
return nil return nil
} }
var msg *msg.PbMultiMsgItem var item *msg.PbMultiMsgItem
for _, m := range multiMsg.GetPbItemList() { for _, m := range multiMsg.GetPbItemList() {
if m.GetFileName() == "MultiMsg" { if m.GetFileName() == "MultiMsg" {
msg = m item = m
break break
} }
} }
if msg == nil || msg.GetBuffer() == nil || msg.GetBuffer().GetMsg() == nil { if item == nil || item.GetBuffer() == nil || item.GetBuffer().GetMsg() == nil {
return nil return nil
} }
for _, m := range msg.GetBuffer().GetMsg() { for _, m := range item.GetBuffer().GetMsg() {
ret.Nodes = append(ret.Nodes, &message.ForwardNode{ ret.Nodes = append(ret.Nodes, &message.ForwardNode{
SenderId: m.Head.GetFromUin(), SenderId: m.Head.GetFromUin(),
SenderName: func() string { SenderName: func() string {

1
client/group_msg.go
View File

@ -179,7 +179,6 @@ func (c *QQClient) UploadGroupForwardMessage(groupCode int64, m *message.Forward
ts := time.Now().UnixNano() ts := time.Now().UnixNano()
seq := c.nextGroupSeq() seq := c.nextGroupSeq()
data, hash, items := m.CalculateValidationDataForward(seq, rand.Int31(), groupCode) data, hash, items := m.CalculateValidationDataForward(seq, rand.Int31(), groupCode)
rsp, body, err := c.multiMsgApplyUp(groupCode, data, hash, 2) rsp, body, err := c.multiMsgApplyUp(groupCode, data, hash, 2)
if err != nil { if err != nil {
return nil return nil