fix: new types and no ffsjon

Author: trakhimenok

tgbotapi/callback_query_ffjson.go

@@ -0,0 +1,27 @@
+package tgbotapi
+
+import "net/url"
+
+var _ Chattable = (*CreateInvoiceLinkConfig)(nil)
+
+type CreateInvoiceLinkConfig struct {
+	BaseChat
+
+	// Unique identifier of the business connection on behalf of which the message will be sent
+	BusinessConnectionID string `json:"business_connection_id,omitempty"`
+}
+
+func (v CreateInvoiceLinkConfig) method() string {
+	return "createInvoiceLink"
+}
+
+// Values returns url.Values representation of InvoiceConfig.
+//
+//goland:noinspection GoMixedReceiverTypes
+func (v CreateInvoiceLinkConfig) Values() (url.Values, error) {
+	values, _ := v.BaseChat.Values()
+	if v.BusinessConnectionID != "" {
+		values.Add("business_connection_id", v.BusinessConnectionID)
+	}
+	return values, nil
+}

tgbotapi/config_create_invoice_link.go

@@ -0,0 +1,17 @@
+package tgbotapi
+
+// ReplyParameters describes reply parameters for the message that is being sent.
+type ReplyParameters struct {
+	MessageID int64 `json:"message_id"`
+
+	// Optional. If the message to be replied to is from a different chat, unique identifier for the chat or username of the channel (in the format @channelusername). Not supported for messages sent on behalf of a business account.
+	ChatIDInt int64
+	ChatIDStr string
+
+	AllowSendingWithoutReply bool            `json:"allow_sending_without_reply,omitempty"` // Optional. Pass True if the message should be sent even if the specified message to be replied to is not found. Always False for replies in another chat or forum topic. Always True for messages sent on behalf of a business account.
+	Quote                    string          `json:"quote,omitempty"`                       // Optional. Quoted part of the message to be replied to; 0-1024 characters after entities parsing. The quote must be an exact substring of the message to be replied to, including bold, italic, underline, strikethrough, spoiler, and custom_emoji entities. The message will fail to send if the quote isn't found in the original message.
+	QuoteParseMode           string          `json:"quote_parse_mode,omitempty"`            // Optional. Mode for parsing entities in the quote. See formatting options for more details.
+	QuoteEntities            []MessageEntity `json:"quote_entities,omitempty"`              // Optional. A JSON-serialized list of special entities that appear in the quote. It can be specified instead of quote_parse_mode.
+	QuotePosition            int64           `json:"quote_position,omitempty"`              // Optional. Position of the quote in the original message in UTF-16 code units
+
+}

tgbotapi/config_reply_parameters.go

@@ -0,0 +1,65 @@
+package tgbotapi
+
+import (
+	"github.com/pquerna/ffjson/ffjson"
+	"net/url"
+)
+
+type LabeledPrice struct {
+	Label  string `json:"label"`  // Portion label
+	Amount int64  `json:"amount"` // Price of the product in the smallest units of the currency (integer, not float/double). For example, for a price of US$ 1.45 pass amount = 145. See the exp parameter in currencies.json, it shows the number of digits past the decimal point for each currency (2 for the majority of currencies).
+}
+
+var _ Chattable = (*InvoiceConfig)(nil)
+
+type InvoiceConfig struct {
+	BaseChat
+	Title               string         `json:"title"`                           // Product name, 1-32 characters
+	Description         string         `json:"description"`                     // Product description, 1-255 characters
+	Payload             string         `json:"payload"`                         // Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use it for your internal processes.
+	ProviderToken       string         `json:"provider_token,omitempty"`        // 	Payment provider token, obtained via @BotFather. Pass an empty string for payments in Telegram Stars.
+	Currency            string         `json:"currency"`                        // Three-letter ISO 4217 currency code, see more on currencies. Pass “XTR” for payments in Telegram Stars.
+	Prices              []LabeledPrice `json:"prices"`                          // Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.). Must contain exactly one item for payments in Telegram Stars.
+	MaxTipAmount        int64          `json:"max_tip_amount,omitempty"`        // The maximum accepted amount for tips in the smallest units of the currency (integer, not float/double). For example, for a maximum tip of US$ 1.45 pass max_tip_amount = 145. See the exp parameter in currencies.json, it shows the number of digits past the decimal point for each currency (2 for the majority of currencies). Defaults to 0. Not supported for payments in Telegram Stars.
+	SuggestedTipAmounts []int64        `json:"suggested_tip_amounts,omitempty"` //A JSON-serialized array of suggested amounts of tips in the smallest units of the currency (integer, not float/double). At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed max_tip_amount.
+	StartParameter      string         `json:"start_parameter,omitempty"`       // Unique deep-linking parameter. If left empty, forwarded copies of the sent message will have a Pay button, allowing multiple users to pay directly from the forwarded message, using the same invoice. If non-empty, forwarded copies of the sent message will have a URL button with a deep link to the bot (instead of a Pay button), with the value used as the start parameter
+	ProviderData        string         `json:"provider_data,omitempty"`         // JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.
+	PhotoURL            string         `json:"photo_url,omitempty"`             // URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
+	PhotoSize           int            `json:"photo_size,omitempty"`            // Photo size in bytes
+	PhotoWidth          int            `json:"photo_width,omitempty"`           // Photo width
+	PhotoHeight         int            `json:"photo_height,omitempty"`          // Photo height
+	NeedName            bool           `json:"need_name,omitempty"`             // Pass True if you require the user's full name to complete the order. Ignored for payments in Telegram Stars.
+	NeedPhoneNumber     bool           `json:"need_phone_number,omitempty"`     // Pass True if you require the user's phone number to complete the order. Ignored for payments in Telegram Stars.
+	NeedEmail           bool           `json:"need_email,omitempty"`            // Pass True if you require the user's email address to complete the order. Ignored for payments in Telegram Stars.
+	NeedShippingAddress bool           `json:"need_shipping_address,omitempty"` // Pass True if you require the user's shipping address to complete the order. Ignored for payments in Telegram Stars.
+
+	SendPhoneNumberToProvider bool `json:"send_phone_number_to_provider,omitempty"` // Pass True if the user's phone number should be sent to the provider. Ignored for payments in Telegram Stars.
+	SendEmailToProvider       bool `json:"send_email_to_provider,omitempty"`        // Pass True if the user's email address should be sent to the provider. Ignored for payments in Telegram Stars.
+	IsFlexible                bool `json:"is_flexible,omitempty"`                   // Pass True if the final price depends on the shipping method. Ignored for payments in Telegram Stars.
+}
+
+func (v InvoiceConfig) method() string {
+	return "sendInvoice"
+}
+
+// Values returns url.Values representation of InvoiceConfig.
+//
+//goland:noinspection GoMixedReceiverTypes
+func (v InvoiceConfig) Values() (url.Values, error) {
+	values, _ := v.BaseChat.Values()
+	values.Add("title", v.Title)
+	values.Add("description", v.Description)
+	values.Add("payload", v.Payload)
+	values.Add("currency", v.Currency)
+	if v.ProviderToken != "" {
+		values.Add("provider_token", v.ProviderToken)
+	}
+	if len(v.Prices) > 0 {
+		if b, err := ffjson.MarshalFast(v.Prices); err != nil {
+			return nil, err
+		} else {
+			values.Add("prices", string(b))
+		}
+	}
+	return values, nil
+}

