Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-20 05:52:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix ability to use userId in tgId

Browse source
This commit is contained in:
Masoud Hidden 2023-05-06 02:36:46 +03:30
parent 7b9e0b946e
commit 7f8f0b0f2d
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
web/service/tgbot.go
View file

@ -330,7 +330,7 @@ func (t *Tgbot) asnwerCallback(callbackQuery *tgbotapi.CallbackQuery, isAdmin bo
case "get_backup": case "get_backup":
t.sendBackup(callbackQuery.From.ID) t.sendBackup(callbackQuery.From.ID)
case "client_traffic": case "client_traffic":
t.getClientUsage(callbackQuery.From.ID, callbackQuery.From.UserName, "#"+strconv.FormatInt(callbackQuery.From.ID, 10)) t.getClientUsage(callbackQuery.From.ID, callbackQuery.From.UserName, strconv.FormatInt(callbackQuery.From.ID, 10))
case "client_commands": case "client_commands":
t.SendMsgToTgbot(callbackQuery.From.ID, "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UID|Password]</code>\r\n \r\nUse UID for vmess/vless and Password for Trojan.") t.SendMsgToTgbot(callbackQuery.From.ID, "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UID|Password]</code>\r\n \r\nUse UID for vmess/vless and Password for Trojan.")
case "commands": case "commands":
@ -531,16 +531,7 @@ func (t *Tgbot) getInboundUsages() string {
} }
func (t *Tgbot) getClientUsage(chatId int64, tgUserName string, tgUserID string) { func (t *Tgbot) getClientUsage(chatId int64, tgUserName string, tgUserID string) {
if len(tgUserName) == 0 && len(tgUserID) == 0 { traffics, err := t.inboundService.GetClientTrafficTgBot(tgUserID)
msg := "Your configuration is not found!\nYou should configure your telegram username and ask Admin to add it to your configuration."
t.SendMsgToTgbot(chatId, msg)
return
}
userIdentifier := tgUserName
if len(userIdentifier) == 0 {
userIdentifier = tgUserID
}
traffics, err := t.inboundService.GetClientTrafficTgBot(userIdentifier)
if err != nil { if err != nil {
logger.Warning(err) logger.Warning(err)
msg := "❌ Something went wrong!" msg := "❌ Something went wrong!"
@ -548,10 +539,21 @@ func (t *Tgbot) getClientUsage(chatId int64, tgUserName string, tgUserID string)
return return
} }
if len(traffics) == 0 { if len(traffics) == 0 {
if len(tgUserName) > 0 { if len(tgUserName) == 0 {
userIdentifier = "@" + tgUserName msg := "Your configuration is not found!\nPlease ask your Admin to use your telegram user id in your configuration(s).\n\nYour user id: <b>" + tgUserID + "</b>"
t.SendMsgToTgbot(chatId, msg)
return
} }
msg := "Your configuration is not found!\nPlease ask your Admin to use your telegram username in your configuration(s).\n\nYour username: <b>" + userIdentifier + "</b>" traffics, err = t.inboundService.GetClientTrafficTgBot(tgUserName)
}
if err != nil {
logger.Warning(err)
msg := "❌ Something went wrong!"
t.SendMsgToTgbot(chatId, msg)
return
}
if len(traffics) == 0 {
msg := "Your configuration is not found!\nPlease ask your Admin to use your telegram username or user id in your configuration(s).\n\nYour username: <b>@" + tgUserName + "</b>\n\nYour user id: <b>" + tgUserID + "</b>"
t.SendMsgToTgbot(chatId, msg) t.SendMsgToTgbot(chatId, msg)
return return
} }