Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--database/model/model.go2
-rw-r--r--web/service/inbound.go6
-rw-r--r--web/service/tgbot.go75
3 files changed, 45 insertions, 38 deletions
diff --git a/database/model/model.go b/database/model/model.go
index df41237d..06759d9a 100644
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -91,7 +91,7 @@ type Client struct {
TotalGB int64 `json:"totalGB" form:"totalGB"`
ExpiryTime int64 `json:"expiryTime" form:"expiryTime"`
Enable bool `json:"enable" form:"enable"`
- TgID string `json:"tgId" form:"tgId"`
+ TgID int64 `json:"tgId" form:"tgId"`
SubID string `json:"subId" form:"subId"`
Reset int `json:"reset" form:"reset"`
}
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 2cef0995..adfa0fb4 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -1186,7 +1186,7 @@ func (s *InboundService) GetClientByEmail(clientEmail string) (*xray.ClientTraff
return nil, nil, common.NewError("Client Not Found In Inbound For Email:", clientEmail)
}
-func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) (bool, error) {
+func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId int64) (bool, error) {
traffic, inbound, err := s.GetClientInboundByTrafficID(trafficId)
if err != nil {
return false, err
@@ -1687,10 +1687,10 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
return err
}
-func (s *InboundService) GetClientTrafficTgBot(tgId string) ([]*xray.ClientTraffic, error) {
+func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffic, error) {
db := database.GetDB()
var inbounds []*model.Inbound
- err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": "%s"%%`, tgId)).Find(&inbounds).Error
+ err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": %d%%`, tgId)).Find(&inbounds).Error
if err != nil && err != gorm.ErrRecordNotFound {
return nil, err
}
diff --git a/web/service/tgbot.go b/web/service/tgbot.go
index 7afa61e3..bf724829 100644
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -6,7 +6,6 @@ import (
"net"
"net/url"
"os"
- "slices"
"strconv"
"strings"
"time"
@@ -39,8 +38,9 @@ var (
type LoginStatus byte
const (
- LoginSuccess LoginStatus = 1
- LoginFail LoginStatus = 0
+ LoginSuccess LoginStatus = 1
+ LoginFail LoginStatus = 0
+ EmptyTelegramUserID = int64(0)
)
type Tgbot struct {
@@ -207,21 +207,20 @@ func (t *Tgbot) OnReceive() {
botHandler.HandleMessage(func(_ *telego.Bot, message telego.Message) {
if message.UsersShared != nil {
if checkAdmin(message.From.ID) {
- userIDsStr := ""
- for _, userID := range message.UsersShared.UserIDs {
- userIDsStr += strconv.FormatInt(userID, 10) + " "
- }
- needRestart, err := t.inboundService.SetClientTelegramUserID(message.UsersShared.RequestID, userIDsStr)
- if needRestart {
- t.xrayService.SetToNeedRestart()
- }
- output := ""
- if err != nil {
- output += t.I18nBot("tgbot.messages.selectUserFailed")
- } else {
- output += t.I18nBot("tgbot.messages.userSaved")
+ userIDs := message.UsersShared.UserIDs
+ for _, userID := range userIDs {
+ needRestart, err := t.inboundService.SetClientTelegramUserID(message.UsersShared.RequestID, userID)
+ if needRestart {
+ t.xrayService.SetToNeedRestart()
+ }
+ output := ""
+ if err != nil {
+ output += t.I18nBot("tgbot.messages.selectUserFailed")
+ } else {
+ output += t.I18nBot("tgbot.messages.userSaved")
+ }
+ t.SendMsgToTgbot(message.Chat.ID, output, tu.ReplyKeyboardRemove())
}
- t.SendMsgToTgbot(message.Chat.ID, output, tu.ReplyKeyboardRemove())
} else {
t.SendMsgToTgbot(message.Chat.ID, t.I18nBot("tgbot.noResult"), tu.ReplyKeyboardRemove())
}
@@ -259,7 +258,9 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
if isAdmin {
t.searchClient(chatId, commandArgs[0])
} else {
- t.getClientUsage(chatId, strconv.FormatInt(message.From.ID, 10), commandArgs[0])
+ // Convert message.From.ID to int64
+ fromID := int64(message.From.ID)
+ t.getClientUsage(chatId, fromID, commandArgs[0])
}
} else {
msg += t.I18nBot("tgbot.commands.usage")
@@ -726,7 +727,7 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.errorOperation"))
return
}
- needRestart, err := t.inboundService.SetClientTelegramUserID(traffic.Id, "")
+ needRestart, err := t.inboundService.SetClientTelegramUserID(traffic.Id, EmptyTelegramUserID)
if needRestart {
t.xrayService.SetToNeedRestart()
}
@@ -783,8 +784,9 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.getBanLogs"))
t.sendBanLogs(chatId, true)
case "client_traffic":
+ tgUserID := callbackQuery.From.ID
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.clientUsage"))
- t.getClientUsage(chatId, strconv.FormatInt(callbackQuery.From.ID, 10))
+ t.getClientUsage(chatId, tgUserID)
case "client_commands":
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.commands"))
t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.commands.helpClientCommands"))
@@ -1135,7 +1137,7 @@ func (t *Tgbot) clientInfoMsg(
return output
}
-func (t *Tgbot) getClientUsage(chatId int64, tgUserID string, email ...string) {
+func (t *Tgbot) getClientUsage(chatId int64, tgUserID int64, email ...string) {
traffics, err := t.inboundService.GetClientTrafficTgBot(tgUserID)
if err != nil {
logger.Warning(err)
@@ -1145,7 +1147,7 @@ func (t *Tgbot) getClientUsage(chatId int64, tgUserID string, email ...string) {
}
if len(traffics) == 0 {
- t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.askToAddUserId", "TgUserID=="+tgUserID))
+ t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.askToAddUserId", "TgUserID=="+strconv.FormatInt(tgUserID, 10)))
return
}
@@ -1218,8 +1220,8 @@ func (t *Tgbot) clientTelegramUserInfo(chatId int64, email string, messageID ...
return
}
tgId := "None"
- if len(client.TgID) > 0 {
- tgId = client.TgID
+ if client.TgID != 0 {
+ tgId = strconv.FormatInt(client.TgID, 10)
}
output := ""
@@ -1452,24 +1454,20 @@ func (t *Tgbot) notifyExhausted() {
logger.Warning("Unable to load Inbounds", err)
}
- var chatIDsDone []string
+ var chatIDsDone []int64
for _, inbound := range inbounds {
if inbound.Enable {
if len(inbound.ClientStats) > 0 {
clients, err := t.inboundService.GetClients(inbound)
if err == nil {
for _, client := range clients {
- if client.TgID != "" {
- chatID, err := strconv.ParseInt(client.TgID, 10, 64)
- if err != nil {
- logger.Warning("TgID is not a number: ", client.TgID)
- continue
- }
- if !slices.Contains(chatIDsDone, client.TgID) && !checkAdmin(chatID) {
+ if client.TgID != 0 {
+ chatID := client.TgID
+ if !int64Contains(chatIDsDone, chatID) && !checkAdmin(chatID) {
var disabledClients []xray.ClientTraffic
var exhaustedClients []xray.ClientTraffic
traffics, err := t.inboundService.GetClientTrafficTgBot(client.TgID)
- if err == nil && len(traffics) > 0 {
+ if err == nil && len(traffics) > 0 {
output := t.I18nBot("tgbot.messages.exhaustedCount", "Type=="+t.I18nBot("tgbot.clients"))
for _, traffic := range traffics {
if traffic.Enable {
@@ -1498,7 +1496,7 @@ func (t *Tgbot) notifyExhausted() {
}
t.SendMsgToTgbot(chatID, output)
}
- chatIDsDone = append(chatIDsDone, client.TgID)
+ chatIDsDone = append(chatIDsDone, chatID)
}
}
}
@@ -1509,6 +1507,15 @@ func (t *Tgbot) notifyExhausted() {
}
}
+func int64Contains(slice []int64, item int64) bool {
+ for _, s := range slice {
+ if s == item {
+ return true
+ }
+ }
+ return false
+}
+
func (t *Tgbot) onlineClients(chatId int64, messageID ...int) {
if !p.IsRunning() {
return
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-25 00:55:32 +0300