From c516fa7b876e8b5a9bb184838f9f66505d4dd697 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Fri, 31 May 2024 14:57:01 +0200
Subject: [PATCH 1/9] [ENH] Preparing webhook token setting

---
 modules/imap/handler_modules.php | 10 ++++++++++
 modules/imap/output_modules.php  | 17 +++++++++++++++++
 modules/imap/setup.php           |  5 ++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 7f7c3b8c4b..e165e398d5 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -93,6 +93,16 @@ public function process() {
     }
 }
 
+class Hm_Handler_process_webhook_token_setting extends Hm_Handler_Module {
+    /**
+     * Allowed values are greater than zero and less than MAX_PER_SOURCE
+     */
+    public function process() {
+        function webhook_token_callback($val) { return $val; }
+        process_site_setting('webhook_token', $this, 'webhook_token_callback', false, true);
+    }
+}
+
 /**
  * Process input from the max google contacts input in the settings page
  * @subpackage imap/handler
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 8462c7736c..1ffbd57b4d 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1124,6 +1124,23 @@ protected function output() {
     }
 }
 
+class Hm_Output_webhook_token_setting extends Hm_Output_Module {
+    protected function output() {
+        $settings = $this->get('user_settings', array());
+        $webhook_token = '';
+        $reset = '';
+        if (array_key_exists('webhook_token', $settings)) {
+            $webhook_token = $settings['webhook_token'];
+        }
+        if (!empty($webhook_token)) {
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input" default-value=""></i></span>';
+        }
+        return '<tr class="general_setting"><td><label for="imap_per_page">'.
+            $this->trans('Webhook telegram token').'</label></td><td><input class="form-control form-control-sm w-auto" type="text" id="webhook_token" '.
+            'name="webhook_token" value="'.$this->html_safe($webhook_token).'" />'.$reset.'</td></tr>';
+    }
+}
+
 /**
  * Option to set number of google contacts
  * @subpackage imap/output
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 70ab9da977..848cc0b73f 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -37,6 +37,7 @@
 add_handler('settings', 'process_enable_simple_download_options', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_unread_on_open', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_imap_per_page_setting', true, 'imap', 'date', 'after');
+add_handler('settings', 'process_webhook_token_setting', true, 'imap', 'save_user_settings', 'before');
 add_handler('settings', 'process_max_google_contacts_number', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_review_sent_email_setting', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_auto_advance_email_setting', true, 'imap', 'date', 'after');
@@ -51,6 +52,7 @@
 add_output('settings', 'imap_pagination_links', true, 'imap', 'imap_msg_icons_setting', 'after');
 add_output('settings', 'imap_unread_on_open', true, 'imap', 'imap_msg_icons_setting', 'after');
 add_output('settings', 'imap_per_page_setting', true, 'imap', 'imap_pagination_links', 'after');
+add_output('settings', 'webhook_token_setting', true, 'imap', 'imap_per_page_setting', 'after');
 add_output('settings', 'enable_simple_download_options', true, 'imap', 'imap_per_page_setting', 'after');
 add_output('settings', 'max_google_contacts_number', true, 'imap', 'imap_per_page_setting', 'after');
 add_output('settings', 'review_sent_email', true, 'imap', 'imap_pagination_links', 'after');
@@ -416,6 +418,7 @@
         'review_sent_email' => FILTER_VALIDATE_BOOLEAN,
         'imap_snooze_ids' => FILTER_DEFAULT,
         'imap_snooze_until' => FILTER_DEFAULT,
-        'auto_advance_email' => FILTER_VALIDATE_BOOLEAN
+        'auto_advance_email' => FILTER_VALIDATE_BOOLEAN,
+        'webhook_token' => FILTER_DEFAULT,
     )
 );

From 3fb1d360d10e2ed6a343df1ac09066c467c6f7b0 Mon Sep 17 00:00:00 2001
From: Baraka Kinywa <bkinywa24@gmail.com>
Date: Fri, 31 May 2024 23:55:08 +0200
Subject: [PATCH 2/9] [FIX]fixing reset icon to work on Restore current value
 and Restore default value

---
 modules/core/site.js            | 21 ++++++++++++++++++++-
 modules/imap/output_modules.php |  6 +++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/modules/core/site.js b/modules/core/site.js
index d8abb05e50..c93828a234 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1799,6 +1799,24 @@ var reset_default_value_checkbox = function() {
     }
 };
 
+var reset_default_value_input_webhook_token = function() {
+    let field = this.parentElement.parentElement.querySelector('input[type="text"]');
+    const defaultValue = field.getAttribute("data-default-value");
+
+    if (field.disabled == false) {
+        this.style.transform = "scaleX(1)";
+        this.parentElement.setAttribute("restore_aria_label", hm_trans("Restore current value"));
+        field.setAttribute("current_value", field.value);
+        field.value = defaultValue; // Use the default value (which is now an empty string)
+        field.disabled = true;
+    } else {
+        this.style.transform = "scaleX(-1)";
+        this.parentElement.setAttribute("restore_aria_label", hm_trans("Restore default value"));
+        field.value = field.getAttribute("current_value");
+        field.disabled = false;
+    }
+};
+
 var reset_default_value_select = function() {
     let field = this.parentElement.parentElement.firstChild;
     let tab_static_default_value = {"inline_message_style" : 0, "smtp_compose_type" : 0, "theme_setting" : 0,
@@ -1942,6 +1960,7 @@ $(function() {
         $('.reset_default_value_checkbox').on("click", reset_default_value_checkbox);
         $('.reset_default_value_select').on("click", reset_default_value_select);
         $('.reset_default_value_input').on("click", reset_default_value_input);
+        $('.reset_default_value_input_webhook_token').on("click", reset_default_value_input_webhook_token);
     }
 
     if (hm_check_dirty_flag()) {
@@ -2602,7 +2621,7 @@ const observeMessageTextMutationAndHandleExternalResources = (inline) => {
                 if (mutation.addedNodes.length > 0) {
                     mutation.addedNodes.forEach(function (node) {
                         if (node.classList.contains('msg_text_inner')) {
-                            handleExternalResources(inline);                    
+                            handleExternalResources(inline);
                         }
                     });
                 }
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 1ffbd57b4d..c14b034b90 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1133,11 +1133,11 @@ protected function output() {
             $webhook_token = $settings['webhook_token'];
         }
         if (!empty($webhook_token)) {
-            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input" default-value=""></i></span>';
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input_webhook_token"></i></span>';
         }
-        return '<tr class="general_setting"><td><label for="imap_per_page">'.
+        return '<tr class="general_setting"><td><label for="webhook_token">'.
             $this->trans('Webhook telegram token').'</label></td><td><input class="form-control form-control-sm w-auto" type="text" id="webhook_token" '.
-            'name="webhook_token" value="'.$this->html_safe($webhook_token).'" />'.$reset.'</td></tr>';
+            'name="webhook_token" value="'.$this->html_safe($webhook_token).'" data-default-value="" />'.$reset.'</td></tr>';
     }
 }
 

From 4ce0baef1973712c7e8ef1af48d683bf650179ae Mon Sep 17 00:00:00 2001
From: Baraka Kinywa <bkinywa24@gmail.com>
Date: Tue, 4 Jun 2024 16:09:35 +0200
Subject: [PATCH 3/9] [ENH]Telegram webhook notification

---
 lib/telegram_webhook.php         | 118 +++++++++++++++++++++++++++++++
 modules/feeds/hm-feed.php        |   2 +-
 modules/imap/handler_modules.php |   8 ++-
 3 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 lib/telegram_webhook.php

diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
new file mode 100644
index 0000000000..7642426bfe
--- /dev/null
+++ b/lib/telegram_webhook.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Webhook
+ * @package framework
+ * @subpackage webhook
+ */
+
+class Hm_Telegram_Webhook {
+
+    /* webhook_token value */
+    private $webhook_token;
+
+    private $prefix_ui = 'https://api.telegram.org/';
+
+    /**
+     * Load webhook token
+     * @param string $webhook_token
+     */
+    public function __construct($webhook_token) {
+        $this->webhook_token = $webhook_token;
+    }
+
+    // Function to send Telegram notification
+    /**
+     * send telegram notiofication using curl
+     * @param array $extracted_msgs
+     */
+    public function send(array $extracted_msgs) {
+        // Delete the webhook
+        if ($this->delete_webhook($this->webhook_token)) {
+            // Get the chat ID
+            $chatId = $this->get_chat_id();
+            if ($chatId) {
+                $text = "New Message\nFrom: {$extracted_msgs['from']}\nSubject: {$extracted_msgs['subject']}\nContent: {$extracted_msgs['body']}";
+
+                $curl_handle = curl_init();
+                curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_uri}bot{$this->webhook_token}/sendMessage");
+                curl_setopt($curl_handle, CURLOPT_POST, true);
+                curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+                curl_setopt($curl_handle, CURLOPT_POSTFIELDS, http_build_query(['chat_id' => $chatId, 'text' => $text]));
+                curl_setopt($curl_handle, CURLOPT_HTTPHEADER, ["Content-Type: application/x-www-form-urlencoded"]);
+
+                $response = curl_exec($curl_handle);
+                if (curl_errno($ch)) {
+                    Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
+                } else {
+                    $response_data = json_decode($response, true);
+                    if (!$response_data['ok']) {
+                        Hm_Msgs::add('ERRFailed to send message: ' . $response_data['description']);
+                    }
+                }
+                curl_close($curl_handle);
+                unset($curl_handle);
+            }
+        }
+    }
+
+    /**
+     * get the chat ID using webhook_token
+     */
+    private function get_chat_id() {
+        $curl_handle = curl_init();
+        curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_ui}/bot{$this->webhook_token}/getUpdates");
+        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        $response = curl_exec($curl_handle);
+
+        if (curl_errno($curl_handle)) {
+            Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
+            return false;
+        } else {
+            $response_data = json_decode($response, true);
+            if ($response_data['ok']) {
+                if (!empty($response_data['result'])) {
+                    $chatId = $response_data['result'][0]['message']['chat']['id'];
+                    return $chatId;
+                } else {
+                    Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
+                    return false;
+                }
+            } else {
+                Hm_Msgs::add('ERRFailed to get chat ID: ' . $response_data['description'] . '<br>');
+                return false;
+            }
+        }
+
+        curl_close($curl_handle);
+        unset($curl_handle);
+    }
+
+    /**
+     * This function is usefull when trying to resend, we need to delete old webhook before we send a new one
+     * delete the webhook using webhook_token
+     */
+    private function delete_webhook() {
+        $curl_handle = curl_init();
+        curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_ui}bot{$this->webhook_token}/delete_webhook");
+        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        $response = curl_exec($curl_handle);
+
+        if (curl_errno($curl_handle)) {
+            Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
+            return false;
+        } else {
+            $response_data = json_decode($response, true);
+            if ($response_data['ok']) {
+                Hm_Msgs::add('ERRWebhook was deleted successfully.<br>');
+                return true;
+            } else {
+                Hm_Msgs::add('ERRFailed to delete webhook: ' . $response_data['description'] . '<br>');
+                return false;
+            }
+        }
+
+        curl_close($curl_handle);
+        unset($curl_handle);
+    }
+}
diff --git a/modules/feeds/hm-feed.php b/modules/feeds/hm-feed.php
index e7271a7b6b..78e5ba7eee 100644
--- a/modules/feeds/hm-feed.php
+++ b/modules/feeds/hm-feed.php
@@ -118,7 +118,7 @@ function get_feed_data($url) {
         }
         switch ($type) {
             case 'curl':
-                $curl_handle=curl_init();
+                $curl_handle = curl_init();
                 curl_setopt($curl_handle, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36");
                 curl_setopt($curl_handle, CURLOPT_URL, $url);
                 curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT,15);
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index e165e398d5..8243cfc274 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * IMAP modules
  * @package modules
@@ -8,7 +7,6 @@
 
 if (!defined('DEBUG_MODE')) { die(); }
 
-
 /**
  * Check for attachments when forwarding a message
  * @subpackage imap/handler
@@ -1316,6 +1314,12 @@ public function process() {
             $this->out('imap_server_ids', $form['imap_server_ids']);
         }
     }
+
+
+
+
+
+
 }
 
 /**

From d8221783eaed9424839ba512517ef87c9dec569a Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Wed, 5 Jun 2024 17:56:52 +0200
Subject: [PATCH 4/9] [REF] Refactor webhook codebase and fix small issues

---
 lib/telegram_webhook.php         | 124 ++++++++++---------------------
 modules/imap/handler_modules.php |  19 +++--
 2 files changed, 52 insertions(+), 91 deletions(-)

diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
index 7642426bfe..9fd3dbbd1d 100644
--- a/lib/telegram_webhook.php
+++ b/lib/telegram_webhook.php
@@ -8,111 +8,65 @@
 
 class Hm_Telegram_Webhook {
 
-    /* webhook_token value */
-    private $webhook_token;
-
-    private $prefix_ui = 'https://api.telegram.org/';
+    const PREFIX_URI = 'https://api.telegram.org/';
 
-    /**
-     * Load webhook token
-     * @param string $webhook_token
-     */
-    public function __construct($webhook_token) {
-        $this->webhook_token = $webhook_token;
-    }
-
-    // Function to send Telegram notification
     /**
      * send telegram notiofication using curl
      * @param array $extracted_msgs
      */
-    public function send(array $extracted_msgs) {
-        // Delete the webhook
-        if ($this->delete_webhook($this->webhook_token)) {
-            // Get the chat ID
-            $chatId = $this->get_chat_id();
-            if ($chatId) {
-                $text = "New Message\nFrom: {$extracted_msgs['from']}\nSubject: {$extracted_msgs['subject']}\nContent: {$extracted_msgs['body']}";
-
-                $curl_handle = curl_init();
-                curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_uri}bot{$this->webhook_token}/sendMessage");
-                curl_setopt($curl_handle, CURLOPT_POST, true);
-                curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-                curl_setopt($curl_handle, CURLOPT_POSTFIELDS, http_build_query(['chat_id' => $chatId, 'text' => $text]));
-                curl_setopt($curl_handle, CURLOPT_HTTPHEADER, ["Content-Type: application/x-www-form-urlencoded"]);
-
-                $response = curl_exec($curl_handle);
-                if (curl_errno($ch)) {
-                    Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
-                } else {
-                    $response_data = json_decode($response, true);
-                    if (!$response_data['ok']) {
-                        Hm_Msgs::add('ERRFailed to send message: ' . $response_data['description']);
-                    }
+    public static function send(array $extracted_msgs, $webhook_token) {
+        self::delete_webhook($webhook_token);
+        // Get the chat ID
+        $chatId = self::get_chat_id($webhook_token);
+        if (!empty($chatId)) {
+            $text = "New Message\nFrom: {$extracted_msgs['from']}\nSubject: {$extracted_msgs['subject']}\nTo: {$extracted_msgs['to']}";
+            $curl_handle = Hm_Functions::c_init();
+            Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/sendMessage');
+            Hm_Functions::c_setopt($curl_handle, CURLOPT_POST, true);
+            Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+            Hm_Functions::c_setopt($curl_handle, CURLOPT_POSTFIELDS, http_build_query(['chat_id' => $chatId, 'text' => $text]));
+            Hm_Functions::c_setopt($curl_handle, CURLOPT_HTTPHEADER, ["Content-Type: application/x-www-form-urlencoded"]);
+            $curl_result = Hm_Functions::c_exec($curl_handle);
+            if (trim($curl_result)) {
+                $response_data = json_decode($curl_result, true);
+                if (!$response_data['ok']) {
+                    
                 }
-                curl_close($curl_handle);
-                unset($curl_handle);
             }
         }
     }
 
     /**
      * get the chat ID using webhook_token
+     * @param string $webhook_token
      */
-    private function get_chat_id() {
-        $curl_handle = curl_init();
-        curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_ui}/bot{$this->webhook_token}/getUpdates");
-        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl_handle);
-
-        if (curl_errno($curl_handle)) {
-            Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
-            return false;
-        } else {
-            $response_data = json_decode($response, true);
-            if ($response_data['ok']) {
-                if (!empty($response_data['result'])) {
-                    $chatId = $response_data['result'][0]['message']['chat']['id'];
-                    return $chatId;
-                } else {
-                    Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
-                    return false;
-                }
+    private static function get_chat_id($webhook_token) {
+        $curl_handle = Hm_Functions::c_init();
+        Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/getUpdates');
+        Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        $curl_result = Hm_Functions::c_exec($curl_handle);
+        if (trim($curl_result)) {
+            $response_data = json_decode($curl_result, true);
+            if(!empty($chatId = $response_data['result'][0]['message']['chat']['id'])){
+                return $chatId;
             } else {
-                Hm_Msgs::add('ERRFailed to get chat ID: ' . $response_data['description'] . '<br>');
-                return false;
+                Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
+                return '';
             }
         }
-
-        curl_close($curl_handle);
-        unset($curl_handle);
     }
 
     /**
      * This function is usefull when trying to resend, we need to delete old webhook before we send a new one
-     * delete the webhook using webhook_token
+     * delete the webhook using webhook_token if there is one
+     * sometimes the webhook is not deleted, so we need to delete it manually
+     * and sometines we are gettiting not found error
+     * @param string $webhook_token
      */
-    private function delete_webhook() {
-        $curl_handle = curl_init();
-        curl_setopt($curl_handle, CURLOPT_URL, "{$this->prefix_ui}bot{$this->webhook_token}/delete_webhook");
-        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl_handle);
-
-        if (curl_errno($curl_handle)) {
-            Hm_Msgs::add('ERRError:' . curl_error($curl_handle));
-            return false;
-        } else {
-            $response_data = json_decode($response, true);
-            if ($response_data['ok']) {
-                Hm_Msgs::add('ERRWebhook was deleted successfully.<br>');
-                return true;
-            } else {
-                Hm_Msgs::add('ERRFailed to delete webhook: ' . $response_data['description'] . '<br>');
-                return false;
-            }
-        }
-
-        curl_close($curl_handle);
-        unset($curl_handle);
+    private static function delete_webhook($webhook_token) {
+        $curl_handle = Hm_Functions::c_init();
+        Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/delete_webhook');
+        Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        Hm_Functions::c_exec($curl_handle);
     }
 }
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 8243cfc274..542212f922 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -7,6 +7,8 @@
 
 if (!defined('DEBUG_MODE')) { die(); }
 
+require_once APP_PATH .'lib/telegram_webhook.php';
+
 /**
  * Check for attachments when forwarding a message
  * @subpackage imap/handler
@@ -1312,14 +1314,19 @@ public function process() {
             $this->out('folder_status', $status);
             $this->out('imap_unread_data', $msg_list);
             $this->out('imap_server_ids', $form['imap_server_ids']);
+
+            $webhook_token = $this->user_config->get('webhook_token_setting');
+            if($webhook_token && !empty($webhook_token)) {
+                $extracted_msgs = array();
+                foreach ($msg_list as $msg) {
+                    $extracted_msgs['from'] = $msg['from'];
+                    $extracted_msgs['subject'] = $msg['subject'];
+                    $extracted_msgs['to'] = $msg['subject'];
+                    Hm_Telegram_Webhook::send($extracted_msgs,$webhook_token);
+                }
+            }
         }
     }
-
-
-
-
-
-
 }
 
 /**

From 391e40d9f9cea80af52cd2372d6ee0f54b29fb37 Mon Sep 17 00:00:00 2001
From: Baraka Kinywa <bkinywa24@gmail.com>
Date: Sat, 8 Jun 2024 01:59:56 +0200
Subject: [PATCH 5/9] [FIX]Telegram webhook notification: Notify for unread
 emails every 5minutes.

---
 lib/telegram_webhook.php         | 10 ++++++----
 modules/imap/handler_modules.php | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
index 9fd3dbbd1d..299658ab62 100644
--- a/lib/telegram_webhook.php
+++ b/lib/telegram_webhook.php
@@ -12,14 +12,16 @@ class Hm_Telegram_Webhook {
 
     /**
      * send telegram notiofication using curl
-     * @param array $extracted_msgs
+     * @param int $msg_count
+     * @param string $email_to
+     * @param string $webhook_token
      */
-    public static function send(array $extracted_msgs, $webhook_token) {
+    public static function send($msg_count, $email_to, $webhook_token) {
         self::delete_webhook($webhook_token);
         // Get the chat ID
         $chatId = self::get_chat_id($webhook_token);
         if (!empty($chatId)) {
-            $text = "New Message\nFrom: {$extracted_msgs['from']}\nSubject: {$extracted_msgs['subject']}\nTo: {$extracted_msgs['to']}";
+            $text = "You have received: $msg_count unread email.s\nTo: $email_to";
             $curl_handle = Hm_Functions::c_init();
             Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/sendMessage');
             Hm_Functions::c_setopt($curl_handle, CURLOPT_POST, true);
@@ -30,7 +32,7 @@ public static function send(array $extracted_msgs, $webhook_token) {
             if (trim($curl_result)) {
                 $response_data = json_decode($curl_result, true);
                 if (!$response_data['ok']) {
-                    
+
                 }
             }
         }
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 542212f922..0876fc621d 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1316,13 +1316,16 @@ public function process() {
             $this->out('imap_server_ids', $form['imap_server_ids']);
 
             $webhook_token = $this->user_config->get('webhook_token_setting');
-            if($webhook_token && !empty($webhook_token)) {
-                $extracted_msgs = array();
-                foreach ($msg_list as $msg) {
-                    $extracted_msgs['from'] = $msg['from'];
-                    $extracted_msgs['subject'] = $msg['subject'];
-                    $extracted_msgs['to'] = $msg['subject'];
-                    Hm_Telegram_Webhook::send($extracted_msgs,$webhook_token);
+            $msg_count = count($msg_list);
+            $email_to = $msg_list[0]['to'];
+            if ($msg_count > 0) {
+                $interval = 5 * 60;
+                set_time_limit(0);
+                while (true) {
+                    if($webhook_token && !empty($webhook_token)) {
+                        Hm_Telegram_Webhook::send($msg_count, $email_to, $webhook_token);
+                        sleep($interval);
+                    }
                 }
             }
         }

From c9792fe7dcfd945446b96561bfc41163aa1479c0 Mon Sep 17 00:00:00 2001
From: Baraka Kinywa <bkinywa24@gmail.com>
Date: Sun, 9 Jun 2024 16:48:18 +0200
Subject: [PATCH 6/9] [FIX]Telegram webhook notification: Set an configurable
 interval for notifications

---
 modules/core/functions.php       | 14 ++++++++++++++
 modules/core/modules.php         |  1 +
 modules/core/site.js             | 27 +++++++++++++++++++++++++++
 modules/imap/handler_modules.php | 22 ++++++++++++++++++++--
 modules/imap/output_modules.php  | 25 +++++++++++++++++++++++++
 modules/imap/setup.php           |  3 +++
 6 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/modules/core/functions.php b/modules/core/functions.php
index 5a798c73ee..35da279174 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -350,6 +350,20 @@ function max_source_setting_callback($val) {
     return $val;
 }}
 
+/**
+ * Sanitize a default value for interval webhook notifications
+ * @subpackage core/functions
+ * @param int $val request interval
+ * @return sanitized interval
+ */
+if (!hm_exists('interval_webhook_notification_setting_callback')) {
+function interval_webhook_notification_setting_callback($val) {
+    if ($val < 1) {
+        return DEFAULT_INTERVAL_WEBHOOK_NOTIFICATION;
+    }
+    return $val;
+}}
+
 /**
  * Save user settings from the session to permanent storage
  * @subpackage core/functions
diff --git a/modules/core/modules.php b/modules/core/modules.php
index dd980474e8..c16163e9f8 100644
--- a/modules/core/modules.php
+++ b/modules/core/modules.php
@@ -9,6 +9,7 @@
 define('MAX_PER_SOURCE', 1000);
 define('DEFAULT_PER_SOURCE', 20);
 define('DEFAULT_MAX_GOOGLE_CONTACTS_NUMBER', 500);
+define('DEFAULT_INTERVAL_WEBHOOK_NOTIFICATION', 5);
 define('DEFAULT_SINCE', '-1 week');
 define('DEFAULT_SEARCH_FLD', 'TEXT');
 
diff --git a/modules/core/site.js b/modules/core/site.js
index c93828a234..fa0f84c566 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1878,6 +1878,32 @@ var reset_default_value_input = function() {
     }
 };
 
+var reset_default_value_input_interval_webhook_notification = function() {
+    let field = this.parentElement.parentElement.firstChild;
+    const defaultValue = this.getAttribute("default-value");
+
+    if (this.style.transform == "scaleX(1)") {
+        this.style.transform = "scaleX(-1)";
+        this.parentElement.setAttribute("restore_aria_label",hm_trans("Restore default value"))
+        field.value = field.getAttribute("current_value");
+        field.style.backgroundColor = "#fff";
+        field.style.pointerEvents = "auto";
+        field.style.touchAction = "auto";
+    }
+    else {
+        this.style.transform = "scaleX(1)";
+        this.parentElement.setAttribute("restore_aria_label",hm_trans("Restore current value"));
+        field.setAttribute("current_value", field.value);
+        field.value = 5;
+        if(defaultValue) {
+            field.value = defaultValue;
+        }
+        field.style.backgroundColor = "#eee";
+        field.style.pointerEvents = "none";
+        field.style.touchAction = "none";
+    }
+};
+
 var decrease_servers = function(section) {
     const element = document.querySelector(`.server_count .${section}_server_count`);
     const value = parseInt(element.textContent);
@@ -1961,6 +1987,7 @@ $(function() {
         $('.reset_default_value_select').on("click", reset_default_value_select);
         $('.reset_default_value_input').on("click", reset_default_value_input);
         $('.reset_default_value_input_webhook_token').on("click", reset_default_value_input_webhook_token);
+        $('.reset_default_value_input_interval_webhook_notification').on("click", reset_default_value_input_interval_webhook_notification);
     }
 
     if (hm_check_dirty_flag()) {
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 0876fc621d..65d1ae7c86 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -93,9 +93,26 @@ public function process() {
     }
 }
 
+/**
+ * Process input from the interval webhook notification setting in the settings page
+ * @subpackage imap/handler
+ */
+class Hm_Handler_process_interval_webhook_notification_setting extends Hm_Handler_Module {
+    /**
+     * Allowed values are greater than zero
+     */
+    public function process() {
+        process_site_setting('interval_webhook_notification', $this, 'interval_webhook_notification_setting_callback', DEFAULT_INTERVAL_WEBHOOK_NOTIFICATION);
+    }
+}
+
+/**
+ * Process input from the webhook token setting in the settings page
+ * @subpackage imap/handler
+ */
 class Hm_Handler_process_webhook_token_setting extends Hm_Handler_Module {
     /**
-     * Allowed values are greater than zero and less than MAX_PER_SOURCE
+     * Allowed values for webhook token
      */
     public function process() {
         function webhook_token_callback($val) { return $val; }
@@ -1316,10 +1333,11 @@ public function process() {
             $this->out('imap_server_ids', $form['imap_server_ids']);
 
             $webhook_token = $this->user_config->get('webhook_token_setting');
+            $interval_webhook_notification = $this->user_config->get('interval_webhook_notification_setting');
             $msg_count = count($msg_list);
             $email_to = $msg_list[0]['to'];
             if ($msg_count > 0) {
-                $interval = 5 * 60;
+                $interval = $interval_webhook_notification * 60;
                 set_time_limit(0);
                 while (true) {
                     if($webhook_token && !empty($webhook_token)) {
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index c14b034b90..9abb68d597 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1124,6 +1124,31 @@ protected function output() {
     }
 }
 
+/**
+ * Option to set the interval webhook notification for the settings page
+ * @subpackage imap/output
+ */
+class Hm_Output_interval_webhook_notification_setting extends Hm_Output_Module {
+    protected function output() {
+        $settings = $this->get('user_settings', array());
+        $per_page = 5;
+        $reset = '';
+        if (array_key_exists('interval_webhook_notification', $settings)) {
+            $per_page = $settings['interval_webhook_notification'];
+        }
+        if ($per_page != 5) {
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input_interval_webhook_notification"></i></span>';
+        }
+        return '<tr class="general_setting"><td><label for="interval_webhook_notification">'.
+            $this->trans('Interval webhook notification(minutes)').'</label></td><td><input class="form-control form-control-sm w-auto" type="text" id="interval_webhook_notification" '.
+            'name="interval_webhook_notification" value="'.$this->html_safe($per_page).'" />'.$reset.'</td></tr>';
+    }
+}
+
+/**
+ * Option to set the webhook token for the settings page
+ * @subpackage imap/output
+ */
 class Hm_Output_webhook_token_setting extends Hm_Output_Module {
     protected function output() {
         $settings = $this->get('user_settings', array());
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 848cc0b73f..509a41f01c 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -38,6 +38,7 @@
 add_handler('settings', 'process_unread_on_open', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_imap_per_page_setting', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_webhook_token_setting', true, 'imap', 'save_user_settings', 'before');
+add_handler('settings', 'process_interval_webhook_notification_setting', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_max_google_contacts_number', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_review_sent_email_setting', true, 'imap', 'date', 'after');
 add_handler('settings', 'process_auto_advance_email_setting', true, 'imap', 'date', 'after');
@@ -53,6 +54,7 @@
 add_output('settings', 'imap_unread_on_open', true, 'imap', 'imap_msg_icons_setting', 'after');
 add_output('settings', 'imap_per_page_setting', true, 'imap', 'imap_pagination_links', 'after');
 add_output('settings', 'webhook_token_setting', true, 'imap', 'imap_per_page_setting', 'after');
+add_output('settings', 'interval_webhook_notification_setting', true, 'imap', 'webhook_token_setting', 'after');
 add_output('settings', 'enable_simple_download_options', true, 'imap', 'imap_per_page_setting', 'after');
 add_output('settings', 'max_google_contacts_number', true, 'imap', 'imap_per_page_setting', 'after');
 add_output('settings', 'review_sent_email', true, 'imap', 'imap_pagination_links', 'after');
@@ -420,5 +422,6 @@
         'imap_snooze_until' => FILTER_DEFAULT,
         'auto_advance_email' => FILTER_VALIDATE_BOOLEAN,
         'webhook_token' => FILTER_DEFAULT,
+        'interval_webhook_notification' => FILTER_VALIDATE_INT,
     )
 );

From 84fdd85bd6e8c9ff4255215af52ad344ac3b30e4 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Wed, 12 Jun 2024 14:20:25 +0200
Subject: [PATCH 7/9] Adding phpunit tests

---
 debug.log                                 |  5 ++
 lib/telegram_webhook.php                  | 60 +++++++++++++++---
 tests/phpunit/.phpunit.cache/test-results |  1 +
 tests/phpunit/bootstrap.php               |  1 +
 tests/phpunit/phpunit.xml                 |  3 +
 tests/phpunit/telegram_webhook.php        | 74 +++++++++++++++++++++++
 6 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 debug.log
 create mode 100644 tests/phpunit/.phpunit.cache/test-results
 create mode 100644 tests/phpunit/telegram_webhook.php

diff --git a/debug.log b/debug.log
new file mode 100644
index 0000000000..043aa4e4a0
--- /dev/null
+++ b/debug.log
@@ -0,0 +1,5 @@
+Raw cURL result: Array
+Raw cURL result: Array
+Raw cURL result: Array
+Raw cURL result: Array
+Raw cURL result: Array
diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
index 299658ab62..1a8bd40d36 100644
--- a/lib/telegram_webhook.php
+++ b/lib/telegram_webhook.php
@@ -20,6 +20,9 @@ public static function send($msg_count, $email_to, $webhook_token) {
         self::delete_webhook($webhook_token);
         // Get the chat ID
         $chatId = self::get_chat_id($webhook_token);
+        // var_dump($chatId);
+        // print_r('chatId response: ');
+        // print_r($chatId);
         if (!empty($chatId)) {
             $text = "You have received: $msg_count unread email.s\nTo: $email_to";
             $curl_handle = Hm_Functions::c_init();
@@ -35,6 +38,8 @@ public static function send($msg_count, $email_to, $webhook_token) {
 
                 }
             }
+        }else{
+            Hm_Debug::add('No chat found, please check your token.');
         }
     }
 
@@ -42,20 +47,61 @@ public static function send($msg_count, $email_to, $webhook_token) {
      * get the chat ID using webhook_token
      * @param string $webhook_token
      */
-    private static function get_chat_id($webhook_token) {
-        $curl_handle = Hm_Functions::c_init();
-        Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/getUpdates');
-        Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-        $curl_result = Hm_Functions::c_exec($curl_handle);
+    public static function get_chat_id($webhook_token) {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, static::PREFIX_URI . 'bot' . $webhook_token . '/getUpdates');
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $curl_result = curl_exec($ch);
+
+        if ($curl_result === false) {
+            Hm_Msgs::add('cURL Error: ' . curl_error($ch) . '<br>');
+            curl_close($ch);
+            return '';
+        }
+
+        curl_close($ch);
         if (trim($curl_result)) {
             $response_data = json_decode($curl_result, true);
-            if(!empty($chatId = $response_data['result'][0]['message']['chat']['id'])){
+            file_put_contents('./debug.log', 'Raw cURL result: ' . $response_data['result'] . "\n", FILE_APPEND);
+    
+            // Log the decoded response data for debugging    
+            if (isset($response_data['result'][0]['message']['chat']['id']) && !empty($response_data['result'][0]['message']['chat']['id'])) {
+                $chatId = $response_data['result'][0]['message']['chat']['id'];
                 return $chatId;
             } else {
                 Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
                 return '';
             }
         }
+
+
+
+
+
+        // $curl_handle = Hm_Functions::c_init();
+        // Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI . 'bot' . $webhook_token . '/getUpdates');
+        // Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        // $curl_result = Hm_Functions::c_exec($curl_handle);
+        // file_put_contents('./debug.log', 'Raw cURL result: ' . $curl_result . "\n", FILE_APPEND);
+
+        // if ($curl_result === false) {
+        //     // Hm_Msgs::add('cURL Error: ' . Hm_Functions::c_error($curl_handle) . '<br>');
+        //     // Hm_Functions::c_close($curl_handle);
+        //     return '';
+        // }
+    
+        // // Hm_Functions::c_close($curl_handle);
+    
+        // if (trim($curl_result)) {
+        //     $response_data = json_decode($curl_result, true);
+        //     if (isset($response_data['result'][0]['message']['chat']['id']) && !empty($response_data['result'][0]['message']['chat']['id'])) {
+        //         $chatId = $response_data['result'][0]['message']['chat']['id'];
+        //         return $chatId;
+        //     } else {
+        //         Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
+        //         return '';
+        //     }
+        // }
     }
 
     /**
@@ -65,7 +111,7 @@ private static function get_chat_id($webhook_token) {
      * and sometines we are gettiting not found error
      * @param string $webhook_token
      */
-    private static function delete_webhook($webhook_token) {
+    public static function delete_webhook($webhook_token) {
         $curl_handle = Hm_Functions::c_init();
         Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI.'bot'.$webhook_token.'/delete_webhook');
         Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
diff --git a/tests/phpunit/.phpunit.cache/test-results b/tests/phpunit/.phpunit.cache/test-results
new file mode 100644
index 0000000000..b9ada4cdfa
--- /dev/null
+++ b/tests/phpunit/.phpunit.cache/test-results
@@ -0,0 +1 @@
+{"version":1,"defects":{"Hm_Test_Telegram_Webhook::test_send":8,"Hm_Test_Telegram_Webhook::test_get_chat_id":5,"Hm_Test_Telegram_Webhook::test_delete_webhook":5,"Hm_Test_Telegram_Webhook::test_send_with_correct_token":8,"Hm_Test_Telegram_Webhook::test_send_with_bad_token":8,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_bad_token":8,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_correct_token":8},"times":{"Hm_Test_Telegram_Webhook::test_get_chat_id":0.001,"Hm_Test_Telegram_Webhook::test_delete_webhook":0.002,"Hm_Test_Telegram_Webhook::test_send":0.004,"Hm_Test_Telegram_Webhook::test_send_with_bad_token":2.015,"Hm_Test_Telegram_Webhook::test_send_with_correct_token":2.014,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_bad_token":2.013,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_correct_token":0.885}}
\ No newline at end of file
diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 46796714e7..584b44cde4 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -24,6 +24,7 @@
 
 /* get the framework */
 require APP_PATH.'lib/framework.php';
+require APP_PATH.'lib/telegram_webhook.php';
 
 /* get the stubs */
 require APP_PATH.'tests/phpunit/stubs.php';
diff --git a/tests/phpunit/phpunit.xml b/tests/phpunit/phpunit.xml
index f4b7b4d657..78f6ba6745 100644
--- a/tests/phpunit/phpunit.xml
+++ b/tests/phpunit/phpunit.xml
@@ -64,6 +64,9 @@
     <testsuite name="transform">
       <file>./transform.php</file>
     </testsuite>
+    <testsuite name="webhook">
+      <file>./telegram_webhook.php</file>
+    </testsuite>
     <testsuite name="auth">
       <file>./auth.php</file>
     </testsuite>
diff --git a/tests/phpunit/telegram_webhook.php b/tests/phpunit/telegram_webhook.php
new file mode 100644
index 0000000000..ff1eaaa384
--- /dev/null
+++ b/tests/phpunit/telegram_webhook.php
@@ -0,0 +1,74 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * tests for the Hm_Servers trait
+ */
+class Hm_Test_Telegram_Webhook extends TestCase {
+
+    public $telegram_webhook;
+    public function setUp(): void {
+        require 'bootstrap.php';
+        $this->telegram_webhook = new Hm_Telegram_Webhook();
+    }
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    // public function test_send_with_bad_token() {
+    //     $res = $this->telegram_webhook::send(0, 'demo@cypht.org', 'testtoken');
+    //     sleep(2);
+    //     return $this->assertNull($res);
+    // }
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    // public function test_send_with_correct_token() {
+    //     $res = $this->telegram_webhook::send(0, 'demo@cypht.org', '7253394590:AAHIY9VmoH3uTRFtEwmlfRPGyKoZIQMCX5A');
+    //     sleep(2);
+    //     return $this->assertNull($res);
+    // }
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    // public function test_get_chat_id_with_bad_token() {
+    //     $res = $this->telegram_webhook::get_chat_id('testtoken');
+    //     sleep(2);
+    //     return $this->assertEmpty($res);
+    // }
+
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    public function test_get_chat_id_with_correct_token() {
+        // $res = $this->telegram_webhook::get_chat_id('6132059962:AAHrfhsq9kkg1CK3FsAFRaK4l5zfoCWu14s');
+        // sleep(2);
+        // var_dump($res);
+        // return $this->assertEmpty($res);
+
+        $chatId = '';
+        $maxAttempts = 5;
+        $attempt = 0;
+
+        while (empty($chatId) && $attempt < $maxAttempts) {
+            $chatId = Hm_Telegram_Webhook::get_chat_id('6132059962:AAHrfhsq9kkg1CK3FsAFRaK4l5zfoCWu14s');
+            if (empty($chatId)) {
+                sleep(1); // Wait for 1 second before retrying
+            }
+            $attempt++;
+        }
+        var_dump($chatId);
+        // $this->assertNotEmpty($chatId, 'Chat ID should not be empty');
+    }
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    // public function test_delete_webhook() {
+    //     $this->telegram_webhook::delete_webhook('testtoken');
+    // }
+}

From 9d501bd12f8fa9f5f15cad9f63b503bb693c224a Mon Sep 17 00:00:00 2001
From: Baraka Kinywa <bkinywa24@gmail.com>
Date: Wed, 3 Jul 2024 09:12:09 +0200
Subject: [PATCH 8/9] [ENH]Telegram webhook interval: making it work

---
 lib/telegram_webhook.php         |  4 ++--
 modules/core/handler_modules.php |  1 +
 modules/core/output_modules.php  |  1 +
 modules/imap/handler_modules.php | 22 ++++++++++------------
 modules/imap/setup.php           |  5 +++++
 modules/imap/site.js             | 10 ++++++++++
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
index 299658ab62..1706b7e299 100644
--- a/lib/telegram_webhook.php
+++ b/lib/telegram_webhook.php
@@ -32,7 +32,7 @@ public static function send($msg_count, $email_to, $webhook_token) {
             if (trim($curl_result)) {
                 $response_data = json_decode($curl_result, true);
                 if (!$response_data['ok']) {
-
+                    Hm_Debug::add("ERRMessage not sent: ".$response_data['description']);
                 }
             }
         }
@@ -52,7 +52,7 @@ private static function get_chat_id($webhook_token) {
             if(!empty($chatId = $response_data['result'][0]['message']['chat']['id'])){
                 return $chatId;
             } else {
-                Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
+                Hm_Debug::add('ERRNo messages found. Please send a message to your bot first.<br>');
                 return '';
             }
         }
diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index adf089e71c..f2494e5809 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -679,6 +679,7 @@ public function process() {
         }
         $this->out('mailto_handler', $this->user_config->get('mailto_handler_setting', false));
         $this->out('warn_for_unsaved_changes', $this->user_config->get('warn_for_unsaved_changes_setting', false));
+        $this->out('telegram_webhook_interval', $this->user_config->get('interval_webhook_notification_setting', false));
         $this->out('no_password_save', $this->user_config->get('no_password_save_setting', false));
         if (!strstr($this->request->server['REQUEST_URI'], 'page=') && $this->page == 'home') {
             $start_page = $this->user_config->get('start_page_setting', false);
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 81284bbce7..a98dcadd35 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -619,6 +619,7 @@ protected function output() {
             'var hm_web_root_path = function() { return "'.WEB_ROOT.'"; };'.
             'var hm_flag_image_src = function() { return "<i class=\"bi bi-star-half\"></i>"; };'.
             'var hm_check_dirty_flag = function() { return '.($this->get('warn_for_unsaved_changes', '') ? '1' : '0').'; };'.
+            'var hm_telegram_webhook_interval = function() { return '.$this->get('telegram_webhook_interval', '').'; };'.
             format_data_sources($this->get('data_sources', array()), $this);
 
         if (!$this->get('disable_delete_prompt')) {
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 65d1ae7c86..a25ab72fac 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1332,19 +1332,17 @@ public function process() {
             $this->out('imap_unread_data', $msg_list);
             $this->out('imap_server_ids', $form['imap_server_ids']);
 
+        }
+    }
+}
+
+class Hm_Handler_send_telegram_webhook extends Hm_Handler_Module {
+    public function process() {
+        list($success, $form) = $this->process_form(array('unread_message_count'));
+        if ($success) {
             $webhook_token = $this->user_config->get('webhook_token_setting');
-            $interval_webhook_notification = $this->user_config->get('interval_webhook_notification_setting');
-            $msg_count = count($msg_list);
-            $email_to = $msg_list[0]['to'];
-            if ($msg_count > 0) {
-                $interval = $interval_webhook_notification * 60;
-                set_time_limit(0);
-                while (true) {
-                    if($webhook_token && !empty($webhook_token)) {
-                        Hm_Telegram_Webhook::send($msg_count, $email_to, $webhook_token);
-                        sleep($interval);
-                    }
-                }
+            if ($form['unread_message_count'] && !empty($webhook_token)) {
+                Hm_Telegram_Webhook::send($form['unread_message_count'], $this->config->get('app_name'), $webhook_token);
             }
         }
     }
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 509a41f01c..9e5415ce0e 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -176,6 +176,9 @@
 add_handler('ajax_imap_unread', 'save_imap_cache',  true);
 add_output('ajax_imap_unread', 'filter_unread_data', true);
 
+setup_base_ajax_page('ajax_send_telegram_webhook', 'core');
+add_handler('ajax_send_telegram_webhook', 'send_telegram_webhook', true, 'imap');
+
 /* ajax add/remove to combined view */
 setup_base_ajax_page('ajax_imap_update_combined_source', 'core');
 add_handler('ajax_imap_update_combined_source', 'load_imap_servers_from_config',  true);
@@ -335,6 +338,7 @@
         'ajax_imap_unsnooze',
         'ajax_imap_junk',
         'message_source',
+        'ajax_send_telegram_webhook',
     ),
 
     'allowed_output' => array(
@@ -423,5 +427,6 @@
         'auto_advance_email' => FILTER_VALIDATE_BOOLEAN,
         'webhook_token' => FILTER_DEFAULT,
         'interval_webhook_notification' => FILTER_VALIDATE_INT,
+        'unread_message_count' => FILTER_VALIDATE_INT,
     )
 );
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 711c36b530..f253797890 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1134,6 +1134,15 @@ var imap_unsnooze_messages = function() {
     );
 }
 
+var imap_send_telegram_webhook = function() {
+    Hm_Ajax.request(
+        [{'name': 'hm_ajax_hook', 'value': 'ajax_send_telegram_webhook'},
+            {'name': 'unread_message_count', 'value': Number.parseInt($('.total_unread_count').text())}
+        ],
+        function() {},
+    );
+}
+
 if (hm_list_path() == 'sent') {
     Hm_Message_List.page_caches.sent = 'formatted_sent_data';
 }
@@ -1190,6 +1199,7 @@ $(function() {
     if (hm_is_logged()) {
         imap_unsnooze_messages();
         setInterval(imap_unsnooze_messages, 60000);
+        setInterval(imap_send_telegram_webhook, 60000 * hm_telegram_webhook_interval());
     }
 
     if ($('.imap_move').length > 0) {

From 3d92d40a1905fc641d799c6edced2ed1c01c6756 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Mon, 15 Jul 2024 00:12:13 +0300
Subject: [PATCH 9/9] Correct phpunit tests

---
 debug.log                                     |  5 --
 lib/telegram_webhook.php                      | 36 +--------
 tests/phpunit/.phpunit.cache/test-results     |  1 -
 tests/phpunit/modules/core/output_modules.php |  4 +-
 tests/phpunit/phpunit.xml                     |  3 -
 tests/phpunit/telegram_webhook.php            | 74 -------------------
 6 files changed, 3 insertions(+), 120 deletions(-)
 delete mode 100644 debug.log
 delete mode 100644 tests/phpunit/.phpunit.cache/test-results
 delete mode 100644 tests/phpunit/telegram_webhook.php

diff --git a/debug.log b/debug.log
deleted file mode 100644
index 043aa4e4a0..0000000000
--- a/debug.log
+++ /dev/null
@@ -1,5 +0,0 @@
-Raw cURL result: Array
-Raw cURL result: Array
-Raw cURL result: Array
-Raw cURL result: Array
-Raw cURL result: Array
diff --git a/lib/telegram_webhook.php b/lib/telegram_webhook.php
index 98ed39aad1..312a299258 100644
--- a/lib/telegram_webhook.php
+++ b/lib/telegram_webhook.php
@@ -20,9 +20,6 @@ public static function send($msg_count, $email_to, $webhook_token) {
         self::delete_webhook($webhook_token);
         // Get the chat ID
         $chatId = self::get_chat_id($webhook_token);
-        // var_dump($chatId);
-        // print_r('chatId response: ');
-        // print_r($chatId);
         if (!empty($chatId)) {
             $text = "You have received: $msg_count unread email.s\nTo: $email_to";
             $curl_handle = Hm_Functions::c_init();
@@ -61,9 +58,7 @@ public static function get_chat_id($webhook_token) {
 
         curl_close($ch);
         if (trim($curl_result)) {
-            $response_data = json_decode($curl_result, true);
-            file_put_contents('./debug.log', 'Raw cURL result: ' . $response_data['result'] . "\n", FILE_APPEND);
-    
+            $response_data = json_decode($curl_result, true);    
             // Log the decoded response data for debugging    
             if (isset($response_data['result'][0]['message']['chat']['id']) && !empty($response_data['result'][0]['message']['chat']['id'])) {
                 $chatId = $response_data['result'][0]['message']['chat']['id'];
@@ -73,35 +68,6 @@ public static function get_chat_id($webhook_token) {
                 return '';
             }
         }
-
-
-
-
-
-        // $curl_handle = Hm_Functions::c_init();
-        // Hm_Functions::c_setopt($curl_handle, CURLOPT_URL, static::PREFIX_URI . 'bot' . $webhook_token . '/getUpdates');
-        // Hm_Functions::c_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-        // $curl_result = Hm_Functions::c_exec($curl_handle);
-        // file_put_contents('./debug.log', 'Raw cURL result: ' . $curl_result . "\n", FILE_APPEND);
-
-        // if ($curl_result === false) {
-        //     // Hm_Msgs::add('cURL Error: ' . Hm_Functions::c_error($curl_handle) . '<br>');
-        //     // Hm_Functions::c_close($curl_handle);
-        //     return '';
-        // }
-    
-        // // Hm_Functions::c_close($curl_handle);
-    
-        // if (trim($curl_result)) {
-        //     $response_data = json_decode($curl_result, true);
-        //     if (isset($response_data['result'][0]['message']['chat']['id']) && !empty($response_data['result'][0]['message']['chat']['id'])) {
-        //         $chatId = $response_data['result'][0]['message']['chat']['id'];
-        //         return $chatId;
-        //     } else {
-        //         Hm_Msgs::add('ERRNo messages found. Please send a message to your bot first.<br>');
-        //         return '';
-        //     }
-        // }
     }
 
     /**
diff --git a/tests/phpunit/.phpunit.cache/test-results b/tests/phpunit/.phpunit.cache/test-results
deleted file mode 100644
index b9ada4cdfa..0000000000
--- a/tests/phpunit/.phpunit.cache/test-results
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"defects":{"Hm_Test_Telegram_Webhook::test_send":8,"Hm_Test_Telegram_Webhook::test_get_chat_id":5,"Hm_Test_Telegram_Webhook::test_delete_webhook":5,"Hm_Test_Telegram_Webhook::test_send_with_correct_token":8,"Hm_Test_Telegram_Webhook::test_send_with_bad_token":8,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_bad_token":8,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_correct_token":8},"times":{"Hm_Test_Telegram_Webhook::test_get_chat_id":0.001,"Hm_Test_Telegram_Webhook::test_delete_webhook":0.002,"Hm_Test_Telegram_Webhook::test_send":0.004,"Hm_Test_Telegram_Webhook::test_send_with_bad_token":2.015,"Hm_Test_Telegram_Webhook::test_send_with_correct_token":2.014,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_bad_token":2.013,"Hm_Test_Telegram_Webhook::test_get_chat_id_with_correct_token":0.885}}
\ No newline at end of file
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index 71d404263e..ec0e377423 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -444,10 +444,10 @@ public function test_js_data() {
         $test = new Output_Test('js_data', 'core');
         $test->handler_response = array('disable_delete_prompt' => true);
         $res = $test->run();
-        $this->assertStringStartsWith('<script type="text/javascript">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\\"bi bi-star-half\\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return true; };', implode($res->output_response));
+        $this->assertStringStartsWith('<script type="text/javascript">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\"bi bi-star-half\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_telegram_webhook_interval = function() { return ; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return true; };', implode($res->output_response));
         $test->handler_response = array();
         $res = $test->run();
-        $this->assertStringStartsWith('<script type="text/javascript">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\\"bi bi-star-half\\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return confirm("Are you sure?"); };', implode($res->output_response));
+        $this->assertStringStartsWith('<script type="text/javascript">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\"bi bi-star-half\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_telegram_webhook_interval = function() { return ; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return confirm("Are you sure?"); };', implode($res->output_response));
     }
     /**
      * @preserveGlobalState disabled
diff --git a/tests/phpunit/phpunit.xml b/tests/phpunit/phpunit.xml
index 78f6ba6745..f4b7b4d657 100644
--- a/tests/phpunit/phpunit.xml
+++ b/tests/phpunit/phpunit.xml
@@ -64,9 +64,6 @@
     <testsuite name="transform">
       <file>./transform.php</file>
     </testsuite>
-    <testsuite name="webhook">
-      <file>./telegram_webhook.php</file>
-    </testsuite>
     <testsuite name="auth">
       <file>./auth.php</file>
     </testsuite>
diff --git a/tests/phpunit/telegram_webhook.php b/tests/phpunit/telegram_webhook.php
deleted file mode 100644
index ff1eaaa384..0000000000
--- a/tests/phpunit/telegram_webhook.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * tests for the Hm_Servers trait
- */
-class Hm_Test_Telegram_Webhook extends TestCase {
-
-    public $telegram_webhook;
-    public function setUp(): void {
-        require 'bootstrap.php';
-        $this->telegram_webhook = new Hm_Telegram_Webhook();
-    }
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    // public function test_send_with_bad_token() {
-    //     $res = $this->telegram_webhook::send(0, 'demo@cypht.org', 'testtoken');
-    //     sleep(2);
-    //     return $this->assertNull($res);
-    // }
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    // public function test_send_with_correct_token() {
-    //     $res = $this->telegram_webhook::send(0, 'demo@cypht.org', '7253394590:AAHIY9VmoH3uTRFtEwmlfRPGyKoZIQMCX5A');
-    //     sleep(2);
-    //     return $this->assertNull($res);
-    // }
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    // public function test_get_chat_id_with_bad_token() {
-    //     $res = $this->telegram_webhook::get_chat_id('testtoken');
-    //     sleep(2);
-    //     return $this->assertEmpty($res);
-    // }
-
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    public function test_get_chat_id_with_correct_token() {
-        // $res = $this->telegram_webhook::get_chat_id('6132059962:AAHrfhsq9kkg1CK3FsAFRaK4l5zfoCWu14s');
-        // sleep(2);
-        // var_dump($res);
-        // return $this->assertEmpty($res);
-
-        $chatId = '';
-        $maxAttempts = 5;
-        $attempt = 0;
-
-        while (empty($chatId) && $attempt < $maxAttempts) {
-            $chatId = Hm_Telegram_Webhook::get_chat_id('6132059962:AAHrfhsq9kkg1CK3FsAFRaK4l5zfoCWu14s');
-            if (empty($chatId)) {
-                sleep(1); // Wait for 1 second before retrying
-            }
-            $attempt++;
-        }
-        var_dump($chatId);
-        // $this->assertNotEmpty($chatId, 'Chat ID should not be empty');
-    }
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    // public function test_delete_webhook() {
-    //     $this->telegram_webhook::delete_webhook('testtoken');
-    // }
-}