main: use default HTTP client (proxy via env)
This commit is contained in:
@@ -3,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
|
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
|
||||||
@@ -19,21 +18,10 @@ func main() {
|
|||||||
_ = godotenv.Load()
|
_ = godotenv.Load()
|
||||||
|
|
||||||
token := os.Getenv("BOT_TOKEN")
|
token := os.Getenv("BOT_TOKEN")
|
||||||
proxyURL := os.Getenv("HTTP_PROXY")
|
|
||||||
dbPath := getEnvDefault("DB_PATH", "db.sqlite3")
|
dbPath := getEnvDefault("DB_PATH", "db.sqlite3")
|
||||||
|
|
||||||
// Build HTTP client with optional proxy
|
// Default HTTP client respects HTTP_PROXY env var automatically
|
||||||
var httpClient *http.Client
|
httpClient := http.DefaultClient
|
||||||
if proxyURL != "" {
|
|
||||||
parsed, err := url.Parse(proxyURL)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
tr := &http.Transport{Proxy: http.ProxyURL(parsed)}
|
|
||||||
httpClient = &http.Client{Transport: tr}
|
|
||||||
} else {
|
|
||||||
httpClient = http.DefaultClient
|
|
||||||
}
|
|
||||||
|
|
||||||
botAPI, err := tgbotapi.NewBotAPIWithClient(token, "", httpClient)
|
botAPI, err := tgbotapi.NewBotAPIWithClient(token, "", httpClient)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user