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

Merge pull request #94 from wdvxdr1123/patch/atomic

Browse Source 
fix GetForwardMessage
This commit is contained in:
Mrs4s 2021-01-07 18:36:40 +08:00 committed by GitHub
commit 1dfc6a6eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

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

1
client/global.go
View File

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

7
message/elements.go
View File

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