Fixed unnecessary Xray restarts in Tgbot

1 files changed, 47 insertions, 47 deletions

diff --git a/web/service/inbound.go b/web/service/inbound.go
index cad8a810..e37a2d5a 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -1152,20 +1152,20 @@ 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) error {
+func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) (bool, error) {
 	traffic, inbound, err := s.GetClientInboundByTrafficID(trafficId)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Traffic ID:", trafficId)
+		return false, common.NewError("Inbound Not Found For Traffic ID:", trafficId)
 	}
 
 	clientEmail := traffic.Email
 
 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	clientId := ""
@@ -1184,13 +1184,13 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) err
 	}
 
 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1204,11 +1204,11 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) err
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }
 
 func (s *InboundService) checkIsEnabledByEmail(clientEmail string) (bool, error) {
@@ -1237,18 +1237,18 @@ func (s *InboundService) checkIsEnabledByEmail(clientEmail string) (bool, error)
 	return isEnable, err
 }
 
-func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, error) {
+func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, bool, error) {
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	if inbound == nil {
-		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}
 
 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 
 	clientId := ""
@@ -1269,13 +1269,13 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, er
 	}
 
 	if len(clientId) == 0 {
-		return false, common.NewError("Client Not Found For Email:", clientEmail)
+		return false, false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1289,30 +1289,30 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, er
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	inbound.Settings = string(modifiedSettings)
 
-	_, err = s.UpdateInboundClient(inbound, clientId)
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
 	if err != nil {
-		return false, err
+		return false, needRestart, err
 	}
 
-	return !clientOldEnabled, nil
+	return !clientOldEnabled, needRestart, nil
 }
 
-func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int) error {
+func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int) (bool, error) {
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}
 
 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	clientId := ""
@@ -1331,13 +1331,13 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int
 	}
 
 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1351,25 +1351,25 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }
 
-func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry_time int64) error {
+func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry_time int64) (bool, error) {
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}
 
 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	clientId := ""
@@ -1388,13 +1388,13 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry
 	}
 
 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1408,28 +1408,28 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }
 
-func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, totalGB int) error {
+func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, totalGB int) (bool, error) {
 	if totalGB < 0 {
-		return common.NewError("totalGB must be >= 0")
+		return false, common.NewError("totalGB must be >= 0")
 	}
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}
 
 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	clientId := ""
@@ -1448,13 +1448,13 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota
 	}
 
 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1468,11 +1468,11 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }
 
 func (s *InboundService) ResetClientTrafficByEmail(clientEmail string) error {