v0.4.2.1

keyboard.go

@@ -7,10 +7,16 @@ import (
 	"git.nix13.pw/scuroneko/extypes"
 )
 
+const (
+	ButtonStyleDanger  KeyboardButtonStyle = "danger"
+	ButtonStyleSuccess KeyboardButtonStyle = "success"
+	ButtonStylePrimary KeyboardButtonStyle = "primary"
+)
+
 type InlineKbButtonBuilder struct {
 	text              string
 	iconCustomEmojiID string
-	style             InlineKeyboardButtonStyle
+	style             KeyboardButtonStyle
 	url               string
 	callbackData      string
 }
@@ -22,7 +28,7 @@ func (b InlineKbButtonBuilder) SetIconCustomEmojiId(id string) InlineKbButtonBui
 	b.iconCustomEmojiID = id
 	return b
 }
-func (b InlineKbButtonBuilder) SetStyle(style InlineKeyboardButtonStyle) InlineKbButtonBuilder {
+func (b InlineKbButtonBuilder) SetStyle(style KeyboardButtonStyle) InlineKbButtonBuilder {
 	b.style = style
 	return b
 }
@@ -30,8 +36,8 @@ func (b InlineKbButtonBuilder) SetUrl(url string) InlineKbButtonBuilder {
 	b.url = url
 	return b
 }
-func (b InlineKbButtonBuilder) SetCallbackData(data *CallbackData) InlineKbButtonBuilder {
-	b.callbackData = data.ToJson()
+func (b InlineKbButtonBuilder) SetCallbackData(cmd string, args ...any) InlineKbButtonBuilder {
+	b.callbackData = NewCallbackData(cmd, args...).ToJson()
 	return b
 }
 
@@ -74,12 +80,12 @@ func (in *InlineKeyboard) AddCallbackButton(text string, cmd string, args ...any
 		Text: text, CallbackData: NewCallbackData(cmd, args...).ToJson(),
 	})
 }
-func (in *InlineKeyboard) AddCustomButton(button InlineKeyboardButton) *InlineKeyboard {
-	return in.append(button)
-}
 func (in *InlineKeyboard) AddButton(b InlineKbButtonBuilder) *InlineKeyboard {
 	return in.append(b.build())
 }
+func (in *InlineKeyboard) AddCustomButton(button InlineKeyboardButton) *InlineKeyboard {
+	return in.append(button)
+}
 
 func (in *InlineKeyboard) AddLine() *InlineKeyboard {
 	if in.CurrentLine.Len() == 0 {

types.go

@@ -128,13 +128,13 @@ type InlineKeyboardMarkup struct {
 	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard,omitempty"`
 }
 
-type InlineKeyboardButtonStyle string
+type KeyboardButtonStyle string
 type InlineKeyboardButton struct {
-	Text              string                    `json:"text"`
-	URL               string                    `json:"url,omitempty"`
-	CallbackData      string                    `json:"callback_data,omitempty"`
-	Style             InlineKeyboardButtonStyle `json:"style,omitempty"`
-	IconCustomEmojiID string                    `json:"icon_custom_emoji_id,omitempty"`
+	Text              string              `json:"text"`
+	URL               string              `json:"url,omitempty"`
+	CallbackData      string              `json:"callback_data,omitempty"`
+	Style             KeyboardButtonStyle `json:"style,omitempty"`
+	IconCustomEmojiID string              `json:"icon_custom_emoji_id,omitempty"`
 }
 
 type ReplyKeyboardMarkup struct {

version.go

@@ -1,8 +1,8 @@
 package laniakea
 
 const (
-	VersionString = "0.4.1"
+	VersionString = "0.4.2"
 	VersionMajor  = 0
 	VersionMinor  = 4
-	VersionPatch  = 1
+	VersionPatch  = 2
 )