Tomansru
/
telegram-bot-api
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed file uploading and sending

Browse Source
pull/46/head
Donnie Adams 10 years ago
parent 37c9b8f7a0
commit dc450492cb
1 changed files with 9 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      methods.go

15
methods.go
Unescape View File

@ -12,6 +12,7 @@ import (
"net/url" "net/url"
"os" "os"
"strconv" "strconv"
"strings"
) )
// MakeRequest makes a request to a specific endpoint with our token. // MakeRequest makes a request to a specific endpoint with our token.
@ -192,11 +193,13 @@ func (bot *BotAPI) SendFile(config FileConfig) (Message, error) {
if !config.FileType.ValidFileType() { if !config.FileType.ValidFileType() {
return Message{}, errors.New("Invalid file type.") return Message{}, errors.New("Invalid file type.")
} }
action := "Send" + strings.Title(config.FileType.String())
if config.UseExistingPhoto { if config.UseExistingPhoto {
v := url.Values{} v := url.Values{}
v.Add("chat_id", strconv.Itoa(config.ChatID)) v.Add("chat_id", strconv.Itoa(config.ChatID))
v.Add(config.FileType.String(), config.FileID) v.Add(config.FileType.String(), config.FileID)
if config.FileType == "photo" && config.Caption != "" { log.Printf(config.Caption)
if config.FileType.String() == "photo" && config.Caption != "" {
v.Add("caption", config.Caption) v.Add("caption", config.Caption)
} }
if config.ReplyToMessageID != 0 { if config.ReplyToMessageID != 0 {
@ -211,7 +214,7 @@ func (bot *BotAPI) SendFile(config FileConfig) (Message, error) {
v.Add("reply_markup", string(data)) v.Add("reply_markup", string(data))
} }
resp, err := bot.MakeRequest("SendPhoto", v) resp, err := bot.MakeRequest(action, v)
if err != nil { if err != nil {
return Message{}, err return Message{}, err
} }
@ -220,8 +223,8 @@ func (bot *BotAPI) SendFile(config FileConfig) (Message, error) {
json.Unmarshal(resp.Result, &message) json.Unmarshal(resp.Result, &message)
if bot.Debug { if bot.Debug {
log.Printf("SendPhoto req : %+v\n", v) log.Printf(action + " req : %+v\n", v)
log.Printf("SendPhoto resp: %+v\n", message) log.Printf(action + " resp: %+v\n", message)
} }
return message, nil return message, nil
@ -244,7 +247,7 @@ func (bot *BotAPI) SendFile(config FileConfig) (Message, error) {
params["reply_markup"] = string(data) params["reply_markup"] = string(data)
} }
resp, err := bot.UploadFile("SendPhoto", params, "photo", config.FilePath) resp, err := bot.UploadFile(action, params, config.FileType.String(), config.FilePath)
if err != nil { if err != nil {
return Message{}, err return Message{}, err
} }
@ -253,7 +256,7 @@ func (bot *BotAPI) SendFile(config FileConfig) (Message, error) {
json.Unmarshal(resp.Result, &message) json.Unmarshal(resp.Result, &message)
if bot.Debug { if bot.Debug {
log.Printf("SendPhoto resp: %+v\n", message) log.Printf(action + " resp: %+v\n", message)
} }
return message, nil return message, nil