diff --git a/bot.go b/bot.go index b0cac2a..1b62cff 100644 --- a/bot.go +++ b/bot.go @@ -423,20 +423,3 @@ func (bot *BotAPI) ListenForWebhook(pattern string) http.Handler { return handler } - -// SendChatAction sets a current action in a chat. -// -// Requires ChatID and a valid Action (see Chat constants). -func (bot *BotAPI) SendChatAction(config ChatActionConfig) error { - v, err := config.Values() - if err != nil { - return err - } - - _, err = bot.MakeRequest("sendChatAction", v) - if err != nil { - return err - } - - return nil -} diff --git a/bot_test.go b/bot_test.go index a86cd36..6767955 100644 --- a/bot_test.go +++ b/bot_test.go @@ -2,13 +2,13 @@ package tgbotapi_test import ( "github.com/zhulik/telegram-bot-api" + "io/ioutil" "log" "net/http" "net/http/httptest" "os" "strings" "testing" - "io/ioutil" ) func TestMain(m *testing.M) { @@ -117,8 +117,6 @@ func TestSendWithNewPhoto(t *testing.T) { } } - - func TestSendWithNewPhotoWithFileBytes(t *testing.T) { bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) @@ -138,7 +136,6 @@ func TestSendWithNewPhotoWithFileBytes(t *testing.T) { } } - func TestSendWithNewPhotoWithFileReader(t *testing.T) { bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) @@ -158,7 +155,6 @@ func TestSendWithNewPhotoWithFileReader(t *testing.T) { } } - func TestSendWithNewPhotoReply(t *testing.T) { bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) @@ -435,7 +431,7 @@ func TestSendChatConfig(t *testing.T) { t.Fail() } - err = bot.SendChatAction(tgbotapi.NewChatAction(76918703, tgbotapi.ChatTyping)) + _, err = bot.Send(tgbotapi.NewChatAction(76918703, tgbotapi.ChatTyping)) if err != nil { t.Fail() diff --git a/configs.go b/configs.go index d01da3c..0c82828 100644 --- a/configs.go +++ b/configs.go @@ -415,6 +415,10 @@ func (config ChatActionConfig) Values() (url.Values, error) { return v, nil } +func (config ChatActionConfig) Method() string { + return "sendChatAction" +} + // UserProfilePhotosConfig contains information about a GetUserProfilePhotos request. type UserProfilePhotosConfig struct { UserID int