Small updates. Readme updated

bot-api-6.1
Gleb Sinyavsky 2015-11-21 17:31:59 +03:00
parent 2a5cf8652d
commit 5859ba3970
3 changed files with 19 additions and 19 deletions

View File

@ -24,27 +24,27 @@ import (
func main() { func main() {
bot, err := tgbotapi.NewBotAPI("MyAwesomeBotToken") bot, err := tgbotapi.NewBotAPI("MyAwesomeBotToken")
if err != nil { if err != nil {
log.Panic(err) 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 := tgbotapi.NewUpdate(0)
u.Timeout = 60 u.Timeout = 60
err = bot.UpdatesChan(u) updates, err := bot.GetUpdatesChan(u)
for update := range bot.Updates { for update := range updates {
log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text)
msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text) msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text)
msg.ReplyToMessageID = update.Message.MessageID msg.ReplyToMessageID = update.Message.MessageID
bot.Send(msg) bot.Send(msg)
} }
} }
``` ```
@ -74,10 +74,10 @@ func main() {
log.Fatal(err) 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) 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) log.Printf("%+v\n", update)
} }
} }

2
bot.go
View File

@ -394,7 +394,7 @@ func (bot *BotAPI) SetWebhook(config WebhookConfig) (APIResponse, error) {
} }
// UpdatesChan starts a channel for getting updates. // 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) updatesChan := make(chan Update, 100)
go func() { go func() {

View File

@ -396,7 +396,7 @@ func TestUpdatesChan(t *testing.T) {
var ucfg tgbotapi.UpdateConfig = tgbotapi.NewUpdate(0) var ucfg tgbotapi.UpdateConfig = tgbotapi.NewUpdate(0)
ucfg.Timeout = 60 ucfg.Timeout = 60
_, err := bot.UpdatesChan(ucfg) _, err := bot.GetUpdatesChan(ucfg)
if err != nil { if err != nil {
t.Fail() t.Fail()
@ -416,7 +416,7 @@ func ExampleNewBotAPI() {
u := tgbotapi.NewUpdate(0) u := tgbotapi.NewUpdate(0)
u.Timeout = 60 u.Timeout = 60
updates, err := bot.UpdatesChan(u) updates, err := bot.GetUpdatesChan(u)
for update := range updates { for update := range updates {
log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text)