diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go index 5fb9738..efc86de 100644 --- a/handler/beatleader/beatleader.go +++ b/handler/beatleader/beatleader.go @@ -287,14 +287,12 @@ func getMyRecentScore(msg model.Message) (reply *model.Reply) { } //如果消息行数太多,使用合并转发 if len(records) > 5 { - textMsg := message.TextMessage{ + nodeMsg := util.NewSelfNodeMessage(&message.TextMessage{ Type: "text", Data: message.TextMessageData{ Text: "玩家 " + userName + " 的" + strconv.Itoa(recordCount) + "条最近记录为:\n" + scoreMsg, }, - } - nodeMsg := util.NewSelfNodeMessage() - nodeMsg.Data.Content = []any{&textMsg} + }) action.ActionManager.SendForward( &model.Reply{ ReplyMsg: []any{&nodeMsg}, diff --git a/handler/scoresaber/score.go b/handler/scoresaber/score.go index cdfd30f..1e7377f 100644 --- a/handler/scoresaber/score.go +++ b/handler/scoresaber/score.go @@ -300,14 +300,12 @@ func getMyRecentScore(msg model.Message) (reply *model.Reply) { } //如果消息行数太多,使用合并转发 if len(records) > 5 { - textMsg := message.TextMessage{ + nodeMsg := util.NewSelfNodeMessage(&message.TextMessage{ Type: "text", Data: message.TextMessageData{ Text: "玩家 " + userName + " 的" + strconv.Itoa(recordCount) + "条最近记录为:\n" + scoreMsg, }, - } - nodeMsg := util.NewSelfNodeMessage() - nodeMsg.Data.Content = []any{&textMsg} + }) action.ActionManager.SendForward( &model.Reply{ ReplyMsg: []any{&nodeMsg}, diff --git a/util/message.go b/util/message.go index c6d83c8..303b516 100644 --- a/util/message.go +++ b/util/message.go @@ -8,7 +8,7 @@ import ( "git.lxtend.com/qqbot/message" ) -func NewSelfNodeMessage() *message.NodeMessage { +func NewSelfNodeMessage(content ...any) *message.NodeMessage { loginAccountInfo, err := action.GetLoginAccountInfo() if err != nil { log.Println("GetLoginAccountInfo error:", err) @@ -17,5 +17,5 @@ func NewSelfNodeMessage() *message.NodeMessage { if loginAccountInfo == nil { return nil } - return &message.NodeMessage{Type: message.TypeNode, Data: message.NodeMessageData{UserID: strconv.FormatInt(int64(loginAccountInfo.Data.UserID), 10), Nickname: loginAccountInfo.Data.Nickname}} + return &message.NodeMessage{Type: message.TypeNode, Data: message.NodeMessageData{UserID: strconv.FormatInt(int64(loginAccountInfo.Data.UserID), 10), Nickname: loginAccountInfo.Data.Nickname, Content: content}} }