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:
authorMHSanaei <ho3ein.sanaei@gmail.com>2023-04-11 18:09:07 +0300
committerMHSanaei <ho3ein.sanaei@gmail.com>2023-04-11 18:09:07 +0300
commit8c40e7281fe40b3dfe40093446a339a99c2f2e1a (patch)
tree5eea1f3b6e69f9cec23d2c57c9467f13a22fde83
parent54946e725e835a291f9c8e226788cd8a166e190b (diff)
bug fix
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
-rw-r--r--web/service/inbound.go19
1 files changed, 13 insertions, 6 deletions
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 74765ab3..2372e574 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -453,12 +453,10 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
}
continue
}
- // get settings clients
- settings := map[string]interface{}{}
- json.Unmarshal([]byte(inbound.Settings), &settings)
- clients, ok := settings["clients"].([]model.Client)
+ // get clients
+ clients, err := s.getClients(inbound)
needUpdate := false
- if ok {
+ if err == nil {
for client_index, client := range clients {
if traffic.Email == client.Email {
if client.ExpiryTime < 0 {
@@ -473,7 +471,16 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
}
if needUpdate {
- settings["clients"] = clients
+ settings := map[string]interface{}{}
+ json.Unmarshal([]byte(inbound.Settings), &settings)
+
+ // Convert clients to []interface to update clients in settings
+ var clientsInterface []interface{}
+ for _, c := range clients {
+ clientsInterface = append(clientsInterface, interface{}(c))
+ }
+
+ settings["clients"] = clientsInterface
modifiedSettings, err := json.MarshalIndent(settings, "", " ")
if err != nil {
return nil, err