|
|
@ -8,7 +8,6 @@ import (
|
|
|
|
"mime/multipart"
|
|
|
|
"mime/multipart"
|
|
|
|
"net/http"
|
|
|
|
"net/http"
|
|
|
|
"os"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
"time"
|
|
|
@ -18,7 +17,7 @@ import (
|
|
|
|
|
|
|
|
|
|
|
|
// Raw lets you call any method of Bot API manually.
|
|
|
|
// Raw lets you call any method of Bot API manually.
|
|
|
|
func (b *Bot) Raw(method string, payload interface{}) ([]byte, error) {
|
|
|
|
func (b *Bot) Raw(method string, payload interface{}) ([]byte, error) {
|
|
|
|
url := b.URL+ "/bot" + b.Token+"/"+ method
|
|
|
|
url := b.URL + "/bot" + b.Token + "/" + method
|
|
|
|
|
|
|
|
|
|
|
|
var buf bytes.Buffer
|
|
|
|
var buf bytes.Buffer
|
|
|
|
if err := json.NewEncoder(&buf).Encode(payload); err != nil {
|
|
|
|
if err := json.NewEncoder(&buf).Encode(payload); err != nil {
|
|
|
@ -31,6 +30,7 @@ func (b *Bot) Raw(method string, payload interface{}) ([]byte, error) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
resp.Close = true
|
|
|
|
resp.Close = true
|
|
|
|
defer resp.Body.Close()
|
|
|
|
defer resp.Body.Close()
|
|
|
|
|
|
|
|
|
|
|
|
json, err := ioutil.ReadAll(resp.Body)
|
|
|
|
json, err := ioutil.ReadAll(resp.Body)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return []byte{}, wrapSystem(err)
|
|
|
|
return []byte{}, wrapSystem(err)
|
|
|
@ -39,16 +39,11 @@ func (b *Bot) Raw(method string, payload interface{}) ([]byte, error) {
|
|
|
|
return json, nil
|
|
|
|
return json, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func addFileToWriter(writer *multipart.Writer, fieldName string, file interface{}) error {
|
|
|
|
func addFileToWriter(writer *multipart.Writer,
|
|
|
|
var reader io.Reader
|
|
|
|
filename, field string, file interface{}) error {
|
|
|
|
var part io.Writer
|
|
|
|
|
|
|
|
var err error
|
|
|
|
|
|
|
|
var filename string
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var reader io.Reader
|
|
|
|
if r, ok := file.(io.Reader); ok {
|
|
|
|
if r, ok := file.(io.Reader); ok {
|
|
|
|
// Telegram requires fields to have a filename, otherwise
|
|
|
|
|
|
|
|
// `Bad Request: wrong URL host` would be returned
|
|
|
|
|
|
|
|
filename = "empty"
|
|
|
|
|
|
|
|
reader = r
|
|
|
|
reader = r
|
|
|
|
} else if path, ok := file.(string); ok {
|
|
|
|
} else if path, ok := file.(string); ok {
|
|
|
|
f, err := os.Open(path)
|
|
|
|
f, err := os.Open(path)
|
|
|
@ -56,14 +51,12 @@ func addFileToWriter(writer *multipart.Writer, fieldName string, file interface{
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
|
|
|
|
reader = f
|
|
|
|
reader = f
|
|
|
|
filename = filepath.Base(path)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return errors.Errorf("File for field `%v` should be an io.ReadCloser or string", fieldName)
|
|
|
|
return errors.Errorf("File for field `%v` should be an io.ReadCloser or string", field)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
part, err = writer.CreateFormFile(fieldName, filename)
|
|
|
|
part, err := writer.CreateFormFile(field, filename)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -72,11 +65,9 @@ func addFileToWriter(writer *multipart.Writer, fieldName string, file interface{
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (b *Bot) sendFiles(
|
|
|
|
func (b *Bot) sendFiles(method string, files map[string]File,
|
|
|
|
method string,
|
|
|
|
|
|
|
|
files map[string]File,
|
|
|
|
|
|
|
|
params map[string]string) ([]byte, error) {
|
|
|
|
params map[string]string) ([]byte, error) {
|
|
|
|
// ---
|
|
|
|
|
|
|
|
body := &bytes.Buffer{}
|
|
|
|
body := &bytes.Buffer{}
|
|
|
|
rawFiles := map[string]interface{}{}
|
|
|
|
rawFiles := map[string]interface{}{}
|
|
|
|
|
|
|
|
|
|
|
@ -102,7 +93,7 @@ func (b *Bot) sendFiles(
|
|
|
|
writer := multipart.NewWriter(body)
|
|
|
|
writer := multipart.NewWriter(body)
|
|
|
|
|
|
|
|
|
|
|
|
for field, file := range rawFiles {
|
|
|
|
for field, file := range rawFiles {
|
|
|
|
if err := addFileToWriter(writer, field, file); err != nil {
|
|
|
|
if err := addFileToWriter(writer, params["file_name"], field, file); err != nil {
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -117,7 +108,7 @@ func (b *Bot) sendFiles(
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
url := b.URL+ "/bot" + b.Token+"/"+ method
|
|
|
|
url := b.URL + "/bot" + b.Token + "/" + method
|
|
|
|
req, err := http.NewRequest("POST", url, body)
|
|
|
|
req, err := http.NewRequest("POST", url, body)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|
return nil, wrapSystem(err)
|
|
|
|