Fix backwards compatibility for Live Location.
Syfaro syfaro@huefox.com
Fri, 29 Dec 2017 13:00:02 -0600
4 files changed,
14 insertions(+),
17 deletions(-)
M
bot_test.go
→
bot_test.go
@@ -266,7 +266,7 @@
func TestSendWithLocation(t *testing.T) { bot, _ := getBot(t) - _, err := bot.Send(tgbotapi.NewLocation(ChatID, 40, 40, 86400)) + _, err := bot.Send(tgbotapi.NewLocation(ChatID, 40, 40)) if err != nil { t.Error(err)
M
configs.go
→
configs.go
@@ -600,8 +600,8 @@
// LocationConfig contains information about a SendLocation request. type EditMessageLiveLocationConfig struct { BaseEdit - Latitude float64 // required - Longitude float64 // required + Latitude float64 // required + Longitude float64 // required } // values returns a url.Values representation of EditMessageLiveLocationConfig.
M
helpers.go
→
helpers.go
@@ -268,14 +268,13 @@
// NewLocation shares your location. // // chatID is where to send it, latitude and longitude are coordinates. -func NewLocation(chatID int64, latitude float64, longitude float64, live_period int) LocationConfig { +func NewLocation(chatID int64, latitude float64, longitude float64) LocationConfig { return LocationConfig{ BaseChat: BaseChat{ ChatID: chatID, }, - Latitude: latitude, - Longitude: longitude, - LivePeriod: live_period, + Latitude: latitude, + Longitude: longitude, } }@@ -466,14 +465,13 @@ }
} // NewInlineQueryResultLocation creates a new inline query location. -func NewInlineQueryResultLocation(id, title string, latitude, longitude float64, live_period int) InlineQueryResultLocation { +func NewInlineQueryResultLocation(id, title string, latitude, longitude float64) InlineQueryResultLocation { return InlineQueryResultLocation{ - Type: "location", - ID: id, - Title: title, - Latitude: latitude, - Longitude: longitude, - LivePeriod: live_period, + Type: "location", + ID: id, + Title: title, + Latitude: latitude, + Longitude: longitude, } }
M
helpers_test.go
→
helpers_test.go
@@ -127,14 +127,13 @@ }
} func TestNewInlineQueryResultLocation(t *testing.T) { - result := tgbotapi.NewInlineQueryResultLocation("id", "name", 40, 50, 86400) + result := tgbotapi.NewInlineQueryResultLocation("id", "name", 40, 50) if result.Type != "location" || result.ID != "id" || result.Title != "name" || result.Latitude != 40 || - result.Longitude != 50 || - result.LivePeriod != 86400 { + result.Longitude != 50 { t.Fail() } }