shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-06 20:13:50 +08:00
Code Issues Projects Releases Wiki Activity

fix: #1558

Browse Source
This commit is contained in:
Akiba 2022-06-25 21:06:37 +08:00
parent f772996418
commit 7e750352c4
No known key found for this signature in database
GPG Key ID: 770E2536B844F0F9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coolq/api.go
View File

@ -875,6 +875,12 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType
i := e.Get("data.id").Int() i := e.Get("data.id").Int()
m, _ := db.GetMessageByGlobalID(int32(i)) m, _ := db.GetMessageByGlobalID(int32(i))
if m != nil { if m != nil {
mSource := func() message.SourceType {
if m.GetType() == "group" {
return message.SourceGroup
}
return message.SourcePrivate
}()
msgTime := m.GetAttribute().Timestamp msgTime := m.GetAttribute().Timestamp
if msgTime == 0 { if msgTime == 0 {
msgTime = ts.Unix() msgTime = ts.Unix()
@ -883,7 +889,7 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType
SenderId: m.GetAttribute().SenderUin, SenderId: m.GetAttribute().SenderUin,
SenderName: m.GetAttribute().SenderName, SenderName: m.GetAttribute().SenderName,
Time: int32(msgTime), Time: int32(msgTime),
Message: resolveElement(bot.ConvertContentMessage(m.GetContent(), message.SourceGroup)), Message: resolveElement(bot.ConvertContentMessage(m.GetContent(), mSource)),
} }
} }
log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str) log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str)
@ -916,7 +922,7 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType
} }
} }
} }
content := bot.ConvertObjectMessage(c, message.SourceGroup) content := bot.ConvertObjectMessage(c, sourceType)
if uin != 0 && name != "" && len(content) > 0 { if uin != 0 && name != "" && len(content) > 0 {
return &message.ForwardNode{ return &message.ForwardNode{
SenderId: uin, SenderId: uin,