feat: 添加 SendForward 函数以支持消息转发,并更新 GenSendPkg 函数以处理转发逻辑

This commit is contained in:
lixiangwuxian 2025-04-10 00:18:06 +08:00
parent 58cc070c81
commit 6b43a7bb4e
4 changed files with 55 additions and 18 deletions

View File

@ -45,7 +45,7 @@ func (am *actionManager) SendMsg(reply *model.Reply) error {
} }
reply.ReplyMsg = fmt.Sprintf("%s%s", replyMsg.ToCQString(), reply.ReplyMsg) reply.ReplyMsg = fmt.Sprintf("%s%s", replyMsg.ToCQString(), reply.ReplyMsg)
} }
sendPkg := model.GenSendPkg(reply.FromMsg.UserId, reply.FromMsg.GroupInfo.GroupId, reply.ReplyMsg, false) sendPkg := model.GenSendPkg(reply.FromMsg.UserId, reply.FromMsg.GroupInfo.GroupId, reply.ReplyMsg, false, false)
sendPkgJson, err := json.Marshal(sendPkg) sendPkgJson, err := json.Marshal(sendPkg)
if err != nil { if err != nil {
return err return err
@ -59,6 +59,20 @@ func (am *actionManager) SendMsg(reply *model.Reply) error {
return nil return nil
} }
func (am *actionManager) SendForward(reply *model.Reply) error {
am.sendMtx.Lock()
defer am.sendMtx.Unlock()
sendPkg := model.GenSendPkg(reply.FromMsg.UserId, reply.FromMsg.GroupInfo.GroupId, reply.ReplyMsg, false, true)
sendPkgJson, err := json.Marshal(sendPkg)
if err != nil {
return err
}
if err = am.botConn.WriteMessage(websocket.TextMessage, sendPkgJson); err != nil {
return err
}
return nil
}
func (am *actionManager) DrawbackMsg(msgId int32) error { func (am *actionManager) DrawbackMsg(msgId int32) error {
withDrawPkg := model.GenDrawbackPkg(msgId) withDrawPkg := model.GenDrawbackPkg(msgId)
withDrawPkgJson, err := json.Marshal(withDrawPkg) withDrawPkgJson, err := json.Marshal(withDrawPkg)

View File

@ -5,4 +5,5 @@ const (
GROUP_MSG = "group" GROUP_MSG = "group"
PRIVATE_MSG_SEND = "send_private_msg" PRIVATE_MSG_SEND = "send_private_msg"
GROUP_MSG_SEND = "send_group_msg" GROUP_MSG_SEND = "send_group_msg"
FORWARD_MSG_SEND = "send_forward_msg"
) )

View File

@ -1,6 +1,7 @@
package help package help
import ( import (
"git.lxtend.com/qqbot/action"
"git.lxtend.com/qqbot/constants" "git.lxtend.com/qqbot/constants"
"git.lxtend.com/qqbot/handler" "git.lxtend.com/qqbot/handler"
"git.lxtend.com/qqbot/message" "git.lxtend.com/qqbot/message"
@ -35,9 +36,10 @@ func help(msg model.Message) *model.Reply {
nodeMsg.Data.UserID = "123456789" nodeMsg.Data.UserID = "123456789"
nodeMsg.Data.Nickname = "test" nodeMsg.Data.Nickname = "test"
nodeMsg.Data.Content = []any{&textMsg} nodeMsg.Data.Content = []any{&textMsg}
return &model.Reply{ action.ActionManager.SendForward(&model.Reply{
ReplyMsg: []any{&nodeMsg}, ReplyMsg: []any{&nodeMsg},
ReferOriginMsg: false, ReferOriginMsg: false,
FromMsg: msg, FromMsg: msg,
} })
return nil
} }

View File

@ -16,12 +16,21 @@ type SendPkg struct {
type UpstreamParams struct { type UpstreamParams struct {
UserID int64 `json:"user_id"` UserID int64 `json:"user_id"`
GroupID int64 `json:"group_id"` GroupID int64 `json:"group_id"`
Message interface{} `json:"message"` Message any `json:"message"`
AutoEscape bool `json:"auto_escape"` AutoEscape bool `json:"auto_escape"`
} }
func GenSendPkg(userID int64, groupID int64, message interface{}, autoEscape bool) SendPkg { func GenSendPkg(userID int64, groupID int64, message any, autoEscape bool, forward bool) SendPkg {
if groupID == 0 { if groupID == 0 {
if forward {
return SendPkg{
Action: constants.FORWARD_MSG_SEND,
Params: UpstreamParams{
UserID: userID,
Message: message,
},
}
} else {
return SendPkg{ return SendPkg{
Action: constants.PRIVATE_MSG_SEND, Action: constants.PRIVATE_MSG_SEND,
Params: UpstreamParams{ Params: UpstreamParams{
@ -31,6 +40,16 @@ func GenSendPkg(userID int64, groupID int64, message interface{}, autoEscape boo
}, },
} }
} }
}
if forward {
return SendPkg{
Action: constants.FORWARD_MSG_SEND,
Params: UpstreamParams{
UserID: userID,
Message: message,
},
}
} else {
return SendPkg{ return SendPkg{
Action: constants.GROUP_MSG_SEND, Action: constants.GROUP_MSG_SEND,
Params: UpstreamParams{ Params: UpstreamParams{
@ -40,6 +59,7 @@ func GenSendPkg(userID int64, groupID int64, message interface{}, autoEscape boo
AutoEscape: autoEscape, AutoEscape: autoEscape,
}, },
} }
}
} }
// 事件的消息结构体 // 事件的消息结构体