From 7bfebe8096fc1c6e96e935b51aa859d41269040c Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Mon, 30 Sep 2024 09:58:48 +0400
Subject: [PATCH] fix unset warp key

---
 app/bot.php | 18 +++++++++++-------
 version     |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/bot.php b/app/bot.php
index 11c1651..d481164 100644
--- a/app/bot.php
+++ b/app/bot.php
@@ -4513,10 +4513,14 @@ DNS-over-HTTPS with IP:
 
     public function addWarpPlus($key)
     {
-        $c         = $this->getPacConf();
-        $c['warp'] = $key;
+        $c = $this->getPacConf();
+        if (!empty($key)) {
+            $c['warp'] = $key;
+            $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key 2>&1", 'wp'));
+        } else {
+            unset($c['warp']);
+        }
         $this->setPacConf($c);
-        $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key", 'wp'));
         sleep(1);
         $this->warp();
     }
@@ -4540,12 +4544,12 @@ DNS-over-HTTPS with IP:
         } else {
             $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
             sleep(3);
-            $this->ssh('warp-cli --accept-tos registration new', 'wp');
+            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
             if (!empty($p['warp'])) {
-                $this->ssh("warp-cli --accept-tos registration license {$p['warp']}", 'wp');
+                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
             }
-            $this->ssh('warp-cli --accept-tos mode proxy', 'wp');
-            $this->ssh('warp-cli --accept-tos connect', 'wp');
+            $this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
+            $this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
             unset($p['warpoff']);
         }
         $this->setPacConf($p);
diff --git a/version b/version
index 6c06b86..05ab0ab 100644
--- a/version
+++ b/version
@@ -1,3 +1,5 @@
+30.09.2024 v1.61.1
+- фикс удаления ключа варпа через ноль
 29.09.2024 v1.61
 - включение/отключение процесса warp
 29.09.2024 v1.60