Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-11 12:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor Tgbot creation and improve logging

Browse source
This commit is contained in:
mhsanaei 2024-10-17 10:59:24 +02:00
parent 506e3ee08a
commit 4a7bbc1404
No known key found for this signature in database
GPG key ID: 4DACC0663B5986F5
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/service/tgbot.go
View file

@ -133,42 +133,40 @@ func (t *Tgbot) Start(i18nFS embed.FS) error {
func (t *Tgbot) NewBot(token string, proxyUrl string, apiServerUrl string) (*telego.Bot, error) { func (t *Tgbot) NewBot(token string, proxyUrl string, apiServerUrl string) (*telego.Bot, error) {
if proxyUrl == "" && apiServerUrl == "" { if proxyUrl == "" && apiServerUrl == "" {
// No proxy or API server URL provided, use default instance
return telego.NewBot(token) return telego.NewBot(token)
} }
if proxyUrl != "" { if proxyUrl != "" {
if !strings.HasPrefix(proxyUrl, "socks5://") { if !strings.HasPrefix(proxyUrl, "socks5://") {
logger.Warning("Invalid socks5 URL, starting with default") logger.Warning("Invalid socks5 URL, using default")
return telego.NewBot(token) return telego.NewBot(token)
} }
_, err := url.Parse(proxyUrl) _, err := url.Parse(proxyUrl)
if err != nil { if err != nil {
logger.Warning("Can't parse proxy URL, using default instance for tgbot:", err) logger.Warningf("Can't parse proxy URL, using default instance for tgbot: %v", err)
return telego.NewBot(token) return telego.NewBot(token)
} }
return telego.NewBot(token, telego.WithFastHTTPClient(&fasthttp.Client{ return telego.NewBot(token, telego.WithFastHTTPClient(&fasthttp.Client{
Dial: fasthttpproxy.FasthttpSocksDialer(proxyUrl), Dial: fasthttpproxy.FasthttpSocksDialer(proxyUrl),
})) }))
} else { }
if !strings.HasPrefix(apiServerUrl, "http") { if !strings.HasPrefix(apiServerUrl, "http") {
logger.Warning("Invalid http(s) URL, starting with default") logger.Warning("Invalid http(s) URL, using default")
return telego.NewBot(token) return telego.NewBot(token)
} }
_, err := url.Parse(apiServerUrl) _, err := url.Parse(apiServerUrl)
if err != nil { if err != nil {
logger.Warning("Can't parse API server URL, using default instance for tgbot:", err) logger.Warningf("Can't parse API server URL, using default instance for tgbot: %v", err)
return telego.NewBot(token) return telego.NewBot(token)
} }
return telego.NewBot(token, telego.WithAPIServer(apiServerUrl)) return telego.NewBot(token, telego.WithAPIServer(apiServerUrl))
} }
}
func (t *Tgbot) IsRunning() bool { func (t *Tgbot) IsRunning() bool {
return isRunning return isRunning
} }