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">

18
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)
} }
@ -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
@ -1425,7 +1416,6 @@ 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
@ -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)
} }
@ -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)
} }