v0.4.4

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
 }
 
@@ -66,16 +72,23 @@ func (in *InlineKeyboard) append(button InlineKeyboardButton) *InlineKeyboard {
 	in.CurrentLine = in.CurrentLine.Push(button)
 	return in
 }
+
 func (in *InlineKeyboard) AddUrlButton(text, url string) *InlineKeyboard {
 	return in.append(InlineKeyboardButton{Text: text, URL: url})
 }
+func (in *InlineKeyboard) AddUrlButtonStyle(text string, style KeyboardButtonStyle, url string) *InlineKeyboard {
+	return in.append(InlineKeyboardButton{Text: text, Style: style, URL: url})
+}
 func (in *InlineKeyboard) AddCallbackButton(text string, cmd string, args ...any) *InlineKeyboard {
 	return in.append(InlineKeyboardButton{
 		Text: text, CallbackData: NewCallbackData(cmd, args...).ToJson(),
 	})
 }
-func (in *InlineKeyboard) AddCustomButton(button InlineKeyboardButton) *InlineKeyboard {
-	return in.append(button)
+func (in *InlineKeyboard) AddCallbackButtonStyle(text string, style KeyboardButtonStyle, cmd string, args ...any) *InlineKeyboard {
+	return in.append(InlineKeyboardButton{
+		Text: text, Style: style,
+		CallbackData: NewCallbackData(cmd, args...).ToJson(),
+	})
 }
 func (in *InlineKeyboard) AddButton(b InlineKbButtonBuilder) *InlineKeyboard {
 	return in.append(b.build())

types.go

@@ -50,17 +50,41 @@ type MessageReplyMarkup struct {
 }
 
 type Message struct {
-	MessageID       int    `json:"message_id"`
-	MessageThreadID int    `json:"message_thread_id,omitempty"`
-	From            *User  `json:"from,omitempty"`
-	Chat            *Chat  `json:"chat,omitempty"`
-	Text            string `json:"text"`
+	MessageID            int    `json:"message_id"`
+	MessageThreadID      int    `json:"message_thread_id,omitempty"`
+	BusinessConnectionId string `json:"business_connection_id,omitempty"`
+	From                 *User  `json:"from,omitempty"`
 
-	Photo          extypes.Slice[*PhotoSize] `json:"photo,omitempty"`
-	Caption        string                    `json:"caption,omitempty"`
-	ReplyToMessage *Message                  `json:"reply_to_message"`
+	SenderChat        *Chat `json:"sender_chat,omitempty"`
+	SenderBoostCount  int   `json:"sender_boost_count,omitempty"`
+	SenderBusinessBot *User `json:"sender_business_bot,omitempty"`
+	Chat              *Chat `json:"chat,omitempty"`
+
+	IsTopicMessage     bool     `json:"is_topic_message,omitempty"`
+	IsAutomaticForward bool     `json:"is_automatic_forward,omitempty"`
+	IsFromOffline      bool     `json:"is_from_offline,omitempty"`
+	IsPaidPost         bool     `json:"is_paid_post,omitempty"`
+	MediaGroupId       string   `json:"media_group_id,omitempty"`
+	AuthorSignature    string   `json:"author_signature,omitempty"`
+	PaidStarCount      int      `json:"paid_star_count,omitempty"`
+	ReplyToMessage     *Message `json:"reply_to_message,omitempty"`
+
+	Text string `json:"text"`
+
+	Photo           extypes.Slice[*PhotoSize] `json:"photo,omitempty"`
+	Caption         string                    `json:"caption,omitempty"`
+	CaptionEntities []MessageEntity           `json:"caption_entities,omitempty"`
+
+	Date     int `json:"date"`
+	EditDate int `json:"edit_date"`
 
 	ReplyMarkup *MessageReplyMarkup `json:"reply_markup,omitempty"`
+
+	Entities           []MessageEntity     `json:"entities,omitempty"`
+	LinkPreviewOptions *LinkPreviewOptions `json:"link_preview_options,omitempty"`
+	SuggestedPostInfo  *SuggestedPostInfo  `json:"suggested_post_info,omitempty"`
+
+	EffectID string `json:"effect_id,omitempty"`
 }
 
 type InaccessableMessage struct {
@@ -128,13 +152,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.4"
 	VersionMajor  = 0
 	VersionMinor  = 4
-	VersionPatch  = 1
+	VersionPatch  = 4
 )