Merge branch 'master' of https://github.com/Mrs4s/MiraiGo

client/client.go

@@ -499,7 +499,7 @@ func (c *QQClient) GetForwardMessage(resId string) *message.ForwardMessage {
 		ret  = &message.ForwardMessage{Nodes: []*message.ForwardNode{}}
 	)
 	for _, iter := range m.Items {
-		if iter.GetFileName() == "MultiMsg" {
+		if iter.GetFileName() == m.FileName {
 			item = iter
 		}
 	}

client/global.go

@@ -586,6 +586,7 @@ func genForwardTemplate(resId, preview, title, brief, source, summary string, ts
 		}
 	}
 	return &message.ForwardElement{
+		FileName: strconv.FormatInt(ts, 10),
 		Content: template,
 		ResId:   resId,
 		Items:   items,

message/elements.go

@@ -105,9 +105,10 @@ type ServiceElement struct {
 }
 
 type ForwardElement struct {
-	Content string
-	ResId   string
-	Items   []*msg.PbMultiMsgItem
+	FileName string
+	Content  string
+	ResId    string
+	Items    []*msg.PbMultiMsgItem
 }
 
 type LightAppElement struct {