all repos — telegram-bot-api @ d066ae74e61fca9980dcede056554426577b7748

Golang bindings for the Telegram Bot API

merge main repo changes
Amir Khazaie 733amir@gmail.com
Sat, 01 Sep 2018 10:49:31 +0430
commit

d066ae74e61fca9980dcede056554426577b7748

parent

4edcb0fa1ab5e691899ca33c58d79f517c6bf30f

5 files changed, 63 insertions(+), 16 deletions(-)

jump to
M .travis.yml → .travis.yml 
@@ -1,5 +1,6 @@
 language: go
 
 go:
-  - 1.4
-  - tip+  - '1.10'
+  - '1.11'
+  - tip
M bot.go → bot.go 
@@ -9,7 +9,6 @@ "errors"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"os"
M configs.go → configs.go 
@@ -253,9 +253,9 @@ params, _ := config.BaseFile.params()
 
 	if config.Caption != "" {
 		params["caption"] = config.Caption
-	}
-	if config.ParseMode != "" {
-		params["parse_mode"] = config.ParseMode
+		if config.ParseMode != "" {
+			params["parse_mode"] = config.ParseMode
+		}
 	}
 
 	return params, nil

@@ -271,10 +271,11 @@
 	v.Add(config.name(), config.FileID)
 	if config.Caption != "" {
 		v.Add("caption", config.Caption)
-	}
-	if config.ParseMode != "" {
-		v.Add("parse_mode", config.ParseMode)
+		if config.ParseMode != "" {
+			v.Add("parse_mode", config.ParseMode)
+		}
 	}
+
 	return v, nil
 }
 

@@ -292,6 +293,7 @@ // AudioConfig contains information about a SendAudio request.
 type AudioConfig struct {
 	BaseFile
 	Caption   string
+	ParseMode string
 	Duration  int
 	Performer string
 	Title     string

@@ -317,6 +319,9 @@ v.Add("title", config.Title)
 	}
 	if config.Caption != "" {
 		v.Add("caption", config.Caption)
+		if config.ParseMode != "" {
+			v.Add("parse_mode", config.ParseMode)
+		}
 	}
 
 	return v, nil

@@ -338,6 +343,9 @@ params["title"] = config.Title
 	}
 	if config.Caption != "" {
 		params["caption"] = config.Caption
+		if config.ParseMode != "" {
+			params["parse_mode"] = config.ParseMode
+		}
 	}
 
 	return params, nil

@@ -356,7 +364,8 @@
 // DocumentConfig contains information about a SendDocument request.
 type DocumentConfig struct {
 	BaseFile
-	Caption string
+	Caption   string
+	ParseMode string
 }
 
 // values returns a url.Values representation of DocumentConfig.

@@ -369,6 +378,9 @@
 	v.Add(config.name(), config.FileID)
 	if config.Caption != "" {
 		v.Add("caption", config.Caption)
+		if config.ParseMode != "" {
+			v.Add("parse_mode", config.ParseMode)
+		}
 	}
 
 	return v, nil

@@ -380,6 +392,9 @@ params, _ := config.BaseFile.params()
 
 	if config.Caption != "" {
 		params["caption"] = config.Caption
+		if config.ParseMode != "" {
+			params["parse_mode"] = config.ParseMode
+		}
 	}
 
 	return params, nil

@@ -432,8 +447,9 @@
 // VideoConfig contains information about a SendVideo request.
 type VideoConfig struct {
 	BaseFile
-	Duration int
-	Caption  string
+	Duration  int
+	Caption   string
+	ParseMode string
 }
 
 // values returns a url.Values representation of VideoConfig.

@@ -449,6 +465,9 @@ v.Add("duration", strconv.Itoa(config.Duration))
 	}
 	if config.Caption != "" {
 		v.Add("caption", config.Caption)
+		if config.ParseMode != "" {
+			v.Add("parse_mode", config.ParseMode)
+		}
 	}
 
 	return v, nil

@@ -460,6 +479,9 @@ params, _ := config.BaseFile.params()
 
 	if config.Caption != "" {
 		params["caption"] = config.Caption
+		if config.ParseMode != "" {
+			params["parse_mode"] = config.ParseMode
+		}
 	}
 
 	return params, nil

@@ -529,8 +551,9 @@
 // VoiceConfig contains information about a SendVoice request.
 type VoiceConfig struct {
 	BaseFile
-	Caption  string
-	Duration int
+	Caption   string
+	ParseMode string
+	Duration  int
 }
 
 // values returns a url.Values representation of VoiceConfig.

@@ -546,6 +569,9 @@ v.Add("duration", strconv.Itoa(config.Duration))
 	}
 	if config.Caption != "" {
 		v.Add("caption", config.Caption)
+		if config.ParseMode != "" {
+			v.Add("parse_mode", config.ParseMode)
+		}
 	}
 
 	return v, nil

@@ -560,6 +586,9 @@ params["duration"] = strconv.Itoa(config.Duration)
 	}
 	if config.Caption != "" {
 		params["caption"] = config.Caption
+		if config.ParseMode != "" {
+			params["parse_mode"] = config.ParseMode
+		}
 	}
 
 	return params, nil

@@ -801,7 +830,9 @@ func (config EditMessageCaptionConfig) values() (url.Values, error) {
 	v, _ := config.BaseEdit.values()
 
 	v.Add("caption", config.Caption)
-	v.Add("parse_mode", config.ParseMode)
+	if config.ParseMode != "" {
+		v.Add("parse_mode", config.ParseMode)
+	}
 
 	return v, nil
 }
M helpers.go → helpers.go 
@@ -1,7 +1,6 @@
 package tgbotapi
 
 import (
-	"log"
 	"net/url"
 )
A log.go 
@@ -0,0 +1,17 @@
+package tgbotapi
+
+import (
+	"os"
+	"errors"
+	stdlog "log"
+)
+
+var log = stdlog.New(os.Stderr, "", stdlog.LstdFlags)
+
+func SetLogger(newLog *stdlog.Logger) error {
+	if newLog == nil {
+		return errors.New("logger is nil")
+	}
+	log = newLog
+	return nil
+}