Small fixes

bot-api-6.1
Gleb Sinyavsky 2015-11-21 14:44:26 +03:00
parent 207a1a08f2
commit c4515aa388
3 changed files with 6 additions and 23 deletions

17
bot.go
View File

@ -423,20 +423,3 @@ func (bot *BotAPI) ListenForWebhook(pattern string) http.Handler {
return 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
}

View File

@ -2,13 +2,13 @@ package tgbotapi_test
import ( import (
"github.com/zhulik/telegram-bot-api" "github.com/zhulik/telegram-bot-api"
"io/ioutil"
"log" "log"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
"strings" "strings"
"testing" "testing"
"io/ioutil"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
@ -117,8 +117,6 @@ func TestSendWithNewPhoto(t *testing.T) {
} }
} }
func TestSendWithNewPhotoWithFileBytes(t *testing.T) { func TestSendWithNewPhotoWithFileBytes(t *testing.T) {
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN"))
@ -138,7 +136,6 @@ func TestSendWithNewPhotoWithFileBytes(t *testing.T) {
} }
} }
func TestSendWithNewPhotoWithFileReader(t *testing.T) { func TestSendWithNewPhotoWithFileReader(t *testing.T) {
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN"))
@ -158,7 +155,6 @@ func TestSendWithNewPhotoWithFileReader(t *testing.T) {
} }
} }
func TestSendWithNewPhotoReply(t *testing.T) { func TestSendWithNewPhotoReply(t *testing.T) {
bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN")) bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_API_TOKEN"))
@ -435,7 +431,7 @@ func TestSendChatConfig(t *testing.T) {
t.Fail() t.Fail()
} }
err = bot.SendChatAction(tgbotapi.NewChatAction(76918703, tgbotapi.ChatTyping)) _, err = bot.Send(tgbotapi.NewChatAction(76918703, tgbotapi.ChatTyping))
if err != nil { if err != nil {
t.Fail() t.Fail()

View File

@ -415,6 +415,10 @@ func (config ChatActionConfig) Values() (url.Values, error) {
return v, nil return v, nil
} }
func (config ChatActionConfig) Method() string {
return "sendChatAction"
}
// UserProfilePhotosConfig contains information about a GetUserProfilePhotos request. // UserProfilePhotosConfig contains information about a GetUserProfilePhotos request.
type UserProfilePhotosConfig struct { type UserProfilePhotosConfig struct {
UserID int UserID int