tgbotapi/config_send_invoice.go

@@ -106,13 +106,22 @@ type Fileable interface {
 	useExistingFile() bool
 }
 
-// BaseChat is base type for all chat config types.
+// BaseChat is a base type for all chat config types.
 type BaseChat struct {
 	ChatID              int64       `json:"chat_id,omitempty"`
 	ChannelUsername     string      `json:"channel_username,omitempty"`
 	ReplyToMessageID    int         `json:"reply_to_message_id,omitempty"`
 	ReplyMarkup         interface{} `json:"reply_markup,omitempty"`
 	DisableNotification bool        `json:"disable_notification,omitempty"`
+
+	ProtectContent bool `json:"protect_content,omitempty"` // Protects the contents of the sent message from forwarding and saving
+
+	// Unique identifier for the target message thread (topic) of the forum; for forum supergroups only
+	MessageThreadID    int64  `json:"message_thread_id,omitempty"`
+	MessageEffectID    string `json:"message_effect_id,omitempty"`
+	AllowPaidBroadcast bool   `json:"allow_paid_broadcast,omitempty"` // Pass True to allow up to 1000 messages per second, ignoring broadcasting limits for a fee of 0.1 Telegram Stars per message. The relevant Stars will be withdrawn from the bot's balance
+
+	ReplyParameters *ReplyParameters `json:"reply_parameters,omitempty"` // Description of the message to reply to
 }
 
 // Values returns url.Values representation of BaseChat
@@ -130,6 +139,39 @@ func (j BaseChat) Values() (url.Values, error) {
 		values.Add("reply_to_message_id", strconv.Itoa(j.ReplyToMessageID))
 	}
 
+	if j.ProtectContent {
+		values.Add("protect_content", "true")
+	}
+
+	if j.AllowPaidBroadcast {
+		values.Add("allow_paid_broadcast", "true")
+	}
+
+	if j.MessageThreadID != 0 {
+		values.Add("message_thread_id", strconv.FormatInt(j.MessageThreadID, 10))
+	}
+
+	if j.MessageEffectID != "" {
+		values.Add("message_effect_id", j.MessageEffectID)
+	}
+	if j.AllowPaidBroadcast {
+		values.Add("allow_paid_broadcast", "true")
+	}
+
+	if j.ReplyParameters != nil {
+		data, err := ffjson.Marshal(j.ReplyParameters)
+		if err != nil {
+			ffjson.Pool(data)
+			return values, err
+		}
+		if string(data) == "null" {
+			panic(fmt.Sprintf("string(data) == null, BaseChat: %v", j))
+		}
+
+		values.Add("reply_parameters", string(data))
+		ffjson.Pool(data)
+	}
+
 	if j.ReplyMarkup != nil {
 		data, err := ffjson.Marshal(j.ReplyMarkup)
 		if err != nil {