From 2eb0d5de201d70023e18f0c83bde340c72b62910 Mon Sep 17 00:00:00 2001
From: lixiangwuxian <mail@lxtend.com>
Date: Mon, 5 May 2025 02:02:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=20NewSelfNodeMes?=
 =?UTF-8?q?sage=20=E5=87=BD=E6=95=B0=E4=BB=A5=E6=8E=A5=E5=8F=97=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=8F=82=E6=95=B0=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E4=BB=A5?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/beatleader/beatleader.go | 6 ++----
 handler/scoresaber/score.go      | 6 ++----
 util/message.go                  | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

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}}
 }