diff options
| author | Hamidreza <70919649+hamid-gh98@users.noreply.github.com> | 2024-03-11 00:31:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 00:31:24 +0300 |
| commit | 64a5a9f1bc91297bf46ddda9fc3575e582acd83f (patch) | |
| tree | f8a3cbd685bf4ef77bb69b6b22c130d2dad42f88 /web/service/tgbot.go | |
| parent | 32afd7200ace358fe36c8c438f5048d76fbc987b (diff) | |
Some fixes and improvements (#1997)
* [refactor] api controller
* [fix] access log path
better to not hardcode the access log path, maybe some ppl dont want to use the default ./access.log
* [fix] set select options from logs paths in xray settings
* [update] .gitignore
* [lint] all .go files
* [update] use status code for jsonMsg and 401 to unauthorize
* [update] handle response status code via axios
* [fix] set correct value if log paths is set to 'none'
we also use the default value for the paths if its set to none
* [fix] iplimit - only warning access log if f2b is installed
Diffstat (limited to 'web/service/tgbot.go')
| -rw-r--r-- | web/service/tgbot.go | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 30d19dba..40301667 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -10,6 +10,7 @@ import ( "strconv" "strings" "time" + "x-ui/config" "x-ui/database" "x-ui/database/model" @@ -26,12 +27,14 @@ import ( "github.com/valyala/fasthttp/fasthttpproxy" ) -var bot *telego.Bot -var botHandler *th.BotHandler -var adminIds []int64 -var isRunning bool -var hostname string -var hashStorage *global.HashStorage +var ( + bot *telego.Bot + botHandler *th.BotHandler + adminIds []int64 + isRunning bool + hostname string + hashStorage *global.HashStorage +) type LoginStatus byte @@ -280,7 +283,6 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo } func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) { - chatId := callbackQuery.Message.GetChat().ID if isAdmin { @@ -866,7 +868,7 @@ func (t *Tgbot) SendMsgToTgbot(chatId int64, msg string, replyMarkup ...telego.R Text: message, ParseMode: "HTML", } - //only add replyMarkup to last message + // only add replyMarkup to last message if len(replyMarkup) > 0 && n == (len(allMessages)-1) { params.ReplyMarkup = replyMarkup[0] } @@ -1030,9 +1032,15 @@ func (t *Tgbot) getInboundUsages() string { return info } -func (t *Tgbot) clientInfoMsg(traffic *xray.ClientTraffic, printEnabled bool, printOnline bool, printActive bool, - printDate bool, printTraffic bool, printRefreshed bool) string { - +func (t *Tgbot) clientInfoMsg( + traffic *xray.ClientTraffic, + printEnabled bool, + printOnline bool, + printActive bool, + printDate bool, + printTraffic bool, + printRefreshed bool, +) string { now := time.Now().Unix() expiryTime := "" flag := false @@ -1544,7 +1552,6 @@ func (t *Tgbot) sendBackup(chatId int64) { } } else { logger.Error("Error in opening db file for backup: ", err) - } file, err = os.Open(xray.GetConfigPath()) |