fix menu warp after update

app/bot.php

@@ -3437,7 +3437,7 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/addCommunityFilter",
             ],
         ];
-        $data   = array_merge($data, $this->listPac('includelist', $page, 'pacMenu'));
+        $data   = array_merge($data, $this->listPac('includelist', $page, 'pacMenu')[0]);
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3576,7 +3576,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> block list';
 
-        $data   = $this->listPac('blocklist', $page, 'xtlsblock');
+        [$data] = $this->listPac('blocklist', $page, 'xtlsblock');
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3595,7 +3595,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> warp list';
 
-        $data   = $this->listPac('warplist', $page, 'xtlswarp');
+        [$data] = $this->listPac('warplist', $page, 'xtlswarp');
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3614,7 +3614,7 @@ DNS-over-HTTPS with IP:
     {
         $_SESSION['proxylistentry'] = 1;
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> proxy list';
-        $data   = $this->listPac('includelist', $page, 'xtlsproxy');
+        [$data] = $this->listPac('includelist', $page, 'xtlsproxy');
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3649,7 +3649,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> package list';
 
-        $data   = $this->listPac('packagelist', $page, 'xtlsapp');
+        [$data] = $this->listPac('packagelist', $page, 'xtlsapp');
         $p      = $this->getPacConf();
         $data[] = [
             [
@@ -3675,7 +3675,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> process list';
 
-        $data   = $this->listPac('processlist', $page, 'xtlsprocess');
+        [$data] = $this->listPac('processlist', $page, 'xtlsprocess');
         $p      = $this->getPacConf();
         $data[] = [
             [
@@ -3701,7 +3701,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> rulesset list';
 
-        $data   = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
+        [$data, $text] = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3732,6 +3732,9 @@ DNS-over-HTTPS with IP:
             $domains = array_slice($domains, $page * $this->limit, $this->limit, true);
             $i = 0;
             foreach ($domains as $k => $v) {
+                if ($type == 'rulessetlist') {
+                    $text[] = "<blockquote><code>$k</code></blockquote>";
+                }
                 $data[] = [
                     [
                         'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? $k : idn_to_utf8($k)),
@@ -3778,7 +3781,7 @@ DNS-over-HTTPS with IP:
                 ],
             ];
         }
-        return $data;
+        return [$data, $text];
     }
 
     public function listPacChange($type, $action, $key)
@@ -4686,14 +4689,10 @@ DNS-over-HTTPS with IP:
         return 'off';
     }
 
-    public function offWarp()
+    public function offWarp($inversion = true)
     {
         $p = $this->getPacConf();
-        if (empty($p['warpoff'])) {
-            $this->ssh('warp-cli --accept-tos registration delete', 'wp');
-            $this->ssh('pkill warp-svc', 'wp');
-            $p['warpoff'] = 1;
-        } else {
+        if ($inversion && !empty($p['warpoff'])) {
             $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
             sleep(3);
             if (empty($this->ssh('[ -f "/var/lib/cloudflare-warp/conf.json" ] && echo 1', 'wp'))) {
@@ -4705,9 +4704,19 @@ DNS-over-HTTPS with IP:
             $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']);
+        } else {
+            if (empty($inversion)) {
+                $this->ssh('warp-cli --accept-tos registration delete 2>&1', 'wp');
+            } else {
+                $this->send($this->input['chat'], 'Registration delete: ' . $this->ssh('warp-cli --accept-tos registration delete 2>&1', 'wp'));
+            }
+            $this->ssh('pkill warp-svc', 'wp');
+            $p['warpoff'] = 1;
         }
         $this->setPacConf($p);
-        $this->warp();
+        if (!empty($inversion)) {
+            $this->warp();
+        }
     }
 
     public function warp()
@@ -5543,7 +5552,7 @@ DNS-over-HTTPS with IP:
         ];
         exec("git -C / branch -vv", $mm);
         return [
-            'text' => '<pre><code class="language-shell">' . implode("\n", $mm) . '</code></pre>',
+            'text' => '<pre><code class="language-shell">' . htmlentities(implode("\n", $mm)) . '</code></pre>',
             'data' => $data,
         ];
     }

app/service.php

@@ -14,6 +14,7 @@ $bot = new Bot($c['key'], $i);
 
 $bot->selfUpdate();
 $bot->restartTG();
+$bot->offWarp(0);
 $bot->dontshowcron = 1;
 $bot->sslip();
 $bot->cleanDocker();

version

@@ -1,3 +1,8 @@
+26.10.2024 v1.88
+- xray rulesset: дублирование кнопок текстом
+- singbox 1.10.1 для windows x64
+- фикс с включенным warp после апдейта
+- фикс с нерабочей кнопкой апдейта, обновится можно через /autoupdate если поймали не рабочую кнопку апдейта
 25.10.2024 v1.87
 - xray: в routes добавлен раздел proxy - зеркало раздела Pac
 25.10.2024 v1.86