From 903db957838dba4942db3790161842e116c0b2d0 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Tue, 12 Mar 2024 17:35:17 +0330 Subject: [PATCH] minor changes Co-Authored-By: somebodywashere <68244480+somebodywashere@users.noreply.github.com> --- web/html/xui/settings.html | 2 -- web/service/inbound.go | 47 ++++++++------------------------------ 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 0627910a..3096970f 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -425,7 +425,6 @@ this.loading(false); if (msg.success) { this.user = {}; - window.location.replace; } }, async restartPanel() { @@ -464,7 +463,6 @@ const msg = await HttpUtil.post("/panel/setting/updateUserSecret", this.user); if (msg && msg.obj) { this.user = msg.obj; - window.location.replace; } this.loading(false); await this.updateAllSetting(); diff --git a/web/service/inbound.go b/web/service/inbound.go index fdafe05a..cad8a810 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -1069,10 +1069,7 @@ func (s *InboundService) AddClientStat(tx *gorm.DB, inboundId int, client *model clientTraffic.Reset = client.Reset result := tx.Create(&clientTraffic) err := result.Error - if err != nil { - return err - } - return nil + return err } func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *model.Client) error { @@ -1085,12 +1082,8 @@ func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *mod "expiry_time": client.ExpiryTime, "reset": client.Reset, }) - err := result.Error - if err != nil { - return err - } - return nil + return err } func (s *InboundService) UpdateClientIPs(tx *gorm.DB, oldEmail string, newEmail string) error { @@ -1215,10 +1208,7 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) err } inbound.Settings = string(modifiedSettings) _, err = s.UpdateInboundClient(inbound, clientId) - if err != nil { - return err - } - return nil + return err } func (s *InboundService) checkIsEnabledByEmail(clientEmail string) (bool, error) { @@ -1365,10 +1355,7 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int } inbound.Settings = string(modifiedSettings) _, err = s.UpdateInboundClient(inbound, clientId) - if err != nil { - return err - } - return nil + return err } func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry_time int64) error { @@ -1425,10 +1412,7 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry } inbound.Settings = string(modifiedSettings) _, err = s.UpdateInboundClient(inbound, clientId) - if err != nil { - return err - } - return nil + return err } func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, totalGB int) error { @@ -1488,10 +1472,7 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota } inbound.Settings = string(modifiedSettings) _, err = s.UpdateInboundClient(inbound, clientId) - if err != nil { - return err - } - return nil + return err } func (s *InboundService) ResetClientTrafficByEmail(clientEmail string) error { @@ -1584,10 +1565,7 @@ func (s *InboundService) ResetAllClientTraffics(id int) error { Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0}) err := result.Error - if err != nil { - return err - } - return nil + return err } func (s *InboundService) ResetAllTraffics() error { @@ -1598,10 +1576,7 @@ func (s *InboundService) ResetAllTraffics() error { Updates(map[string]interface{}{"up": 0, "down": 0}) err := result.Error - if err != nil { - return err - } - return nil + return err } func (s *InboundService) DelDepletedClients(id int) (err error) { @@ -1675,11 +1650,7 @@ func (s *InboundService) DelDepletedClients(id int) (err error) { } err = tx.Where(whereText+" and enable = ?", id, false).Delete(xray.ClientTraffic{}).Error - if err != nil { - return err - } - - return nil + return err } func (s *InboundService) GetClientTrafficTgBot(tgId string) ([]*xray.ClientTraffic, error) {