1
0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-03 18:47:41 +08:00

Merge pull request #35 from Logiase/patch-1

fix nil GroupMessage.Elements
This commit is contained in:
Mrs4s 2020-08-30 21:33:07 +08:00 committed by GitHub
commit 9cbe921e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -273,6 +273,14 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage {
}
}
var g *message.GroupMessage
g = &message.GroupMessage{
Id: m.Head.MsgSeq,
GroupCode: group.Code,
GroupName: string(m.Head.GroupInfo.GroupName),
Sender: sender,
Time: m.Head.MsgTime,
Elements: message.ParseMessageElems(m.Body.RichText.Elems),
}
// pre parse
for _, elem := range m.Body.RichText.Elems {
// is rich long msg
@ -289,15 +297,6 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage {
}
}
}
if g == nil {
g = &message.GroupMessage{
Id: m.Head.MsgSeq,
GroupCode: group.Code,
GroupName: string(m.Head.GroupInfo.GroupName),
Sender: sender,
Time: m.Head.MsgTime,
}
}
if m.Body.RichText.Ptt != nil {
g.Elements = []message.IMessageElement{
&message.VoiceElement{