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

minor changes

Browse source
This commit is contained in:
mhsanaei 2025-04-07 00:45:52 +02:00
parent bea19a263d
commit 3ded4ee658
No known key found for this signature in database
GPG key ID: D875CD086CF668A0
4 changed files with 157 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -6,8 +6,6 @@
# Ignore log files # Ignore log files
*.log *.log
access.log
error.log
# Ignore temporary files # Ignore temporary files
tmp/ tmp/

3
web/html/settings.html
View file

@ -56,6 +56,9 @@
.dark .ant-input-password-icon { .dark .ant-input-password-icon {
color: var(--dark-color-text-primary); color: var(--dark-color-text-primary);
} }
.ant-collapse-content-box .ant-alert {
margin-block-end: 12px;
}
</style> </style>
<body> <body>
<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme"> <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">

3
web/html/xray.html
View file

@ -42,6 +42,9 @@
.ant-list-item>li { .ant-list-item>li {
padding: 10px 20px !important; padding: 10px 20px !important;
} }
.ant-collapse-content-box .ant-alert {
margin-block-end: 12px;
}
</style> </style>
<body> <body>
<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme"> <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">

56
web/service/tgbot.go
View file

@ -58,13 +58,10 @@ var (
client_ShPassword string client_ShPassword string
client_TrPassword string client_TrPassword string
client_Method string client_Method string
) )
var userStates = make(map[int64]string) var userStates = make(map[int64]string)
type LoginStatus byte type LoginStatus byte
const ( const (
@ -73,8 +70,6 @@ const (
EmptyTelegramUserID = int64(0) EmptyTelegramUserID = int64(0)
) )
type Tgbot struct { type Tgbot struct {
inboundService InboundService inboundService InboundService
settingService SettingService settingService SettingService
@ -83,7 +78,6 @@ type Tgbot struct {
lastStatus *Status lastStatus *Status
} }
func (t *Tgbot) NewTgbot() *Tgbot { func (t *Tgbot) NewTgbot() *Tgbot {
return new(Tgbot) return new(Tgbot)
} }
@ -263,7 +257,7 @@ func (t *Tgbot) OnReceive() {
}, th.AnyCommand()) }, th.AnyCommand())
botHandler.HandleCallbackQuery(func(_ *telego.Bot, query telego.CallbackQuery) { botHandler.HandleCallbackQuery(func(_ *telego.Bot, query telego.CallbackQuery) {
delete(userStates,query.Message.GetChat().ID) delete(userStates, query.Message.GetChat().ID)
t.answerCallback(&query, checkAdmin(query.From.ID)) t.answerCallback(&query, checkAdmin(query.From.ID))
}, th.AnyCallbackQueryWithMessage()) }, th.AnyCallbackQueryWithMessage())
@ -499,7 +493,6 @@ func (t *Tgbot) sendResponse(chatId int64, msg string, onlyMessage, isAdmin bool
} }
} }
func (t *Tgbot) randomLowerAndNum(length int) string { func (t *Tgbot) randomLowerAndNum(length int) string {
charset := "abcdefghijklmnopqrstuvwxyz0123456789" charset := "abcdefghijklmnopqrstuvwxyz0123456789"
bytes := make([]byte, length) bytes := make([]byte, length)
@ -510,7 +503,6 @@ func (t *Tgbot) randomLowerAndNum(length int) string {
return string(bytes) return string(bytes)
} }
func (t *Tgbot) randomShadowSocksPassword() string { func (t *Tgbot) randomShadowSocksPassword() string {
array := make([]byte, 32) array := make([]byte, 32)
_, err := rand.Read(array) _, err := rand.Read(array)
@ -520,7 +512,6 @@ func (t *Tgbot) randomShadowSocksPassword() string {
return base64.StdEncoding.EncodeToString(array) return base64.StdEncoding.EncodeToString(array)
} }
func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) { func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
chatId := callbackQuery.Message.GetChat().ID chatId := callbackQuery.Message.GetChat().ID
@ -695,7 +686,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
} }
message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol) message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
t.addClient(chatId,message_text,messageId) t.addClient(chatId, message_text, messageId)
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation")) t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
case "add_client_limit_traffic_in": case "add_client_limit_traffic_in":
if len(dataArray) >= 2 { if len(dataArray) >= 2 {
@ -910,7 +901,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
} }
message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol) message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
t.addClient(chatId,message_text,messageId) t.addClient(chatId, message_text, messageId)
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation")) t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
case "add_client_reset_exp_in": case "add_client_reset_exp_in":
if len(dataArray) >= 2 { if len(dataArray) >= 2 {
@ -1184,10 +1175,10 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
client_SubID = t.randomLowerAndNum(16) client_SubID = t.randomLowerAndNum(16)
client_Comment = "" client_Comment = ""
client_Reset = 0 client_Reset = 0
client_Security="auto" client_Security = "auto"
client_ShPassword=t.randomShadowSocksPassword() client_ShPassword = t.randomShadowSocksPassword()
client_TrPassword=t.randomLowerAndNum(10) client_TrPassword = t.randomLowerAndNum(10)
client_Method="" client_Method = ""
inboundId := dataArray[1] inboundId := dataArray[1]
inboundIdInt, err := strconv.Atoi(inboundId) inboundIdInt, err := strconv.Atoi(inboundId)
@ -1271,10 +1262,10 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
client_SubID = t.randomLowerAndNum(16) client_SubID = t.randomLowerAndNum(16)
client_Comment = "" client_Comment = ""
client_Reset = 0 client_Reset = 0
client_Security="auto" client_Security = "auto"
client_ShPassword=t.randomShadowSocksPassword() client_ShPassword = t.randomShadowSocksPassword()
client_TrPassword=t.randomLowerAndNum(10) client_TrPassword = t.randomLowerAndNum(10)
client_Method="" client_Method = ""
inbounds, err := t.getInboundsAddClient() inbounds, err := t.getInboundsAddClient()
if err != nil { if err != nil {
@ -1410,7 +1401,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
return return
} }
message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol) message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
t.addClient(chatId,message_text,messageId) t.addClient(chatId, message_text, messageId)
t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+client_Email)) t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.canceled", "Email=="+client_Email))
case "add_client_submit_disable": case "add_client_submit_disable":
client_Enable = false client_Enable = false
@ -1425,8 +1416,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
} }
} }
func (t *Tgbot) BuildInboundClientDataMessage(inbound_remark string, protocol model.Protocol) (string, error) {
func (t *Tgbot) BuildInboundClientDataMessage(inbound_remark string ,protocol model.Protocol) (string, error) {
var message string var message string
currentTime := time.Now() currentTime := time.Now()
@ -1447,19 +1437,19 @@ func (t *Tgbot) BuildInboundClientDataMessage(inbound_remark string ,protocol mo
traffic_value := "" traffic_value := ""
if client_TotalGB == 0 { if client_TotalGB == 0 {
traffic_value = "♾️ Unlimited(Reset)" traffic_value = "♾️ Unlimited(Reset)"
}else { } else {
traffic_value = common.FormatTraffic(client_TotalGB) traffic_value = common.FormatTraffic(client_TotalGB)
} }
switch protocol { switch protocol {
case model.VMESS, model.VLESS: case model.VMESS, model.VLESS:
message = t.I18nBot("tgbot.messages.inbound_client_data_id", "InboundRemark=="+inbound_remark,"ClientId=="+client_Id,"ClientEmail=="+client_Email,"ClientTraffic=="+traffic_value,"ClientExp=="+expiryTime,"ClientComment=="+client_Comment) message = t.I18nBot("tgbot.messages.inbound_client_data_id", "InboundRemark=="+inbound_remark, "ClientId=="+client_Id, "ClientEmail=="+client_Email, "ClientTraffic=="+traffic_value, "ClientExp=="+expiryTime, "ClientComment=="+client_Comment)
case model.Trojan: case model.Trojan:
message = t.I18nBot("tgbot.messages.inbound_client_data_pass", "InboundRemark=="+inbound_remark,"ClientPass=="+client_TrPassword,"ClientEmail=="+client_Email,"ClientTraffic=="+traffic_value,"ClientExp=="+expiryTime,"ClientComment=="+client_Comment) message = t.I18nBot("tgbot.messages.inbound_client_data_pass", "InboundRemark=="+inbound_remark, "ClientPass=="+client_TrPassword, "ClientEmail=="+client_Email, "ClientTraffic=="+traffic_value, "ClientExp=="+expiryTime, "ClientComment=="+client_Comment)
case model.Shadowsocks: case model.Shadowsocks:
message = t.I18nBot("tgbot.messages.inbound_client_data_pass", "InboundRemark=="+inbound_remark,"ClientPass=="+client_ShPassword,"ClientEmail=="+client_Email,"ClientTraffic=="+traffic_value,"ClientExp=="+expiryTime,"ClientComment=="+client_Comment) message = t.I18nBot("tgbot.messages.inbound_client_data_pass", "InboundRemark=="+inbound_remark, "ClientPass=="+client_ShPassword, "ClientEmail=="+client_Email, "ClientTraffic=="+traffic_value, "ClientExp=="+expiryTime, "ClientComment=="+client_Comment)
default: default:
return "", errors.New("unknown protocol") return "", errors.New("unknown protocol")
@ -1468,7 +1458,6 @@ func (t *Tgbot) BuildInboundClientDataMessage(inbound_remark string ,protocol mo
return message, nil return message, nil
} }
func (t *Tgbot) BuildJSONForProtocol(protocol model.Protocol) (string, error) { func (t *Tgbot) BuildJSONForProtocol(protocol model.Protocol) (string, error) {
var jsonString string var jsonString string
@ -1547,18 +1536,14 @@ func (t *Tgbot) BuildJSONForProtocol(protocol model.Protocol) (string, error) {
return jsonString, nil return jsonString, nil
} }
func (t *Tgbot) SubmitAddClient() (bool, error) { func (t *Tgbot) SubmitAddClient() (bool, error) {
inbound, err := t.inboundService.GetInbound(receiver_inbound_ID) inbound, err := t.inboundService.GetInbound(receiver_inbound_ID)
if err != nil { if err != nil {
logger.Warning("getIboundClients run failed:", err) logger.Warning("getIboundClients run failed:", err)
return false, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed")) return false, errors.New(t.I18nBot("tgbot.answers.getInboundsFailed"))
} }
jsonString, err := t.BuildJSONForProtocol(inbound.Protocol) jsonString, err := t.BuildJSONForProtocol(inbound.Protocol)
newInbound := &model.Inbound{ newInbound := &model.Inbound{
@ -1566,7 +1551,6 @@ func (t *Tgbot) SubmitAddClient() (bool, error) {
Settings: jsonString, Settings: jsonString,
} }
return t.inboundService.AddInboundClient(newInbound) return t.inboundService.AddInboundClient(newInbound)
} }
@ -1862,7 +1846,7 @@ func (t *Tgbot) getInbounds() (*telego.InlineKeyboardMarkup, error) {
if inbound.Enable { if inbound.Enable {
status = "✅" status = "✅"
} }
callbackData := t.encodeQuery(fmt.Sprintf("%s %d","get_clients", inbound.Id)) callbackData := t.encodeQuery(fmt.Sprintf("%s %d", "get_clients", inbound.Id))
buttons = append(buttons, tu.InlineKeyboardButton(fmt.Sprintf("%v - %v", inbound.Remark, status)).WithCallbackData(callbackData)) buttons = append(buttons, tu.InlineKeyboardButton(fmt.Sprintf("%v - %v", inbound.Remark, status)).WithCallbackData(callbackData))
} }
@ -1904,7 +1888,7 @@ func (t *Tgbot) getInboundsAddClient() (*telego.InlineKeyboardMarkup, error) {
if inbound.Enable { if inbound.Enable {
status = "✅" status = "✅"
} }
callbackData := t.encodeQuery(fmt.Sprintf("%s %d","add_client_to", inbound.Id)) callbackData := t.encodeQuery(fmt.Sprintf("%s %d", "add_client_to", inbound.Id))
buttons = append(buttons, tu.InlineKeyboardButton(fmt.Sprintf("%v - %v", inbound.Remark, status)).WithCallbackData(callbackData)) buttons = append(buttons, tu.InlineKeyboardButton(fmt.Sprintf("%v - %v", inbound.Remark, status)).WithCallbackData(callbackData))
} }
@ -2662,7 +2646,6 @@ func (t *Tgbot) editMessageTgBot(chatId int64, messageID int, text string, inlin
} }
} }
func (t *Tgbot) SendMsgToTgbotDeleteAfter(chatId int64, msg string, delayInSeconds int, replyMarkup ...telego.ReplyMarkup) { func (t *Tgbot) SendMsgToTgbotDeleteAfter(chatId int64, msg string, delayInSeconds int, replyMarkup ...telego.ReplyMarkup) {
// Determine if replyMarkup was passed; otherwise, set it to nil // Determine if replyMarkup was passed; otherwise, set it to nil
var replyMarkupParam telego.ReplyMarkup var replyMarkupParam telego.ReplyMarkup
@ -2706,4 +2689,3 @@ func (t *Tgbot) isSingleWord(text string) bool {
re := regexp.MustCompile(`\s+`) re := regexp.MustCompile(`\s+`)
return re.MatchString(text) return re.MatchString(text)
} }