Merge remote-tracking branch 'upstream/master' into inline-sticker

helpers.go

@@ -614,6 +614,18 @@ func NewInlineQueryResultLocation(id, title string, latitude, longitude float64)
 	}
 }
 
+// NewInlineQueryResultVenue creates a new inline query venue.
+func NewInlineQueryResultVenue(id, title, address string, latitude, longitude float64) InlineQueryResultVenue {
+	return InlineQueryResultVenue{
+		Type:      "venue",
+		ID:        id,
+		Title:     title,
+		Address:   address,
+		Latitude:  latitude,
+		Longitude: longitude,
+	}
+}
+
 // NewEditMessageText allows you to edit the text of a message.
 func NewEditMessageText(chatID int64, messageID int, text string) EditMessageTextConfig {
 	return EditMessageTextConfig{

types.go

@@ -338,13 +338,14 @@ type Document struct {
 
 // Sticker contains information about a sticker.
 type Sticker struct {
-	FileID    string     `json:"file_id"`
+	FileID     string     `json:"file_id"`
-	Width     int        `json:"width"`
+	Width      int        `json:"width"`
-	Height    int        `json:"height"`
+	Height     int        `json:"height"`
-	Thumbnail *PhotoSize `json:"thumb"`     // optional
+	Thumbnail  *PhotoSize `json:"thumb"`       // optional
-	Emoji     string     `json:"emoji"`     // optional
+	Emoji      string     `json:"emoji"`       // optional
-	FileSize  int        `json:"file_size"` // optional
+	FileSize   int        `json:"file_size"`   // optional
-	SetName   string     `json:"set_name"`  // optional
+	SetName    string     `json:"set_name"`    // optional
+	IsAnimated bool       `json:"is_animated"` // optional
 }
 
 // ChatAnimation contains information about an animation.
@@ -838,6 +839,23 @@ type InlineQueryResultLocation struct {
 	ThumbHeight         int                   `json:"thumb_height"`
 }
 
+// InlineQueryResultVenue is an inline query response venue.
+type InlineQueryResultVenue struct {
+	Type                string                `json:"type"`      // required
+	ID                  string                `json:"id"`        // required
+	Latitude            float64               `json:"latitude"`  // required
+	Longitude           float64               `json:"longitude"` // required
+	Title               string                `json:"title"`     // required
+	Address             string                `json:"address"`   // required
+	FoursquareID        string                `json:"foursquare_id"`
+	FoursquareType      string                `json:"foursquare_type"`
+	ReplyMarkup         *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+	InputMessageContent interface{}           `json:"input_message_content,omitempty"`
+	ThumbURL            string                `json:"thumb_url"`
+	ThumbWidth          int                   `json:"thumb_width"`
+	ThumbHeight         int                   `json:"thumb_height"`
+}
+
 // InlineQueryResultGame is an inline query response game.
 type InlineQueryResultGame struct {
 	Type          string                `json:"type"`