From a3ca7d9ed8c9924539aa129e9b7acd3a711778f3 Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Mon, 16 Sep 2024 13:07:32 +0400
Subject: [PATCH] fix naming clients AdgHome + xray

---
 app/bot.php | 6 +++---
 version     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/bot.php b/app/bot.php
index 3e8527e..3bf54b3 100644
--- a/app/bot.php
+++ b/app/bot.php
@@ -2193,8 +2193,8 @@ class Bot
                     'schedule' => ['time_zone' => date_default_timezone_get()],
                     'ids'      => [],
                 ],
-                'name'                        => str_replace(['_', ' '], '-', $v['email']),
-                'ids'                         => [$v['email']],
+                'name'                        => $v['email'],
+                'ids'                         => [$v['id']],
                 'tags'                        => [],
                 'upstreams'                   => [],
                 'uid'                         => $v['id'],
@@ -4808,7 +4808,7 @@ DNS-over-HTTPS with IP:
                 break;
             case 'si':
                 if ($c['dns']['servers'][0]['address'] == '~dns~') {
-                    $c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$email";
+                    $c['dns']['servers'][0]['address'] = "https://$domain/dns-query/$uid";
                 }
 
                 $c['outbounds'][0]['server'] = $_GET['cdn'] ?: $domain;
diff --git a/version b/version
index 8aafdbf..8cc2de5 100644
--- a/version
+++ b/version
@@ -1,3 +1,5 @@
+16.09.2024 v1.54.2
+- фикс нэйминга клиентов в adguardHome: замена на uuid
 16.09.2024 v1.54.1
 - фикс нэйминга клиентов в adguardHome
 16.09.2024 v1.54