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

Merge branch 'Mrs4s:master' into master

Browse Source
This commit is contained in:
源文雨 2022-04-06 11:19:25 +08:00 committed by GitHub
commit 7057431309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/group_msg.go
View File

@ -60,13 +60,12 @@ func (c *QQClient) SendGroupMessage(groupCode int64, m *message.SendingMessage,
Time: int32(time.Now().Unix()), Time: int32(time.Now().Unix()),
Message: m.Elements, Message: m.Elements,
})) }))
if err != nil { if err == nil {
c.error("%v", err) ret := c.sendGroupMessage(groupCode, false, &message.SendingMessage{Elements: []message.IMessageElement{lmsg}})
return nil ret.Elements = m.Elements
return ret
} }
ret := c.sendGroupMessage(groupCode, false, &message.SendingMessage{Elements: []message.IMessageElement{lmsg}}) c.error("%v", err)
ret.Elements = m.Elements
return ret
} }
return c.sendGroupMessage(groupCode, false, m) return c.sendGroupMessage(groupCode, false, m)
} }

4
client/multimsg.go
View File

@ -184,7 +184,7 @@ func (c *QQClient) GetForwardMessage(resID string) *message.ForwardMessage {
for _, item := range m.Items { for _, item := range m.Items {
linker.items[item.GetFileName()] = item linker.items[item.GetFileName()] = item
} }
return linker.link(m.FileName) return linker.link("MultiMsg")
} }
func (c *QQClient) DownloadForwardMessage(resId string) *message.ForwardElement { func (c *QQClient) DownloadForwardMessage(resId string) *message.ForwardElement {
@ -291,7 +291,7 @@ func (builder *ForwardMessageBuilder) Main(m *message.ForwardMessage) *message.F
if err != nil { if err != nil {
return nil return nil
} }
content := forwardDisplay(rsp.MsgResid, filename, m.Preview(), fmt.Sprintf("查看 %d 条转发消息", m.Length())) content := forwardDisplay(rsp.MsgResid, utils.RandomString(32), m.Preview(), fmt.Sprintf("查看 %d 条转发消息", m.Length()))
for i, ip := range rsp.Uint32UpIp { for i, ip := range rsp.Uint32UpIp {
addr := highway.Addr{IP: uint32(ip), Port: int(rsp.Uint32UpPort[i])} addr := highway.Addr{IP: uint32(ip), Port: int(rsp.Uint32UpPort[i])}
hash := md5.Sum(body) hash := md5.Sum(body)