perf: 优化telegram Button封装

TBXark · Nov 6, 2024 · cd4b297 · cd4b297
1 parent 044159d
commit cd4b297
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/internal/server/bot/bot.go b/internal/server/bot/bot.go
@@ -45,6 +45,10 @@ func (b *Bot) Close(ctx context.Context) error {
 	return b.Bot.Close(ctx)
 }
 
+func NewButton[T any](text, query string, data T) telegram.Button {
+	return telegram.NewButton(text, query, data)
+}
+
 func UnmarshalUpdateDataWithDefault[T any](update *models.Update, defaultValue T) T {
 	if update != nil && update.CallbackQuery != nil {
 		_, data, err := telegram.UnmarshalData[T](update.CallbackQuery.Data)

diff --git a/internal/server/bot/codec.go b/internal/server/bot/codec.go
@@ -32,12 +32,12 @@ func (b *Bot) EncodeCounterResponse(ctx context.Context, reply *botv1.CounterRes
 		Text: fmt.Sprintf("Counter: %d", reply.Count),
 		Button: [][]telegram.Button{
 			{
-				telegram.Button{Text: "+", Type: QueryCounter, Data: reply.Count + 1},
-				telegram.Button{Text: "-", Type: QueryCounter, Data: reply.Count - 1},
+				NewButton("Increment", QueryCounter, reply.Count+1),
+				NewButton("Decrement", QueryCounter, reply.Count-1),
 			},
 			{
-				telegram.Button{Text: "Reset", Type: QueryCounter, Data: 0},
-				telegram.Button{Text: "Random", Type: QueryCounter, Data: rand.Int() % 100},
+				NewButton("Reset", QueryCounter, 0),
+				NewButton("Random", QueryCounter, rand.Int()%100),
 			},
 		},
 	}, nil

diff --git a/pkg/telegram/message.go b/pkg/telegram/message.go
@@ -6,9 +6,17 @@ import (
 )
 
 type Button struct {
-	Text string
-	Type string
-	Data any
+	Text         string
+	Type         string
+	CallbackData string
+}
+
+func NewButton[T any](text, dType string, data T) Button {
+	return Button{
+		Text:         text,
+		Type:         dType,
+		CallbackData: MarshalData(dType, data),
+	}
 }
 
 type Message struct {
@@ -24,7 +32,7 @@ func (m *Message) toInlineKeyboardMarkup() *models.InlineKeyboardMarkup {
 		for _, btn := range row {
 			buttons = append(buttons, models.InlineKeyboardButton{
 				Text:         btn.Text,
-				CallbackData: MarshalData(btn.Type, btn.Data),
+				CallbackData: btn.CallbackData,
 			})
 		}
 		keyboard = append(keyboard, buttons)