From bba1ec9e175d260fc8b7206f5259466b9e3dab7c Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Wed, 23 Oct 2024 02:25:00 +0400
Subject: [PATCH] improve selfupdate

---
 app/bot.php  | 8 +++++---
 app/init.php | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/bot.php b/app/bot.php
index d0f5d42..a0ffcf9 100644
--- a/app/bot.php
+++ b/app/bot.php
@@ -1804,7 +1804,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 +3855,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' => [
                     [
                         [
@@ -5743,6 +5743,8 @@ DNS-over-HTTPS with IP:
                 $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);
         }
diff --git a/app/init.php b/app/init.php
index a531d2c..500dce6 100644
--- a/app/init.php
+++ b/app/init.php
@@ -12,6 +12,7 @@ if ($c['debug']) {
 $bot = new Bot($c['key'], $i);
 $bot->cleanQueue();
 $bot->setwebhook();
+$bot->dontshowcron = 1;
 $bot->selfUpdate();
 $bot->adguardCheckPswd();
 $bot->adguardProtect();