From 9d724d34e1cf0c6cf118fb092d737d2f84d67a60 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Sat, 3 Feb 2024 18:15:47 +0330 Subject: [PATCH] fix tgbot - no warning for empty socks5 --- web/service/tgbot.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 4ffa7bb4..0b5a8158 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -115,14 +115,19 @@ func (t *Tgbot) Start(i18nFS embed.FS) error { } func (t *Tgbot) NewBot(token string, proxyUrl string) (*telego.Bot, error) { - if proxyUrl == "" || !strings.HasPrefix(proxyUrl, "socks5://") { - logger.Warning("invalid socks5 url, start with default") + if proxyUrl == "" { + // No proxy URL provided, use default instance + return telego.NewBot(token) + } + + if !strings.HasPrefix(proxyUrl, "socks5://") { + logger.Warning("Invalid socks5 URL, starting with default") return telego.NewBot(token) } _, err := url.Parse(proxyUrl) if err != nil { - logger.Warning("cant parse proxy url, use default instance for tgbot:", err) + logger.Warning("Can't parse proxy URL, using default instance for tgbot:", err) return telego.NewBot(token) }