Merge pull request #63 from sevkin/#62

Add WithBaseURL server option.

Author: yanzay

client.go

@@ -12,6 +12,7 @@ import (
 // Client is a low-level Telegram client
 type Client struct {
 	token         string
+	baseURL       string
 	url           string
 	httpClient    *http.Client
 	nextOffset    int
@@ -26,6 +27,7 @@ func NewClient(token string, httpClient *http.Client, baseURL string) *Client {
 	return &Client{
 		token:      token,
 		httpClient: httpClient,
+		baseURL:    baseURL,
 		url:        fmt.Sprintf("%s/bot%s/", baseURL, token) + "%s",
 	}
 }

client_helpers.go

@@ -4,5 +4,5 @@ import "fmt"
 
 // FileURL returns file URL ready for download
 func (c *Client) FileURL(file *File) string {
-	return fmt.Sprintf("%s/file/bot%s/%s", apiBaseURL, c.token, file.FilePath)
+	return fmt.Sprintf("%s/file/bot%s/%s", c.baseURL, c.token, file.FilePath)
 }

examples/baseurl/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"log"
+	"os"
+	"time"
+
+	"github.com/yanzay/tbot/v2"
+)
+
+/* Before setup nginx as proxy. See https://habr.com/ru/post/424427/
+
+server {
+  listen 443 ssl http2;
+  server_name my-telegram-proxy.server;
+
+  # SSL options skipped
+
+  location / {
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-Server $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass https://api.telegram.org/;
+    client_max_body_size 100M;
+  }
+}
+*/
+
+func main() {
+	bot := tbot.New(os.Getenv("TELEGRAM_TOKEN"),
+		tbot.WithBaseURL("https://my-telegram-proxy.server"))
+	c := bot.Client()
+	bot.HandleMessage(".*yo.*", func(m *tbot.Message) {
+		c.SendChatAction(m.Chat.ID, tbot.ActionTyping)
+		time.Sleep(1 * time.Second)
+		c.SendMessage(m.Chat.ID, "hello!")
+	})
+	err := bot.Start()
+	if err != nil {
+		log.Fatal(err)
+	}
+}

server.go

@@ -18,6 +18,7 @@ var (
 type Server struct {
 	webhookURL    string
 	listenAddr    string
+	baseURL       string
 	httpClient    *http.Client
 	client        *Client
 	token         string
@@ -62,12 +63,14 @@ type messageHandler struct {
 New creates new Server. Available options:
 	WithWebook(url, addr string)
 	WithHTTPClient(client *http.Client)
+	WithBaseURL(baseURL string)
 */
 func New(token string, options ...ServerOption) *Server {
 	s := &Server{
 		httpClient: http.DefaultClient,
 		token:      token,
 		logger:     nopLogger{},
+		baseURL:    apiBaseURL,
 
 		editMessageHandler:     func(*Message) {},
 		channelPostHandler:     func(*Message) {},
@@ -86,7 +89,7 @@ func New(token string, options ...ServerOption) *Server {
 		opt(s)
 	}
 	// bot, err :=  tgbotapi.NewBotAPIWithClient(token, s.httpClient)
-	s.client = NewClient(token, s.httpClient, apiBaseURL)
+	s.client = NewClient(token, s.httpClient, s.baseURL)
 	return s
 }
 
@@ -99,6 +102,14 @@ func WithWebhook(url, addr string) ServerOption {
 	}
 }
 
+// WithBaseURL sets custom apiBaseURL for server.
+// It may be necessary to run the server in some countries
+func WithBaseURL(baseURL string) ServerOption {
+	return func(s *Server) {
+		s.baseURL = baseURL
+	}
+}
+
 // WithHTTPClient sets custom http client for server.
 func WithHTTPClient(client *http.Client) ServerOption {
 	return func(s *Server) {
@@ -210,7 +221,7 @@ func (s *Server) listenUpdates() (chan *Update, error) {
 
 func (s *Server) longPoolUpdates() (chan *Update, error) {
 	s.logger.Debugf("fetching updates...")
-	endpoint := fmt.Sprintf("%s/bot%s/%s", apiBaseURL, s.token, "getUpdates")
+	endpoint := fmt.Sprintf("%s/bot%s/%s", s.baseURL, s.token, "getUpdates")
 	req, err := http.NewRequest("GET", endpoint, nil)
 	if err != nil {
 		return nil, err