update version

app/bot.php

@@ -1456,8 +1456,10 @@ class Bot
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
             $this->language = $this->getPacConf()['language'] ?: 'en';
             $this->limit    = $this->getPacConf()['limitpage'] ?: 5;
-            sleep(3);
-            $this->menu();
+            if (empty($file)) {
+                sleep(3);
+                $this->menu();
+            }
         }
     }
 
@@ -1804,7 +1806,7 @@ class Bot
             $this->addDomain(str_replace('.', '-', $this->ip) . '.nip.io', 1);
             $this->setSSL('letsencrypt');
         }
-        $this->menu(dontshowcron: 1);
+        $this->menu();
     }
 
     public function comment($text, $tag)
@@ -3855,13 +3857,13 @@ DNS-over-HTTPS with IP:
         $this->menu('wg', 0);
     }
 
-    public function menu($type = false, $arg = false, $return = false, $dontshowcron = false)
+    public function menu($type = false, $arg = false, $return = false)
     {
         $domain = $this->getPacConf()['domain'] ?: $this->ip;
         $cron   = exec('pgrep -f cron.php');
         $menu   = [
             'main' => [
-                'text' => 'v' . getenv('VER') . ($dontshowcron ? '' : "\ncron: " . $this->i18n($cron ? 'on' : 'off') . ($cron ? '' : ' show <code>logs/php_error</code>')),
+                'text' => 'v' . getenv('VER') . ($this->dontshowcron ? '' : "\ncron: " . $this->i18n($cron ? 'on' : 'off') . ($cron ? '' : ' show <code>logs/php_error</code>')),
                 'data' => [
                     [
                         [
@@ -5732,28 +5734,21 @@ DNS-over-HTTPS with IP:
 
     public function selfUpdate()
     {
-        require __DIR__ . '/config.php';
-        if (!empty($c['admin'])) {
-            $ip = getenv('IP');
-            $rm = explode(':', trim(file_get_contents('/update/reload_message')));
-            $m  = file_get_contents('/update/message');
-            if (file_exists($this->update)) {
-                $r = $this->send($c['admin'][0], "start update");
-                $this->input['chat']        = $c['admin'][0];
-                $this->input['message_id']  = $r['result']['message_id'];
-                if (!empty($m)) {
-                    $this->send($c['admin'][0], "<pre>$m</pre>", $rm[1]);
-                }
-                $r = $this->send($c['admin'][0], "import settings");
-                $this->input['chat']        = $c['admin'][0];
-                $this->input['message_id']  = $r['result']['message_id'];
-                $this->input['callback_id'] = $r['result']['message_id'];
-                if (empty($flag)) {
-                    $this->importFile($this->update);
-                    unlink($this->update);
-                    $flag = true;
-                }
+        $ip                         = getenv('IP');
+        $rm                         = explode(':', trim(file_get_contents('/update/reload_message')));
+        $m                          = file_get_contents('/update/message');
+        $this->input['chat']        = $rm[0];
+        $this->input['message_id']  = $rm[1];
+        $this->input['callback_id'] = $rm[1];
+        if (file_exists($this->update)) {
+            if (!empty($m)) {
+                $this->send($this->input['chat'], "<pre>$m</pre>", $rm[1]);
             }
+            $r = $this->send($this->input['chat'], "import settings");
+            $this->input['message_id']  = $r['result']['message_id'];
+            $this->input['callback_id'] = $r['result']['message_id'];
+            $this->importFile($this->update);
+            unlink($this->update);
         }
         file_put_contents('/update/message', '');
         file_put_contents('/update/reload_message', '');

app/service.php

@@ -13,5 +13,6 @@ if ($c['debug']) {
 $bot = new Bot($c['key'], $i);
 
 $bot->restartTG();
+$bot->dontshowcron = 1;
 $bot->sslip();
 $bot->cleanDocker();

version

@@ -1,3 +1,5 @@
+23.10.2024 v1.79
+- улучшение процесса обновления
 23.10.2024 v1.78
 - фикс двойного импорта при обновлении, когда админов больше одного
 - рестарт бота сбрасывает очередь сообщений от телеграма