Start implementing 7.0 Bot API changes

bot_test.go

@@ -84,7 +84,7 @@ func TestSendWithMessageReply(t *testing.T) {
 	bot, _ := getBot(t)
 
 	msg := NewMessage(ChatID, "A test message from the test library in telegram-bot-api")
-	msg.ReplyToMessageID = ReplyToMessageID
+	msg.ReplyParameters.MessageID = ReplyToMessageID
 	_, err := bot.Send(msg)
 
 	if err != nil {
@@ -169,7 +169,7 @@ func TestSendWithNewPhotoReply(t *testing.T) {
 	bot, _ := getBot(t)
 
 	msg := NewPhoto(ChatID, FilePath("tests/image.jpg"))
-	msg.ReplyToMessageID = ReplyToMessageID
+	msg.ReplyParameters.MessageID = ReplyToMessageID
 
 	_, err := bot.Send(msg)
 
@@ -699,7 +699,7 @@ func ExampleNewBotAPI() {
 		log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text)
 
 		msg := NewMessage(update.Message.Chat.ID, update.Message.Text)
-		msg.ReplyToMessageID = update.Message.MessageID
+		msg.ReplyParameters.MessageID = update.Message.MessageID
 
 		bot.Send(msg)
 	}
@@ -827,8 +827,12 @@ func TestDeleteMessage(t *testing.T) {
 	message, _ := bot.Send(msg)
 
 	deleteMessageConfig := DeleteMessageConfig{
-		ChatID:    message.Chat.ID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID: message.MessageID,
+			ChatConfig: ChatConfig{
+				ChatID: message.Chat.ID,
+			},
+			MessageID: message.MessageID,
+		},
 	}
 	_, err := bot.Request(deleteMessageConfig)
 
@@ -845,8 +849,12 @@ func TestPinChatMessage(t *testing.T) {
 	message, _ := bot.Send(msg)
 
 	pinChatMessageConfig := PinChatMessageConfig{
-		ChatID:              message.Chat.ID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID:           message.MessageID,
+			ChatConfig: ChatConfig{
+				ChatID: ChatID,
+			},
+			MessageID: message.MessageID,
+		},
 		DisableNotification: false,
 	}
 	_, err := bot.Request(pinChatMessageConfig)
@@ -865,8 +873,12 @@ func TestUnpinChatMessage(t *testing.T) {
 
 	// We need pin message to unpin something
 	pinChatMessageConfig := PinChatMessageConfig{
-		ChatID:              message.Chat.ID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID:           message.MessageID,
+			ChatConfig: ChatConfig{
+				ChatID: message.Chat.ID,
+			},
+			MessageID: message.MessageID,
+		},
 		DisableNotification: false,
 	}
 
@@ -875,8 +887,12 @@ func TestUnpinChatMessage(t *testing.T) {
 	}
 
 	unpinChatMessageConfig := UnpinChatMessageConfig{
-		ChatID:    message.Chat.ID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID: message.MessageID,
+			ChatConfig: ChatConfig{
+				ChatID: message.Chat.ID,
+			},
+			MessageID: message.MessageID,
+		},
 	}
 
 	if _, err := bot.Request(unpinChatMessageConfig); err != nil {
@@ -892,8 +908,12 @@ func TestUnpinAllChatMessages(t *testing.T) {
 	message, _ := bot.Send(msg)
 
 	pinChatMessageConfig := PinChatMessageConfig{
-		ChatID:              message.Chat.ID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID:           message.MessageID,
+			ChatConfig: ChatConfig{
+				ChatID: message.Chat.ID,
+			},
+			MessageID: message.MessageID,
+		},
 		DisableNotification: true,
 	}
 
@@ -902,7 +922,7 @@ func TestUnpinAllChatMessages(t *testing.T) {
 	}
 
 	unpinAllChatMessagesConfig := UnpinAllChatMessagesConfig{
-		ChatID: message.Chat.ID,
+		ChatConfig: ChatConfig{ChatID: message.Chat.ID},
 	}
 
 	if _, err := bot.Request(unpinAllChatMessagesConfig); err != nil {

helper_methods.go

@@ -17,19 +17,26 @@ import (
 func NewMessage(chatID int64, text string) MessageConfig {
 	return MessageConfig{
 		BaseChat: BaseChat{
-			ChatID:           chatID,
+			ChatConfig: ChatConfig{
-			ReplyToMessageID: 0,
+				ChatID: chatID,
+			},
+		},
+		Text: text,
+		LinkPreviewOptions: LinkPreviewOptions{
+			IsDisabled: false,
 		},
-		Text:                  text,
-		DisableWebPagePreview: false,
 	}
 }
 
 // NewDeleteMessage creates a request to delete a message.
 func NewDeleteMessage(chatID int64, messageID int) DeleteMessageConfig {
 	return DeleteMessageConfig{
-		ChatID:    chatID,
+		BaseChatMessage: BaseChatMessage{
-		MessageID: messageID,
+			ChatConfig: ChatConfig{
+				ChatID: chatID,
+			},
+			MessageID: messageID,
+		},
 	}
 }
 
@@ -41,8 +48,9 @@ func NewDeleteMessage(chatID int64, messageID int) DeleteMessageConfig {
 func NewMessageToChannel(username string, text string) MessageConfig {
 	return MessageConfig{
 		BaseChat: BaseChat{
-			ChannelUsername: username,
+			ChatConfig: ChatConfig{
-		},
+				ChannelUsername: username,
+			}},
 		Text: text,
 	}
 }
@@ -53,9 +61,9 @@ func NewMessageToChannel(username string, text string) MessageConfig {
 // and messageID is the ID of the original message.
 func NewForward(chatID int64, fromChatID int64, messageID int) ForwardConfig {
 	return ForwardConfig{
-		BaseChat:   BaseChat{ChatID: chatID},
+		BaseChat:  BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
-		FromChatID: fromChatID,
+		FromChat:  ChatConfig{ChatID: fromChatID},
-		MessageID:  messageID,
+		MessageID: messageID,
 	}
 }
 
@@ -65,9 +73,9 @@ func NewForward(chatID int64, fromChatID int64, messageID int) ForwardConfig {
 // and messageID is the ID of the original message.
 func NewCopyMessage(chatID int64, fromChatID int64, messageID int) CopyMessageConfig {
 	return CopyMessageConfig{
-		BaseChat:   BaseChat{ChatID: chatID},
+		BaseChat:  BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
-		FromChatID: fromChatID,
+		FromChat:  ChatConfig{ChatID: fromChatID},
-		MessageID:  messageID,
+		MessageID: messageID,
 	}
 }
 
@@ -80,7 +88,7 @@ func NewCopyMessage(chatID int64, fromChatID int64, messageID int) CopyMessageCo
 func NewPhoto(chatID int64, file RequestFileData) PhotoConfig {
 	return PhotoConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -92,10 +100,8 @@ func NewPhoto(chatID int64, file RequestFileData) PhotoConfig {
 func NewPhotoToChannel(username string, file RequestFileData) PhotoConfig {
 	return PhotoConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChannelUsername: username}},
-				ChannelUsername: username,
+			File:     file,
-			},
-			File: file,
 		},
 	}
 }
@@ -104,7 +110,7 @@ func NewPhotoToChannel(username string, file RequestFileData) PhotoConfig {
 func NewAudio(chatID int64, file RequestFileData) AudioConfig {
 	return AudioConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -114,7 +120,7 @@ func NewAudio(chatID int64, file RequestFileData) AudioConfig {
 func NewDocument(chatID int64, file RequestFileData) DocumentConfig {
 	return DocumentConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -124,7 +130,7 @@ func NewDocument(chatID int64, file RequestFileData) DocumentConfig {
 func NewSticker(chatID int64, file RequestFileData) StickerConfig {
 	return StickerConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -157,7 +163,7 @@ func NewDeleteStickerSet(name, title string) DeleteStickerSetConfig {
 func NewVideo(chatID int64, file RequestFileData) VideoConfig {
 	return VideoConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -167,7 +173,7 @@ func NewVideo(chatID int64, file RequestFileData) VideoConfig {
 func NewAnimation(chatID int64, file RequestFileData) AnimationConfig {
 	return AnimationConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -180,7 +186,7 @@ func NewAnimation(chatID int64, file RequestFileData) AnimationConfig {
 func NewVideoNote(chatID int64, length int, file RequestFileData) VideoNoteConfig {
 	return VideoNoteConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 		Length: length,
@@ -191,7 +197,7 @@ func NewVideoNote(chatID int64, length int, file RequestFileData) VideoNoteConfi
 func NewVoice(chatID int64, file RequestFileData) VoiceConfig {
 	return VoiceConfig{
 		BaseFile: BaseFile{
-			BaseChat: BaseChat{ChatID: chatID},
+			BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 			File:     file,
 		},
 	}
@@ -202,7 +208,7 @@ func NewVoice(chatID int64, file RequestFileData) VoiceConfig {
 func NewMediaGroup(chatID int64, files []interface{}) MediaGroupConfig {
 	return MediaGroupConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		Media: files,
 	}
@@ -262,7 +268,7 @@ func NewInputMediaDocument(media RequestFileData) InputMediaDocument {
 func NewContact(chatID int64, phoneNumber, firstName string) ContactConfig {
 	return ContactConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		PhoneNumber: phoneNumber,
 		FirstName:   firstName,
@@ -275,7 +281,7 @@ func NewContact(chatID int64, phoneNumber, firstName string) ContactConfig {
 func NewLocation(chatID int64, latitude float64, longitude float64) LocationConfig {
 	return LocationConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		Latitude:  latitude,
 		Longitude: longitude,
@@ -286,7 +292,7 @@ func NewLocation(chatID int64, latitude float64, longitude float64) LocationConf
 func NewVenue(chatID int64, title, address string, latitude, longitude float64) VenueConfig {
 	return VenueConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		Title:     title,
 		Address:   address,
@@ -301,7 +307,7 @@ func NewVenue(chatID int64, title, address string, latitude, longitude float64)
 // chatID is where to send it, action should be set via Chat constants.
 func NewChatAction(chatID int64, action string) ChatActionConfig {
 	return ChatActionConfig{
-		BaseChat: BaseChat{ChatID: chatID},
+		BaseChat: BaseChat{ChatConfig: ChatConfig{ChatID: chatID}},
 		Action:   action,
 	}
 }
@@ -592,8 +598,12 @@ func NewInlineQueryResultVenue(id, title, address string, latitude, longitude fl
 func NewEditMessageText(chatID int64, messageID int, text string) EditMessageTextConfig {
 	return EditMessageTextConfig{
 		BaseEdit: BaseEdit{
-			ChatID:    chatID,
+			BaseChatMessage: BaseChatMessage{
-			MessageID: messageID,
+				ChatConfig: ChatConfig{
+					ChatID: chatID,
+				},
+				MessageID: messageID,
+			},
 		},
 		Text: text,
 	}
@@ -603,8 +613,12 @@ func NewEditMessageText(chatID int64, messageID int, text string) EditMessageTex
 func NewEditMessageTextAndMarkup(chatID int64, messageID int, text string, replyMarkup InlineKeyboardMarkup) EditMessageTextConfig {
 	return EditMessageTextConfig{
 		BaseEdit: BaseEdit{
-			ChatID:      chatID,
+			BaseChatMessage: BaseChatMessage{
-			MessageID:   messageID,
+				ChatConfig: ChatConfig{
+					ChatID: chatID,
+				},
+				MessageID: messageID,
+			},
 			ReplyMarkup: &replyMarkup,
 		},
 		Text: text,
@@ -615,8 +629,12 @@ func NewEditMessageTextAndMarkup(chatID int64, messageID int, text string, reply
 func NewEditMessageCaption(chatID int64, messageID int, caption string) EditMessageCaptionConfig {
 	return EditMessageCaptionConfig{
 		BaseEdit: BaseEdit{
-			ChatID:    chatID,
+			BaseChatMessage: BaseChatMessage{
-			MessageID: messageID,
+				ChatConfig: ChatConfig{
+					ChatID: chatID,
+				},
+				MessageID: messageID,
+			},
 		},
 		Caption: caption,
 	}
@@ -627,8 +645,12 @@ func NewEditMessageCaption(chatID int64, messageID int, caption string) EditMess
 func NewEditMessageReplyMarkup(chatID int64, messageID int, replyMarkup InlineKeyboardMarkup) EditMessageReplyMarkupConfig {
 	return EditMessageReplyMarkupConfig{
 		BaseEdit: BaseEdit{
-			ChatID:      chatID,
+			BaseChatMessage: BaseChatMessage{
-			MessageID:   messageID,
+				ChatConfig: ChatConfig{
+					ChatID: chatID,
+				},
+				MessageID: messageID,
+			},
 			ReplyMarkup: &replyMarkup,
 		},
 	}
@@ -801,7 +823,9 @@ func NewCallbackWithAlert(id, text string) CallbackConfig {
 // NewInvoice creates a new Invoice request to the user.
 func NewInvoice(chatID int64, title, description, payload, providerToken, startParameter, currency string, prices []LabeledPrice) InvoiceConfig {
 	return InvoiceConfig{
-		BaseChat:       BaseChat{ChatID: chatID},
+		BaseChat: BaseChat{
+			ChatConfig: ChatConfig{ChatID: chatID},
+		},
 		Title:          title,
 		Description:    description,
 		Payload:        payload,
@@ -814,15 +838,19 @@ func NewInvoice(chatID int64, title, description, payload, providerToken, startP
 // NewChatTitle allows you to update the title of a chat.
 func NewChatTitle(chatID int64, title string) SetChatTitleConfig {
 	return SetChatTitleConfig{
-		ChatID: chatID,
+		ChatConfig: ChatConfig{
-		Title:  title,
+			ChatID: chatID,
+		},
+		Title: title,
 	}
 }
 
 // NewChatDescription allows you to update the description of a chat.
 func NewChatDescription(chatID int64, description string) SetChatDescriptionConfig {
 	return SetChatDescriptionConfig{
-		ChatID:      chatID,
+		ChatConfig: ChatConfig{
+			ChatID: chatID,
+		},
 		Description: description,
 	}
 }
@@ -832,7 +860,7 @@ func NewChatPhoto(chatID int64, photo RequestFileData) SetChatPhotoConfig {
 	return SetChatPhotoConfig{
 		BaseFile: BaseFile{
 			BaseChat: BaseChat{
-				ChatID: chatID,
+				ChatConfig: ChatConfig{ChatID: chatID},
 			},
 			File: photo,
 		},
@@ -842,7 +870,9 @@ func NewChatPhoto(chatID int64, photo RequestFileData) SetChatPhotoConfig {
 // NewDeleteChatPhoto allows you to delete the photo for a chat.
 func NewDeleteChatPhoto(chatID int64) DeleteChatPhotoConfig {
 	return DeleteChatPhotoConfig{
-		ChatID: chatID,
+		ChatConfig: ChatConfig{
+			ChatID: chatID,
+		},
 	}
 }
 
@@ -850,7 +880,7 @@ func NewDeleteChatPhoto(chatID int64) DeleteChatPhotoConfig {
 func NewPoll(chatID int64, question string, options ...string) SendPollConfig {
 	return SendPollConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		Question:    question,
 		Options:     options,
@@ -862,8 +892,12 @@ func NewPoll(chatID int64, question string, options ...string) SendPollConfig {
 func NewStopPoll(chatID int64, messageID int) StopPollConfig {
 	return StopPollConfig{
 		BaseEdit{
-			ChatID:    chatID,
+			BaseChatMessage: BaseChatMessage{
-			MessageID: messageID,
+				ChatConfig: ChatConfig{
+					ChatID: chatID,
+				},
+				MessageID: messageID,
+			},
 		},
 	}
 }
@@ -872,7 +906,7 @@ func NewStopPoll(chatID int64, messageID int) StopPollConfig {
 func NewDice(chatID int64) DiceConfig {
 	return DiceConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 	}
 }
@@ -883,7 +917,7 @@ func NewDice(chatID int64) DiceConfig {
 func NewDiceWithEmoji(chatID int64, emoji string) DiceConfig {
 	return DiceConfig{
 		BaseChat: BaseChat{
-			ChatID: chatID,
+			ChatConfig: ChatConfig{ChatID: chatID},
 		},
 		Emoji: emoji,
 	}

helper_structs.go

@@ -0,0 +1,127 @@
+package tgbotapi
+
+// ChatConfig is a base type for all chat identifiers
+type ChatConfig struct {
+	ChatID             int64
+	ChannelUsername    string
+	SuperGroupUsername string
+}
+
+func (base ChatConfig) params() (Params, error) {
+	return base.paramsWithKey("chat_id")
+}
+
+func (base ChatConfig) paramsWithKey(key string) (Params, error) {
+	params := make(Params)
+	return params, params.AddFirstValid(key, base.ChatID, base.ChannelUsername, base.SuperGroupUsername)
+}
+
+// BaseChat is base type for all chat config types.
+type BaseChat struct {
+	ChatConfig
+	MessageThreadID     int
+	ProtectContent      bool
+	ReplyMarkup         interface{}
+	DisableNotification bool
+	ReplyParameters     ReplyParameters
+}
+
+func (chat *BaseChat) params() (Params, error) {
+	params, err := chat.ChatConfig.params()
+	if err != nil {
+		return params, err
+	}
+
+	params.AddNonZero("message_thread_id", chat.MessageThreadID)
+	params.AddBool("disable_notification", chat.DisableNotification)
+	params.AddBool("protect_content", chat.ProtectContent)
+
+	err = params.AddInterface("reply_markup", chat.ReplyMarkup)
+	if err != nil {
+		return params, err
+	}
+	err = params.AddInterface("reply_parameters", chat.ReplyParameters)
+	return params, err
+}
+
+// BaseFile is a base type for all file config types.
+type BaseFile struct {
+	BaseChat
+	File RequestFileData
+}
+
+func (file BaseFile) params() (Params, error) {
+	return file.BaseChat.params()
+}
+
+// BaseEdit is base type of all chat edits.
+type BaseEdit struct {
+	BaseChatMessage
+	InlineMessageID string
+	ReplyMarkup     *InlineKeyboardMarkup
+}
+
+func (edit BaseEdit) params() (Params, error) {
+	params := make(Params)
+
+	if edit.InlineMessageID != "" {
+		params["inline_message_id"] = edit.InlineMessageID
+	} else {
+		p1, err := edit.BaseChatMessage.params()
+		if err != nil {
+			return params, err
+		}
+		params.Merge(p1)
+	}
+
+	err := params.AddInterface("reply_markup", edit.ReplyMarkup)
+
+	return params, err
+}
+
+// BaseSpoiler is base type of structures with spoilers.
+type BaseSpoiler struct {
+	HasSpoiler bool
+}
+
+func (spoiler BaseSpoiler) params() (Params, error) {
+	params := make(Params)
+
+	if spoiler.HasSpoiler {
+		params.AddBool("has_spoiler", true)
+	}
+
+	return params, nil
+}
+
+// BaseChatMessage is a base type for all messages in chats.
+type BaseChatMessage struct {
+	ChatConfig
+	MessageID int
+}
+
+func (base BaseChatMessage) params() (Params, error) {
+	params, err := base.ChatConfig.params()
+	if err != nil {
+		return params, err
+	}
+	params.AddNonZero("message_id", base.MessageID)
+
+	return params, nil
+}
+
+// BaseChatMessages is a base type for all messages in chats.
+type BaseChatMessages struct {
+	ChatConfig
+	MessageIDs []int
+}
+
+func (base BaseChatMessages) params() (Params, error) {
+	params, err := base.ChatConfig.params()
+	if err != nil {
+		return params, err
+	}
+	err = params.AddInterface("message_ids", base.MessageIDs)
+
+	return params, err
+}

params.go

@@ -101,4 +101,4 @@ func (p *Params) Merge(p1 Params) {
 	for k, v := range p1 {
 		(*p)[k] = v
 	}
-}
+}

types.go

@@ -61,6 +61,14 @@ type Update struct {
 	//
 	// optional
 	EditedChannelPost *Message `json:"edited_channel_post,omitempty"`
+	// MessageReaction is a reaction to a message was changed by a user.
+	//
+	// optional
+	MessageReaction *MessageReactionUpdated `json:"message_reaction,omitempty"`
+	// MessageReactionCount reactions to a message with anonymous reactions were changed.
+	//
+	// optional
+	MessageReactionCount *MessageReactionCountUpdated `json:"message_reaction_count,omitempty"`
 	// InlineQuery new incoming inline query
 	//
 	// optional
@@ -276,6 +284,11 @@ type Chat struct {
 	//
 	// optional
 	ActiveUsernames []string `json:"active_usernames,omitempty"`
+	// AvailableReactions is a list of available reactions allowed in the chat.
+	// If omitted, then all emoji reactions are allowed. Returned only in getChat.
+	//
+	// optional
+	AvailableReactions []ReactionType `json:"available_reactions,omitempty"`
 	// Custom emoji identifier of emoji status of the other party
 	// in a private chat. Returned only in getChat.
 	//
@@ -476,6 +489,15 @@ type Message struct {
 	//
 	// optional
 	ReplyToMessage *Message `json:"reply_to_message,omitempty"`
+	// ExternalReply is an information about the message that is being replied to,
+	// which may come from another chat or forum topic.
+	//
+	// optional
+	ExternalReply *ExternalReplyInfo `json:"external_reply,omitempty"`
+	// Quote for replies that quote part of the original message, the quoted part of the message
+	//
+	// optional
+	Quote *TextQuote `json:"text_quote,omitempty"`
 	// ViaBot through which the message was sent;
 	//
 	// optional
@@ -505,6 +527,11 @@ type Message struct {
 	//
 	// optional
 	Entities []MessageEntity `json:"entities,omitempty"`
+	// LinkPreviewOptions are options used for link preview generation for the message,
+	// if it is a text message and link preview options were changed
+	//
+	// Optional
+	LinkPreviewOptions *LinkPreviewOptions `json:"link_preview_options,omitempty"`
 	// Animation message is an animation, information about the animation.
 	// For backward compatibility, when this field is set, the document field will also be set;
 	//
@@ -663,10 +690,10 @@ type Message struct {
 	//
 	// optional
 	SuccessfulPayment *SuccessfulPayment `json:"successful_payment,omitempty"`
-	// UserShared is a service message: a user was shared with the bot
+	// UsersShared is a service message: the users were shared with the bot
 	//
 	// optional
-	UserShared *UserShared `json:"user_shared,omitempty"`
+	UsersShared *UsersShared `json:"users_shared,omitempty"`
 	// ChatShared is a service message: a chat was shared with the bot
 	//
 	// optional
@@ -832,6 +859,7 @@ type MessageEntity struct {
 	//  “underline” (underlined text),
 	//  “strikethrough” (strikethrough text),
 	//  "spoiler" (spoiler message),
+	//  “blockquote” (block quotation),
 	//  “code” (monowidth string),
 	//  “pre” (monowidth block),
 	//  “text_link” (for clickable text URLs),
@@ -925,6 +953,214 @@ func (e MessageEntity) IsTextLink() bool {
 	return e.Type == "text_link"
 }
 
+// TextQuote contains information about the quoted part of a message
+// that is replied to by the given message
+type TextQuote struct {
+	// Text of the quoted part of a message that is replied to by the given message
+	Text string `json:"text"`
+	// Entities special entities that appear in the quote.
+	// Currently, only bold, italic, underline, strikethrough, spoiler,
+	// and custom_emoji entities are kept in quotes.
+	//
+	// optional
+	Entities []MessageEntity `json:"entities,omitempty"`
+	// Position is approximate quote position in the original message
+	// in UTF-16 code units as specified by the sender
+	Position int `json:"position"`
+	// IsManual True, if the quote was chosen manually by the message sender.
+	// Otherwise, the quote was added automatically by the server.
+	//
+	// optional
+	IsManual bool `json:"is_manual,omitempty"`
+}
+
+// ExternalReplyInfo contains information about a message that is being replied to,
+// which may come from another chat or forum topic.
+type ExternalReplyInfo struct {
+	// Origin of the message replied to by the given message
+	Origin MessageOrigin `json:"origin"`
+	// Chat is the conversation the message belongs to
+	Chat *Chat `json:"chat"`
+	// MessageID is a unique message identifier inside this chat
+	MessageID int `json:"message_id"`
+	// LinkPreviewOptions used for link preview generation for the original message,
+	// if it is a text message
+	//
+	// Optional
+	LinkPreviewOptions *LinkPreviewOptions `json:"link_preview_options,omitempty"`
+	// Animation message is an animation, information about the animation.
+	// For backward compatibility, when this field is set, the document field will also be set;
+	//
+	// optional
+	Animation *Animation `json:"animation,omitempty"`
+	// Audio message is an audio file, information about the file;
+	//
+	// optional
+	Audio *Audio `json:"audio,omitempty"`
+	// Document message is a general file, information about the file;
+	//
+	// optional
+	Document *Document `json:"document,omitempty"`
+	// Photo message is a photo, available sizes of the photo;
+	//
+	// optional
+	Photo []PhotoSize `json:"photo,omitempty"`
+	// Sticker message is a sticker, information about the sticker;
+	//
+	// optional
+	Sticker *Sticker `json:"sticker,omitempty"`
+	// Story message is a forwarded story;
+	//
+	// optional
+	Story *Story `json:"story,omitempty"`
+	// Video message is a video, information about the video;
+	//
+	// optional
+	Video *Video `json:"video,omitempty"`
+	// VideoNote message is a video note, information about the video message;
+	//
+	// optional
+	VideoNote *VideoNote `json:"video_note,omitempty"`
+	// Voice message is a voice message, information about the file;
+	//
+	// optional
+	Voice *Voice `json:"voice,omitempty"`
+	// HasMediaSpoiler True, if the message media is covered by a spoiler animation
+	//
+	// optional
+	HasMediaSpoiler bool `json:"has_media_spoiler,omitempty"`
+	// Contact message is a shared contact, information about the contact;
+	//
+	// optional
+	Contact *Contact `json:"contact,omitempty"`
+	// Dice is a dice with random value;
+	//
+	// optional
+	Dice *Dice `json:"dice,omitempty"`
+	// Game message is a game, information about the game;
+	//
+	// optional
+	Game *Game `json:"game,omitempty"`
+	// Giveaway is information about the giveaway
+	//
+	// optional
+	Giveaway *Giveaway `json:"giveaway,omitempty"`
+	// GiveawayWinners a giveaway with public winners was completed
+	//
+	// optional
+	GiveawayWinners *GiveawayWinners `json:"giveaway_winners,omitempty"`
+	// Invoice message is an invoice for a payment;
+	//
+	// optional
+	Invoice *Invoice `json:"invoice,omitempty"`
+	// Location message is a shared location, information about the location;
+	//
+	// optional
+	Location *Location `json:"location,omitempty"`
+	// Poll is a native poll, information about the poll;
+	//
+	// optional
+	Poll *Poll `json:"poll,omitempty"`
+	// Venue message is a venue, information about the venue.
+	// For backward compatibility, when this field is set, the location field
+	// will also be set;
+	//
+	// optional
+	Venue *Venue `json:"venue,omitempty"`
+}
+
+// ReplyParameters describes reply parameters for the message that is being sent.
+type ReplyParameters struct {
+	// MessageID identifier of the message that will be replied to in
+	// the current chat, or in the chat chat_id if it is specified
+	MessageID int `json:"message_id"`
+	// ChatID 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)
+	//
+	// optional
+	ChatID interface{} `json:"chat_id,omitempty"`
+	// AllowSendingWithoutReply true if the message should be sent even
+	// if the specified message to be replied to is not found;
+	// can be used only for replies in the same chat and forum topic.
+	//
+	// optional
+	AllowSendingWithoutReply bool `json:"allow_sending_without_reply,omitempty"`
+	// Quote is a 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.
+	//
+	// optional
+	Quote string `json:"quote,omitempty"`
+	// QuoteParseMode mode for parsing entities in the quote.
+	//
+	// optional
+	QuoteParseMode string `json:"quote_parse_mode,omitempty"`
+	// QuoteEntities a JSON-serialized list of special entities that appear in the quote.
+	// It can be specified instead of quote_parse_mode.
+	//
+	// optional
+	QuoteEntities []MessageEntity `json:"quote_entities,omitempty"`
+	// QuotePosition is a position of the quote in the original message in UTF-16 code units
+	//
+	// optional
+	QuotePosition int `json:"quote_position,omitempty"`
+}
+
+const (
+	MessageOriginUser       = "user"
+	MessageOriginHiddenUser = "hidden_user"
+	MessageOriginChat       = "chat"
+	MessageOriginChannel    = "channel"
+)
+
+// MessageOrigin describes the origin of a message. It can be one of: "user", "hidden_user", "origin_chat", "origin_channel"
+type MessageOrigin struct {
+	// Type of the message origin.
+	Type string `json:"type"`
+	// Date the message was sent originally in Unix time
+	Date int64 `json:"date"`
+	// SenderUser "user" only.
+	// Is a user that sent the message originally
+	SenderUser *User `json:"sender_user,omitempty"`
+	// SenderUserName "hidden_user" only.
+	// Name of the user that sent the message originally
+	SenderUserName string `json:"sender_user_name,omitempty"`
+	// SenderChat "chat" and "channel".
+	// For "chat": Chat that sent the message originally
+	// For "channel": Channel chat to which the message was originally sent
+	SenderChat *Chat `json:"sender_chat,omitempty"`
+	// AuthorSignature "chat" and "channel".
+	// For "chat": For messages originally sent by an anonymous chat administrator,
+	// original message author signature.
+	// For "channel": Signature of the original post author
+	//
+	// Optional
+	AuthorSignature string `json:"author_signature,omitempty"`
+	// MessageID "channel" only.
+	// Unique message identifier inside the chat
+	//
+	// Optional
+	MessageID int `json:"message_id,omitempty"`
+}
+
+func (m MessageOrigin) IsUser() bool {
+	return m.Type == MessageOriginUser
+}
+
+func (m MessageOrigin) IsHiddenUser() bool {
+	return m.Type == MessageOriginHiddenUser
+}
+
+func (m MessageOrigin) IsChat() bool {
+	return m.Type == MessageOriginChat
+}
+
+func (m MessageOrigin) IsChannel() bool {
+	return m.Type == MessageOriginChannel
+}
+
 // PhotoSize represents one size of a photo or a file / sticker thumbnail.
 type PhotoSize struct {
 	// FileID identifier for this file, which can be used to download or reuse
@@ -1351,13 +1587,13 @@ type GeneralForumTopicHidden struct {
 type GeneralForumTopicUnhidden struct {
 }
 
-// UserShared object contains information about the user whose identifier
+// UsersShared object contains information about the user whose identifier
 // was shared with the bot using a KeyboardButtonRequestUser button.
-type UserShared struct {
+type UsersShared struct {
 	// RequestID is an indentifier of the request.
 	RequestID int `json:"request_id"`
-	// UserID in an identifier of the shared user.
+	// UserIDs are identifiers of the shared user.
-	UserID int64 `json:"user_id"`
+	UserIDs []int64 `json:"user_ids"`
 }
 
 // ChatShared contains information about the chat whose identifier
@@ -1423,6 +1659,115 @@ type VideoChatParticipantsInvited struct {
 	Users []User `json:"users,omitempty"`
 }
 
+// Giveaway represents a message about a scheduled giveaway.
+type Giveaway struct {
+	// Chats is the list of chats which the user must join to participate in the giveaway
+	Chats []Chat `json:"chats"`
+	// WinnersSelectionDate is point in time (Unix timestamp) when
+	// winners of the giveaway will be selected
+	WinnersSelectionDate int64 `json:"winners_selection_date"`
+	// WinnerCount is the number of users which are supposed
+	// to be selected as winners of the giveaway
+	WinnerCount int `json:"winner_count"`
+	// OnlyNewMembers True, if only users who join the chats after
+	// the giveaway started should be eligible to win
+	//
+	// optional
+	OnlyNewMembers bool `json:"only_new_members,omitempty"`
+	// HasPublicWinners True, if the list of giveaway winners will be visible to everyone
+	//
+	// optional
+	HasPublicWinners bool `json:"has_public_winners,omitempty"`
+	// PrizeDescription is description of additional giveaway prize
+	//
+	// optional
+	PrizeDescription string `json:"prize_description,omitempty"`
+	// CountryCodes is a list of two-letter ISO 3166-1 alpha-2 country codes
+	// indicating the countries from which eligible users for the giveaway must come.
+	// If empty, then all users can participate in the giveaway.
+	//
+	// optional
+	CountryCodes []string `json:"country_codes,omitempty"`
+	// PremiumSubscriptionMonthCount the number of months the Telegram Premium
+	// subscription won from the giveaway will be active for
+	//
+	// optional
+	PremiumSubscriptionMonthCount int `json:"premium_subscription_month_count,omitempty"`
+}
+
+// Giveaway represents a message about a scheduled giveaway.
+type GiveawayWinners struct {
+	// Chat that created the giveaway
+	Chat Chat `json:"chat"`
+	// GiveawayMessageID is the identifier of the messsage with the giveaway in the chat
+	GiveawayMessageID int `json:"giveaway_message_id"`
+	// WinnersSelectionDate is point in time (Unix timestamp) when
+	// winners of the giveaway will be selected
+	WinnersSelectionDate int64 `json:"winners_selection_date"`
+	// WinnerCount is the number of users which are supposed
+	// to be selected as winners of the giveaway
+	WinnerCount int `json:"winner_count"`
+	// Winners is a list of up to 100 winners of the giveaway
+	Winners []User `json:"winners"`
+	// AdditionalChatCount is the number of other chats
+	// the user had to join in order to be eligible for the giveaway
+	//
+	// optional
+	AdditionalChatCount int `json:"additional_chat_count,omitempty"`
+	// PremiumSubscriptionMonthCount the number of months the Telegram Premium
+	// subscription won from the giveaway will be active for
+	//
+	// optional
+	PremiumSubscriptionMonthCount int `json:"premium_subscription_month_count,omitempty"`
+	// UnclaimedPrizeCount is the number of undistributed prizes
+	//
+	// optional
+	UnclaimedPrizeCount int `json:"unclaimed_prize_count,omitempty"`
+	// OnlyNewMembers True, if only users who join the chats after
+	// the giveaway started should be eligible to win
+	//
+	// optional
+	OnlyNewMembers bool `json:"only_new_members,omitempty"`
+	// WasRefunded True, if the giveaway was canceled because the payment for it was refunded
+	//
+	// optional
+	WasRefunded bool `json:"was_refunded,omitempty"`
+	// PrizeDescription is description of additional giveaway prize
+	//
+	// optional
+	PrizeDescription string `json:"prize_description,omitempty"`
+}
+
+// LinkPreviewOptions describes the options used for link preview generation.
+type LinkPreviewOptions struct {
+	// IsDisabled True, if the link preview is disabled
+	//
+	// optional
+	IsDisabled bool `json:"is_disabled,omitempty"`
+	// URL to use for the link preview. If empty,
+	// then the first URL found in the message text will be used
+	//
+	// optional
+	URL string `json:"url,omitempty"`
+	// PreferSmallMedia True, if the media in the link preview is suppposed
+	//  to be shrunk; ignored if the URL isn't explicitly specified
+	// or media size change isn't supported for the preview
+	//
+	// optional
+	PreferSmallMedia bool `json:"prefer_small_media,omitempty"`
+	// PreferLargeMedia True, if the media in the link preview is suppposed
+	// to be enlarged; ignored if the URL isn't explicitly specified
+	// or media size change isn't supported for the preview
+	//
+	// optional
+	PreferLargeMedia bool `json:"prefer_large_media,omitempty"`
+	// ShowAboveText True, if the link preview must be shown above the message text;
+	// otherwise, the link preview will be shown below the message text
+	//
+	// optional
+	ShowAboveText bool `json:"show_above_text,omitempty"`
+}
+
 // UserProfilePhotos contains a set of user profile photos.
 type UserProfilePhotos struct {
 	// TotalCount total number of profile pictures the target user has
@@ -1516,13 +1861,13 @@ type KeyboardButton struct {
 	// Text of the button. If none of the optional fields are used,
 	// it will be sent as a message when the button is pressed.
 	Text string `json:"text"`
-	// RequestUser if specified, pressing the button will open
+	// RequestUsers if specified, pressing the button will open
 	// a list of suitable users. Tapping on any user will send
 	// their identifier to the bot in a "user_shared" service message.
 	// Available in private chats only.
 	//
 	// optional
-	RequestUser *KeyboardButtonRequestUser `json:"request_user,omitempty"`
+	RequestUsers *KeyboardButtonRequestUsers `json:"request_users,omitempty"`
 	// RequestChat if specified, pressing the button will open
 	// a list of suitable chats. Tapping on a chat will send
 	// its identifier to the bot in a "chat_shared" service message.
@@ -1555,10 +1900,10 @@ type KeyboardButton struct {
 	WebApp *WebAppInfo `json:"web_app,omitempty"`
 }
 
-// KeyboardButtonRequestUser defines the criteria used to request
+// KeyboardButtonRequestUsers defines the criteria used to request
 // a suitable user. The identifier of the selected user will be shared
 // with the bot when the corresponding button is pressed.
-type KeyboardButtonRequestUser struct {
+type KeyboardButtonRequestUsers struct {
 	// RequestID is a signed 32-bit identifier of the request.
 	RequestID int `json:"request_id"`
 	// UserIsBot pass True to request a bot,
@@ -1573,6 +1918,11 @@ type KeyboardButtonRequestUser struct {
 	//
 	// optional
 	UserIsPremium bool `json:"user_is_premium,omitempty"`
+	// MaxQuantity is the maximum number of users to be selected.
+	// 1-10. Defaults to 1
+	//
+	// optional
+	MaxQuantity int `json:"max_quantity,omitempty"`
 }
 
 // KeyboardButtonRequestChat defines the criteria used to request
@@ -2242,6 +2592,72 @@ type ChatLocation struct {
 	Address string `json:"address"`
 }
 
+const (
+	ReactionTypeEmoji       = "emoji"
+	ReactionTypeCustomEmoji = "custom_emoji"
+)
+
+// ReactionType describes the type of a reaction. Currently, it can be one of: "emoji", "custom_emoji"
+type ReactionType struct {
+	// Type of the reaction. Can be "emoji", "custom_emoji"
+	Type string `json:"type"`
+	// Emoji type "emoji" only. Is a reaction emoji.
+	Emoji string `json:"emoji"`
+	// CustomEmoji type "custom_emoji" only. Is a custom emoji identifier.
+	CustomEmoji string `json:"custom_emoji"`
+}
+
+func (r ReactionType) IsEmoji() bool {
+	return r.Type == ReactionTypeEmoji
+}
+
+func (r ReactionType) IsCustomEmoji() bool {
+	return r.Type == ReactionTypeCustomEmoji
+}
+
+// ReactionCount represents a reaction added to a message along with the number of times it was added.
+type ReactionCount struct {
+	// Type of the reaction
+	Type ReactionType `json:"type"`
+	// TotalCount number of times the reaction was added
+	TotalCount int `json:"total_count"`
+}
+
+// MessageReactionUpdated represents a change of a reaction on a message performed by a user.
+type MessageReactionUpdated struct {
+	// Chat containing the message the user reacted to.
+	Chat Chat `json:"chat"`
+	// MessageID unique identifier of the message inside the chat.
+	MessageID int `json:"message_id"`
+	// User that changed the reaction, if the user isn't anonymous.
+	//
+	// optional
+	User *User `json:"user"`
+	// ActorChat the chat on behalf of which the reaction was changed,
+	// if the user is anonymous.
+	//
+	// optional
+	ActorChat *Chat `json:"actor_chat"`
+	// Date of the change in Unix time.
+	Date int64 `json:"date"`
+	// OldReaction is a previous list of reaction types that were set by the user.
+	OldReaction []ReactionType `json:"old_reaction"`
+	// NewReaction is a new list of reaction types that have been set by the user.
+	NewReaction []ReactionType `json:"new_reaction"`
+}
+
+// MessageReactionCountUpdated represents reaction changes on a message with anonymous reactions.
+type MessageReactionCountUpdated struct {
+	// Chat containing the message.
+	Chat Chat `json:"chat"`
+	// MessageID unique identifier of the message inside the chat.
+	MessageID int `json:"message_id"`
+	// Date of the change in Unix time.
+	Date int64 `json:"date"`
+	// Reactions is a list of reactions that are present on the message.
+	Reactions []ReactionCount `json:"reactions"`
+}
+
 // ForumTopic represents a forum topic.
 type ForumTopic struct {
 	// MessageThreadID is the unique identifier of the forum topic
@@ -2305,6 +2721,83 @@ type MenuButton struct {
 	WebApp *WebAppInfo `json:"web_app,omitempty"`
 }
 
+const (
+	ChatBoostSourcePremium  = "premium"
+	ChatBoostSourceGiftCode = "gift_code"
+	ChatBoostSourceGiveaway = "giveaway"
+)
+
+// ChatBoostSource describes the source of a chat boost
+type ChatBoostSource struct {
+	// Source of the boost, It can be one of:
+	// "premium", "gift_code", "giveaway"
+	Source string `json:"source"`
+	// For "premium": User that boosted the chat
+	// For "gift_code": User for which the gift code was created
+	// Optional for "giveaway": User that won the prize in the giveaway if any
+	User *User `json:"user,omitempty"`
+	// GiveawayMessageID "giveaway" only.
+	// Is an identifier of a message in the chat with the giveaway;
+	// the message could have been deleted already. May be 0 if the message isn't sent yet.
+	GiveawayMessageID int `json:"giveaway_message_id,omitempty"`
+	// IsUnclaimed "giveaway" only.
+	// True, if the giveaway was completed, but there was no user to win the prize
+	//
+	// optional
+	IsUnclaimed bool `json:"is_unclaimed,omitempty"`
+}
+
+func (c ChatBoostSource) IsPremium() bool {
+	return c.Source == ChatBoostSourcePremium
+}
+
+func (c ChatBoostSource) IsGiftCode() bool {
+	return c.Source == ChatBoostSourceGiftCode
+}
+
+func (c ChatBoostSource) IsGiveaway() bool {
+	return c.Source == ChatBoostSourceGiveaway
+}
+
+// ChatBoost contains information about a chat boost.
+type ChatBoost struct {
+	// BoostID is an unique identifier of the boost
+	BoostID string `json:"boost_id"`
+	// AddDate is a point in time (Unix timestamp) when the chat was boosted
+	AddDate int64 `json:"add_date"`
+	// ExpirationDate is a point in time (Unix timestamp) when the boost will
+	// automatically expire, unless the booster's Telegram Premium subscription is prolonged
+	ExpirationDate int64 `json:"expiration_date"`
+	// Source of the added boost
+	Source ChatBoostSource `json:"source"`
+}
+
+// ChatBoostUpdated represents a boost added to a chat or changed.
+type ChatBoostUpdated struct {
+	// Chat which was boosted
+	Chat Chat `json:"chat"`
+	// Boost infomation about the chat boost
+	Boost ChatBoost `json:"boost"`
+}
+
+// ChatBoostRemoved represents a boost removed from a chat.
+type ChatBoostRemoved struct {
+	// Chat which was boosted
+	Chat Chat `json:"chat"`
+	// BoostID unique identifier of the boost
+	BoostID string `json:"boost_id"`
+	// RemoveDate point in time (Unix timestamp) when the boost was removed
+	RemoveDate int64 `json:"remove_date"`
+	// Source of the removed boost
+	Source ChatBoostSource `json:"source"`
+}
+
+// UserChatBoosts represents a list of boosts added to a chat by a user.
+type UserChatBoosts struct {
+	// Boosts is the list of boosts added to the chat by the user
+	Boosts []ChatBoost `json:"boosts"`
+}
+
 // ResponseParameters are various errors that can be returned in APIResponse.
 type ResponseParameters struct {
 	// The group has been migrated to a supergroup with the specified identifier.
@@ -3576,10 +4069,10 @@ type InputTextMessageContent struct {
 	//
 	// optional
 	Entities []MessageEntity `json:"entities,omitempty"`
-	// DisableWebPagePreview disables link previews for links in the sent message
+	// LinkPreviewOptions used for link preview generation for the original message
 	//
-	// optional
+	// Optional
-	DisableWebPagePreview bool `json:"disable_web_page_preview,omitempty"`
+	LinkPreviewOptions *LinkPreviewOptions `json:"link_preview_options,omitempty"`
 }
 
 // InputLocationMessageContent contains a location for displaying

types_test.go

@@ -341,6 +341,7 @@ var (
 	_ Chattable = UnbanChatSenderChatConfig{}
 	_ Chattable = UnpinChatMessageConfig{}
 	_ Chattable = UpdateConfig{}
+	_ Chattable = SetMessageReactionConfig{}
 	_ Chattable = UserProfilePhotosConfig{}
 	_ Chattable = VenueConfig{}
 	_ Chattable = VideoConfig{}
@@ -359,6 +360,7 @@ var (
 	_ Chattable = ReopenGeneralForumTopicConfig{}
 	_ Chattable = HideGeneralForumTopicConfig{}
 	_ Chattable = UnhideGeneralForumTopicConfig{}
+	_ Chattable = UnpinAllGeneralForumTopicMessagesConfig{}
 	_ Chattable = SetCustomEmojiStickerSetThumbnailConfig{}
 	_ Chattable = SetStickerSetTitleConfig{}
 	_ Chattable = DeleteStickerSetConfig{}