diff --git a/README.md b/README.md index be77cdb..fa826be 100644 --- a/README.md +++ b/README.md @@ -24,27 +24,27 @@ import ( func main() { bot, err := tgbotapi.NewBotAPI("MyAwesomeBotToken") - if err != nil { - log.Panic(err) - } + if err != nil { + log.Panic(err) + } - bot.Debug = true + bot.Debug = true - log.Printf("Authorized on account %s", bot.Self.UserName) + log.Printf("Authorized on account %s", bot.Self.UserName) - u := tgbotapi.NewUpdate(0) - u.Timeout = 60 + u := tgbotapi.NewUpdate(0) + u.Timeout = 60 - err = bot.UpdatesChan(u) + updates, err := bot.GetUpdatesChan(u) - for update := range bot.Updates { - log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) + for update := range updates { + log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) - msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text) - msg.ReplyToMessageID = update.Message.MessageID + msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text) + msg.ReplyToMessageID = update.Message.MessageID - bot.Send(msg) - } + bot.Send(msg) + } } ``` @@ -74,10 +74,10 @@ func main() { log.Fatal(err) } - bot.ListenForWebhook("/"+bot.Token) + updates, _ := bot.ListenForWebhook("/" + bot.Token) go http.ListenAndServeTLS("0.0.0.0:8443", "cert.pem", "key.pem", nil) - for update := range bot.Updates { + for update := range updates { log.Printf("%+v\n", update) } } diff --git a/bot.go b/bot.go index ef449dc..2f1ede1 100644 --- a/bot.go +++ b/bot.go @@ -394,7 +394,7 @@ func (bot *BotAPI) SetWebhook(config WebhookConfig) (APIResponse, error) { } // UpdatesChan starts a channel for getting updates. -func (bot *BotAPI) UpdatesChan(config UpdateConfig) (<-chan Update, error) { +func (bot *BotAPI) GetUpdatesChan(config UpdateConfig) (<-chan Update, error) { updatesChan := make(chan Update, 100) go func() { diff --git a/bot_test.go b/bot_test.go index c9ab0ca..e7d5670 100644 --- a/bot_test.go +++ b/bot_test.go @@ -396,7 +396,7 @@ func TestUpdatesChan(t *testing.T) { var ucfg tgbotapi.UpdateConfig = tgbotapi.NewUpdate(0) ucfg.Timeout = 60 - _, err := bot.UpdatesChan(ucfg) + _, err := bot.GetUpdatesChan(ucfg) if err != nil { t.Fail() @@ -416,7 +416,7 @@ func ExampleNewBotAPI() { u := tgbotapi.NewUpdate(0) u.Timeout = 60 - updates, err := bot.UpdatesChan(u) + updates, err := bot.GetUpdatesChan(u) for update := range updates { log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text)