1
0
Fork 0

🚨 Removed linter warnings

This commit is contained in:
Maxim Lebedev 2018-10-12 16:47:49 +05:00
parent 49364f3fae
commit b3f324e1b3
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F
1 changed files with 10 additions and 10 deletions

View File

@ -54,17 +54,17 @@ voice notes will be sent as files.
* Other configurations may work but we can't guarantee that they will. * Other configurations may work but we can't guarantee that they will.
*/ */
func (bot *Bot) Upload(method, key, name string, file InputFile, args *http.Args) (response *Response, err error) { func (b *Bot) Upload(method, key, name string, file InputFile, args *http.Args) (response *Response, err error) {
buffer := bytes.NewBuffer(nil) buffer := bytes.NewBuffer(nil)
multi := multipart.NewWriter(buffer) multi := multipart.NewWriter(buffer)
requestURI := http.AcquireURI() requestURI := http.AcquireURI()
requestURI.SetScheme("https") requestURI.SetScheme("https")
requestURI.SetHost("api.telegram.org") requestURI.SetHost("api.telegram.org")
requestURI.SetPath(path.Join("bot"+bot.AccessToken, method)) requestURI.SetPath(path.Join("bot"+b.AccessToken, method))
args.VisitAll(func(key, value []byte) { args.VisitAll(func(key, value []byte) {
multi.WriteField(string(key), string(value)) _ = multi.WriteField(string(key), string(value))
}) })
if err = createFileField(multi, file, key, name); err != nil { if err = createFileField(multi, file, key, name); err != nil {
@ -109,8 +109,7 @@ func (bot *Bot) Upload(method, key, name string, file InputFile, args *http.Args
return return
} }
func createFileField(w *multipart.Writer, file interface{}, key, val string) error { func createFileField(w *multipart.Writer, file interface{}, key, val string) (err error) {
var err error
switch src := file.(type) { switch src := file.(type) {
case string: // Send FileID of file on disk path case string: // Send FileID of file on disk path
err = createFileFieldString(w, key, src) err = createFileFieldString(w, key, src)
@ -121,13 +120,14 @@ func createFileField(w *multipart.Writer, file interface{}, key, val string) err
case io.Reader: // Upload new case io.Reader: // Upload new
err = createFileFieldRaw(w, key, val, src) err = createFileFieldRaw(w, key, val, src)
default: default:
return ErrBadFileType err = ErrBadFileType
} }
return err
return
} }
func createFileFieldString(w *multipart.Writer, key, src string) error { func createFileFieldString(w *multipart.Writer, key, src string) (err error) {
_, err := os.Stat(src) _, err = os.Stat(src)
switch { switch {
case os.IsNotExist(err): case os.IsNotExist(err):
@ -136,7 +136,7 @@ func createFileFieldString(w *multipart.Writer, key, src string) error {
err = uploadFromDisk(w, key, src) err = uploadFromDisk(w, key, src)
} }
return err return
} }
func uploadFromDisk(w *multipart.Writer, key, src string) error { func uploadFromDisk(w *multipart.Writer, key, src string) error {