Merge remote-tracking branch 'pr0head/master' into develop

2017-12-29 12:56:31 -06:00 · 2017-12-29 12:56:31 -06:00 · 4ec899a62e
commit 4ec899a62e
parent 0a654beca4 dffc002f9e
5 changed files with 67 additions and 14 deletions
--- a/types.go
+++ b/types.go
@ -662,6 +662,7 @@ type InlineQueryResultLocation struct {
 	ID                  string                `json:"id"`        // required
 	Latitude            float64               `json:"latitude"`  // required
 	Longitude           float64               `json:"longitude"` // required
+	LivePeriod          int                   `json:"live_period"` // optional
 	Title               string                `json:"title"`     // required
 	ReplyMarkup         *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
 	InputMessageContent interface{}           `json:"input_message_content,omitempty"`