From 00184ac2f66d7912c094d6a41f68529da304f44e Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 10:07:22 +0200
Subject: [PATCH 1/9] feat: add telegram notification feature

This commit gives users the ability to enable telegram notifications
through the `tnotify-telegram-bot-id` and `tnotify-telegram-channel-id`
tmux configuration variables.
---
 README.md            |  4 ++++
 scripts/helpers.sh   | 42 ++++++++++++++++++++++++++++++++++++++++++
 scripts/notify.sh    | 23 -----------------------
 scripts/variables.sh |  6 ++++++
 4 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 52b6c53..b4d5c9c 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,10 @@ The tmux notify script uses your shell prompt suffix to check whether a command
 
 Feel free to open [a pull](https://github.com/ChanderG/tmux-notify/pulls) request or [issue](https://github.com/ChanderG/tmux-notify/issues) if you think your shell prompt suffix should be included by default.
 
+### Enable telegram channel notifications
+
+To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel name'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
+
 ## How does it work
 
 The pretty naive approach. Checks if pane content ends with the bash prompt suffixes mentioned above every 10 seconds.
diff --git a/scripts/helpers.sh b/scripts/helpers.sh
index ffe3d57..c506a7c 100644
--- a/scripts/helpers.sh
+++ b/scripts/helpers.sh
@@ -25,3 +25,45 @@ set_tmux_option() {
 escape_glob_chars() {
   echo "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
 }
+
+# Send notification
+notify() {
+  # Switch notification method based on OS
+  if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
+    osascript -e 'display notification "'"$1"'" with title "tmux-notify"'
+  else
+    # notify-send does not always work due to changing dbus params
+    # see https://superuser.com/questions/1118878/using-notify-send-in-a-tmux-session-shows-error-no-notification#1118896
+    notify-send "$1"
+  fi
+  
+  # Send telegram message if telegram bot id and chat id are set
+  if telegram_enabled; then
+    telegram_bot_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
+    telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
+    send_telegram_message $telegram_bot_id $telegram_chat_id "$1"
+  fi
+  
+  # trigger visual bell
+  # your terminal emulator can be setup to set URGENT bit on visual bell
+  # for eg, Xresources -> URxvt.urgentOnBell: true
+  tmux split-window "echo -e \"\a\" && exit"
+}
+
+# Check if verbose option is enabled
+verbose_enabled() {
+  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
+  [ "$verbose_value" != "on" ]
+}
+
+# Check if telegram bot id and chat id are set
+telegram_enabled() {
+  local telegram_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
+  local telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
+  [ -n "$telegram_id" ] && [ -n "$telegram_chat_id" ]
+}
+
+# Send telegram message
+send_telegram_message(){
+  curl "https://api.telegram.org/bot$1/sendMessage?chat_id=$2&text=$3"
+}
diff --git a/scripts/notify.sh b/scripts/notify.sh
index 56a4ec1..c1a4c74 100755
--- a/scripts/notify.sh
+++ b/scripts/notify.sh
@@ -10,23 +10,6 @@ source "${CURRENT_DIR}/variables.sh"
 
 ## Functions
 
-# Send notification
-notify() {
-  # Switch notification method based on OS
-  if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
-    osascript -e 'display notification "'"$1"'" with title "tmux-notify"'
-  else
-    # notify-send does not always work due to changing dbus params
-    # see https://superuser.com/questions/1118878/using-notify-send-in-a-tmux-session-shows-error-no-notification#1118896
-    notify-send "$1"
-  fi
-  
-  # trigger visual bell
-  # your terminal emulator can be setup to set URGENT bit on visual bell
-  # for eg, Xresources -> URxvt.urgentOnBell: true
-  tmux split-window "echo -e \"\a\" && exit"
-}
-
 # Handle cancelation of monitor job
 on_cancel()
 {
@@ -42,12 +25,6 @@ on_cancel()
 }
 trap 'on_cancel' TERM
 
-# Check if verbose option is enabled
-verbose_enabled() {
-  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
-  [ "$verbose_value" != "on" ]
-}
-
 ## Main script
 
 # Monitor pane if it is not already monitored
diff --git a/scripts/variables.sh b/scripts/variables.sh
index 23d9770..cc7cbeb 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -27,3 +27,9 @@ export verbose_msg_default="(#S, #I:#P) Tmux pane task completed!"
 # Monitor checker interval
 export monitor_sleep_duration="@tnotify-sleep-duration"
 export monitor_sleep_duration_default=10
+
+# Telegram settings
+export tmux_notify_telegram_bot_id="@tnotify-telegram-bot-id"
+export tmux_notify_telegram_channel_id="@tnotify-telegram-channel-id"
+export tmux_notify_telegram_bot_id_default=""
+export tmux_notify_telegram_channel_id_default=""

From 0303fb37d420bb4b8ddfc5f6044b9a25d566cc22 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 10:07:22 +0200
Subject: [PATCH 2/9] feat: add telegram notification feature

This commit gives users the ability to enable telegram notifications
through the `tnotify-telegram-bot-id` and `tnotify-telegram-channel-id`
tmux configuration variables.
---
 README.md            |  4 ++++
 scripts/helpers.sh   | 42 ++++++++++++++++++++++++++++++++++++++++++
 scripts/notify.sh    | 23 -----------------------
 scripts/variables.sh |  6 ++++++
 4 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 52b6c53..f7c7fdb 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,10 @@ The tmux notify script uses your shell prompt suffix to check whether a command
 
 Feel free to open [a pull](https://github.com/ChanderG/tmux-notify/pulls) request or [issue](https://github.com/ChanderG/tmux-notify/issues) if you think your shell prompt suffix should be included by default.
 
+### Enable telegram channel notifications
+
+To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
+
 ## How does it work
 
 The pretty naive approach. Checks if pane content ends with the bash prompt suffixes mentioned above every 10 seconds.
diff --git a/scripts/helpers.sh b/scripts/helpers.sh
index ffe3d57..a02fd5d 100644
--- a/scripts/helpers.sh
+++ b/scripts/helpers.sh
@@ -25,3 +25,45 @@ set_tmux_option() {
 escape_glob_chars() {
   echo "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
 }
+
+# Send notification
+notify() {
+  # Switch notification method based on OS
+  if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
+    osascript -e 'display notification "'"$1"'" with title "tmux-notify"'
+  else
+    # notify-send does not always work due to changing dbus params
+    # see https://superuser.com/questions/1118878/using-notify-send-in-a-tmux-session-shows-error-no-notification#1118896
+    notify-send "$1"
+  fi
+  
+  # Send telegram message if telegram bot id and chat id are set
+  if telegram_enabled; then
+    telegram_bot_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
+    telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
+    send_telegram_message $telegram_bot_id $telegram_chat_id "$1"
+  fi
+  
+  # trigger visual bell
+  # your terminal emulator can be setup to set URGENT bit on visual bell
+  # for eg, Xresources -> URxvt.urgentOnBell: true
+  tmux split-window "echo -e \"\a\" && exit"
+}
+
+# Check if verbose option is enabled
+verbose_enabled() {
+  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
+  [ "$verbose_value" != "on" ]
+}
+
+# Check if telegram bot id and chat id are set
+telegram_enabled() {
+  local telegram_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
+  local telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
+  [ -n "$telegram_id" ] && [ -n "$telegram_chat_id" ]
+}
+
+# Send telegram message
+send_telegram_message(){
+  curl "https://api.telegram.org/bot$1/sendMessage?chat_id=$2&text=$3" &> /dev/null
+}
diff --git a/scripts/notify.sh b/scripts/notify.sh
index 56a4ec1..c1a4c74 100755
--- a/scripts/notify.sh
+++ b/scripts/notify.sh
@@ -10,23 +10,6 @@ source "${CURRENT_DIR}/variables.sh"
 
 ## Functions
 
-# Send notification
-notify() {
-  # Switch notification method based on OS
-  if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
-    osascript -e 'display notification "'"$1"'" with title "tmux-notify"'
-  else
-    # notify-send does not always work due to changing dbus params
-    # see https://superuser.com/questions/1118878/using-notify-send-in-a-tmux-session-shows-error-no-notification#1118896
-    notify-send "$1"
-  fi
-  
-  # trigger visual bell
-  # your terminal emulator can be setup to set URGENT bit on visual bell
-  # for eg, Xresources -> URxvt.urgentOnBell: true
-  tmux split-window "echo -e \"\a\" && exit"
-}
-
 # Handle cancelation of monitor job
 on_cancel()
 {
@@ -42,12 +25,6 @@ on_cancel()
 }
 trap 'on_cancel' TERM
 
-# Check if verbose option is enabled
-verbose_enabled() {
-  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
-  [ "$verbose_value" != "on" ]
-}
-
 ## Main script
 
 # Monitor pane if it is not already monitored
diff --git a/scripts/variables.sh b/scripts/variables.sh
index 23d9770..cc7cbeb 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -27,3 +27,9 @@ export verbose_msg_default="(#S, #I:#P) Tmux pane task completed!"
 # Monitor checker interval
 export monitor_sleep_duration="@tnotify-sleep-duration"
 export monitor_sleep_duration_default=10
+
+# Telegram settings
+export tmux_notify_telegram_bot_id="@tnotify-telegram-bot-id"
+export tmux_notify_telegram_channel_id="@tnotify-telegram-channel-id"
+export tmux_notify_telegram_bot_id_default=""
+export tmux_notify_telegram_channel_id_default=""

From 1bc3c7cb8c7d26035b97b25e3b4f02bff335f048 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 10:34:00 +0200
Subject: [PATCH 3/9] refactor: improve docstrings

---
 scripts/helpers.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/helpers.sh b/scripts/helpers.sh
index a02fd5d..d50693f 100644
--- a/scripts/helpers.sh
+++ b/scripts/helpers.sh
@@ -3,6 +3,7 @@
 # Additional functions that are used in the main scripts.
 
 # Get tmux option
+# Usage: get_tmux_option <option> <default_value>
 get_tmux_option() {
   local option="$1"
   local default_value="$2"
@@ -15,6 +16,7 @@ get_tmux_option() {
 }
 
 # Set tmux option
+# Usage: set_tmux_option <option> <value>
 set_tmux_option() {
   local option="$1"
   local value="$2"
@@ -22,11 +24,13 @@ set_tmux_option() {
 }
 
 # Escape globbing charaters
+# Usage: escape_glob_chars <string>
 escape_glob_chars() {
   echo "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
 }
 
 # Send notification
+# Usage: notify <message>
 notify() {
   # Switch notification method based on OS
   if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
@@ -64,6 +68,7 @@ telegram_enabled() {
 }
 
 # Send telegram message
+# Usage: send_telegram_message <bot_id> <chat_id> <message>
 send_telegram_message(){
   curl "https://api.telegram.org/bot$1/sendMessage?chat_id=$2&text=$3" &> /dev/null
 }

From e646adf47f640820fcc09bb97c67b406dc6703b5 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 10:35:27 +0200
Subject: [PATCH 4/9] docs: fix conflicts

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index b9cebcf..f7c7fdb 100644
--- a/README.md
+++ b/README.md
@@ -80,11 +80,7 @@ Feel free to open [a pull](https://github.com/ChanderG/tmux-notify/pulls) reques
 
 ### Enable telegram channel notifications
 
-<<<<<<< HEAD
 To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
-=======
-To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel name'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
->>>>>>> 00184ac2f66d7912c094d6a41f68529da304f44e
 
 ## How does it work
 

From ecb68e5554818fc625b02e7d73d752841d336ba9 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 10:44:57 +0200
Subject: [PATCH 5/9] feat: update default verbose message format

This commit adds the window name to the default verbose format.
---
 scripts/variables.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/variables.sh b/scripts/variables.sh
index cc7cbeb..23c3538 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -22,7 +22,7 @@ export prompt_suffixes_default="$,#,%"
 export verbose_option="@tnotify-verbose"
 export verbose_default="off"
 export verbose_msg_option="@tnotify-verbose-msg"
-export verbose_msg_default="(#S, #I:#P) Tmux pane task completed!"
+export verbose_msg_default="(#S, #I:#P:#W) Tmux pane task completed!"
 
 # Monitor checker interval
 export monitor_sleep_duration="@tnotify-sleep-duration"

From 2fff0b78ef58da3a20d1811e42c21e3751813d17 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 11:45:56 +0200
Subject: [PATCH 6/9] feat: add 'tnotify-telegram-all' option

This commit adds the `tnotify-telegram-all` option that can be used to
enable the telegram messages for all monitoring tasks. It also changes
the default telegram behavoir to only be triggered when using the
'ctrl+alt+m' command.
---
 scripts/helpers.sh   | 53 +++++++++++++++++++++++++-------------------
 scripts/notify.sh    |  8 +++----
 scripts/variables.sh |  2 ++
 tnotify.tmux         |  1 +
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/scripts/helpers.sh b/scripts/helpers.sh
index d50693f..41437d8 100644
--- a/scripts/helpers.sh
+++ b/scripts/helpers.sh
@@ -29,8 +29,33 @@ escape_glob_chars() {
   echo "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
 }
 
+# Check if verbose option is enabled
+verbose_enabled() {
+  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
+  [ "$verbose_value" == "on" ]
+}
+
+# Check if the telegram alert all option is enabled
+telegram_all_enabled() {
+  local alert_all="$(get_tmux_option "$tmux_notify_telegram_all" "$tmux_notify_telegram_all_default")"
+  [ "$alert_all" == "on" ]
+}
+
+# Check if telegram bot id and chat id are set
+telegram_available() {
+  local telegram_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
+  local telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
+  [ -n "$telegram_id" ] && [ -n "$telegram_chat_id" ]
+}
+
+# Send telegram message
+# Usage: send_telegram_message <bot_id> <chat_id> <message>
+send_telegram_message() {
+  curl "https://api.telegram.org/bot$1/sendMessage?chat_id=$2&text=$3" &> /dev/null
+}
+
 # Send notification
-# Usage: notify <message>
+# Usage: notify <message> <send_telegram>
 notify() {
   # Switch notification method based on OS
   if [[ "$OSTYPE" =~ ^darwin ]]; then # If macOS
@@ -41,11 +66,12 @@ notify() {
     notify-send "$1"
   fi
   
-  # Send telegram message if telegram bot id and chat id are set
-  if telegram_enabled; then
+  # Send telegram message if telegram variables are set, and telegram alert all is
+  # enabled or if the $2 argument is set to true
+  if telegram_available && (telegram_all_enabled || [ "$2" == "true" ]); then
     telegram_bot_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
     telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
-    send_telegram_message $telegram_bot_id $telegram_chat_id "$1"
+    send_telegram_message $telegram_bot_id $telegram_chat_id "$1" &> /dev/null
   fi
   
   # trigger visual bell
@@ -53,22 +79,3 @@ notify() {
   # for eg, Xresources -> URxvt.urgentOnBell: true
   tmux split-window "echo -e \"\a\" && exit"
 }
-
-# Check if verbose option is enabled
-verbose_enabled() {
-  local verbose_value="$(get_tmux_option "$verbose_option" "$verbose_default")"
-  [ "$verbose_value" != "on" ]
-}
-
-# Check if telegram bot id and chat id are set
-telegram_enabled() {
-  local telegram_id="$(get_tmux_option "$tmux_notify_telegram_bot_id" "$tmux_notify_telegram_bot_id_default")"
-  local telegram_chat_id="$(get_tmux_option "$tmux_notify_telegram_channel_id" "$tmux_notify_telegram_channel_id_default")"
-  [ -n "$telegram_id" ] && [ -n "$telegram_chat_id" ]
-}
-
-# Send telegram message
-# Usage: send_telegram_message <bot_id> <chat_id> <message>
-send_telegram_message(){
-  curl "https://api.telegram.org/bot$1/sendMessage?chat_id=$2&text=$3" &> /dev/null
-}
diff --git a/scripts/notify.sh b/scripts/notify.sh
index c1a4c74..f5af049 100755
--- a/scripts/notify.sh
+++ b/scripts/notify.sh
@@ -37,11 +37,11 @@ if [[ ! -f "$PID_FILE_PATH" ]]; then  # If pane not yet monitored
   tmux display-message "Monitoring pane..."
   
   # Construct tnotify finish message
-  if verbose_enabled; then  # If @tnotify-verbose is disabled
-    complete_message="Tmux pane task completed!"
-  else  # If @tnotify-verbose is enabled
+  if verbose_enabled; then  # If @tnotify-verbose is enabled
     verbose_msg_value="$(get_tmux_option "$verbose_msg_option" "$verbose_msg_default")"
     complete_message=$(tmux display-message -p "$verbose_msg_value")
+  else  # If @tnotify-verbose is disabled
+    complete_message="Tmux pane task completed!"
   fi
   
   # Create bash suffix list
@@ -68,7 +68,7 @@ if [[ ! -f "$PID_FILE_PATH" ]]; then  # If pane not yet monitored
         tmux select-window -t @"$WINDOW_ID"
         tmux select-pane -t %"$PANE_ID"
       fi
-      notify "$complete_message"
+      notify "$complete_message" $1
       break
     fi
     
diff --git a/scripts/variables.sh b/scripts/variables.sh
index 23c3538..4621fd3 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -31,5 +31,7 @@ export monitor_sleep_duration_default=10
 # Telegram settings
 export tmux_notify_telegram_bot_id="@tnotify-telegram-bot-id"
 export tmux_notify_telegram_channel_id="@tnotify-telegram-channel-id"
+export tmux_notify_telegram_all="@tnotify-telegram-all"
 export tmux_notify_telegram_bot_id_default=""
 export tmux_notify_telegram_channel_id_default=""
+export tmux_notify_telegram_all_default="off"
diff --git a/tnotify.tmux b/tnotify.tmux
index c2a64ad..8674e08 100755
--- a/tnotify.tmux
+++ b/tnotify.tmux
@@ -24,5 +24,6 @@ tmux unbind-key m
 tmux unbind-key M
 tmux unbind-key M-m
 tmux bind-key m run-shell -b "$CURRENT_DIR/scripts/notify.sh"
+tmux bind-key C-M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh true"
 tmux bind-key M run-shell -b "$CURRENT_DIR/scripts/cancel.sh"
 tmux bind-key M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh refocus"

From 27cc104deb7eeb42728245b1b614492b5d5918ef Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 13:44:45 +0200
Subject: [PATCH 7/9] feat: update keybindings

---
 README.md         | 12 ++++++++----
 scripts/notify.sh |  5 +++--
 tnotify.tmux      |  8 ++++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f7c7fdb..8dab8fd 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,10 @@ Use `prefix + I` to install.
 
 `prefix + alt + m`: Start monitoring a pane, return it in focus and notify when it finishes.
 
+`prefix + ctrl + M`: Start monitoring pane and notify in bash and telegram when it finishes.
+
+`prefix + ctrl + alt + M`: Start monitoring a pane, return it in focus and notify in bash and telegram when it finishes.
+
 `prefix + M`: Cancel monitoring of a pane.
 
 ## Pre-requisites
@@ -64,6 +68,10 @@ To change the verbose notification text, put `set -g @tnotify-verbose-msg 'put y
 
 For the full list of aliases and variables you are referred to the `FORMATS` section of the [tmux manual](http://man7.org/linux/man-pages/man1/tmux.1.html).
 
+### Enable telegram channel notifications
+
+To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot. After this, you can use the telegram keybindings in the [usage](#usage) section to start a monitor with telegram channel notifications.
+
 ### Change monitor update period
 
 By default, the monitor sleep period is set to 10 seconds. This means that tmux-notify checks the pane activity every 10 seconds.
@@ -78,10 +86,6 @@ The tmux notify script uses your shell prompt suffix to check whether a command
 
 Feel free to open [a pull](https://github.com/ChanderG/tmux-notify/pulls) request or [issue](https://github.com/ChanderG/tmux-notify/issues) if you think your shell prompt suffix should be included by default.
 
-### Enable telegram channel notifications
-
-To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
-
 ## How does it work
 
 The pretty naive approach. Checks if pane content ends with the bash prompt suffixes mentioned above every 10 seconds.
diff --git a/scripts/notify.sh b/scripts/notify.sh
index f5af049..6254121 100755
--- a/scripts/notify.sh
+++ b/scripts/notify.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Usage: notify <refocus> <telegram>
 ## -- Start monitoring script
 
 # Get current directory
@@ -63,12 +64,12 @@ if [[ ! -f "$PID_FILE_PATH" ]]; then  # If pane not yet monitored
     # if so, break and notify
     if echo "$output" | tail -n2 | grep -e $prompt_suffixes &> /dev/null; then
       # tmux display-message "$@"
-      if [[ "$1" == "refocus" ]]; then
+      if [[ "$1" == "true" ]]; then
         tmux switch -t \$"$SESSION_ID"
         tmux select-window -t @"$WINDOW_ID"
         tmux select-pane -t %"$PANE_ID"
       fi
-      notify "$complete_message" $1
+      notify "$complete_message" $2
       break
     fi
     
diff --git a/tnotify.tmux b/tnotify.tmux
index 8674e08..71a9450 100755
--- a/tnotify.tmux
+++ b/tnotify.tmux
@@ -23,7 +23,11 @@ fi
 tmux unbind-key m
 tmux unbind-key M
 tmux unbind-key M-m
+tmux unbind-key C-m
+tmux unbind-key C-M-m
+
 tmux bind-key m run-shell -b "$CURRENT_DIR/scripts/notify.sh"
-tmux bind-key C-M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh true"
 tmux bind-key M run-shell -b "$CURRENT_DIR/scripts/cancel.sh"
-tmux bind-key M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh refocus"
+tmux bind-key M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh true"
+tmux bind-key C-m run-shell -b "$CURRENT_DIR/scripts/notify.sh false true"
+tmux bind-key C-M-m run-shell -b "$CURRENT_DIR/scripts/notify.sh true true"

From b4683c208d52d1c7d0332bb7bb52a5d1a2607fdb Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 14:07:18 +0200
Subject: [PATCH 8/9] refactor: update docstrings

---
 scripts/variables.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/variables.sh b/scripts/variables.sh
index 4621fd3..a3ca2e7 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -28,7 +28,7 @@ export verbose_msg_default="(#S, #I:#P:#W) Tmux pane task completed!"
 export monitor_sleep_duration="@tnotify-sleep-duration"
 export monitor_sleep_duration_default=10
 
-# Telegram settings
+# Telegram notification settings
 export tmux_notify_telegram_bot_id="@tnotify-telegram-bot-id"
 export tmux_notify_telegram_channel_id="@tnotify-telegram-channel-id"
 export tmux_notify_telegram_all="@tnotify-telegram-all"

From 4132eec624315b37a0babb76c01b928f86f2db1b Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Sat, 3 Jun 2023 14:32:52 +0200
Subject: [PATCH 9/9] docs: improve documentation

---
 README.md            | 42 ++++++++++++++++++++++++------------------
 scripts/variables.sh |  2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 8dab8fd..e74310b 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@
 
 Tmux plugin to notify you when processes are complete.
 
-Notification is via libnotify and visual bell raised in the tmux window. Visual bells can be mapped (in the terminal level) to X11 urgency bit and handled by your window manager.
+Notifications are done via libnotify, and visual bells are raised in the tmux window. Visual bells can be mapped (in the terminal level) to X11 urgency bit and handled by your window manager.
 
 ## Use cases
 
 - When you have already started a process in a pane and wish to be notified, that is when you can't use a manual trigger.
-- Working in different containers (Docker) -> can't choose the shell -> and can't use a shell level feature
-- Working over ssh, but your tmux is on the client-side
+- Working in different containers (Docker) -> can't choose the shell -> and can't use a shell-level feature
+- Working over ssh, but your Tmux is on the client-side
 
 ## Install
 
@@ -28,15 +28,11 @@ Use `prefix + I` to install.
 
 ## Usage
 
-`prefix + m`: Start monitoring a pane and notify when it finishes.
+- `prefix + m`: Start monitoring a pane and notify when it finishes.
 
-`prefix + alt + m`: Start monitoring a pane, return it in focus and notify when it finishes.
+- `prefix + alt + m`: Start monitoring a pane, return it in focus and notify when it finishes.
 
-`prefix + ctrl + M`: Start monitoring pane and notify in bash and telegram when it finishes.
-
-`prefix + ctrl + alt + M`: Start monitoring a pane, return it in focus and notify in bash and telegram when it finishes.
-
-`prefix + M`: Cancel monitoring of a pane.
+- `prefix + M`: Cancel monitoring of a pane.
 
 ## Pre-requisites
 
@@ -51,13 +47,13 @@ Use `prefix + I` to install.
 
 ### Enable verbose notification
 
-By default, the notification text is set to `Tmux pane task completed!`. We have also included a verbose output option. When enabled, information about the pane, window, and session the task has completed is given.
+The notification text is defaulted to `Tmux pane task completed!`. We have also included a verbose output option. Information about the pane, window, and session the task has completed is given when enabled.
 
-Put `set -g @tnotify-verbose 'on'` in the `.tmux.conf` config file to enable this.
+To enable this, put `set -g @tnotify-verbose 'on'` in the `.tmux.conf` config file.
 
 #### Change the verbose notification message
 
-To change the verbose notification text, put `set -g @tnotify-verbose-msg 'put your notification text here'` in the `.tmux.conf` config file. You can use all the tmux variables in your notification text. Some useful tmux aliases are:
+To change the verbose notification text, put `set -g @tnotify-verbose-msg 'put your notification text here'` in the `.tmux.conf` config file. You can use all the Tmux variables in your notification text. Some useful Tmux aliases are:
 
 - `#D`: Pane id
 - `#P`: Pane index
@@ -66,23 +62,33 @@ To change the verbose notification text, put `set -g @tnotify-verbose-msg 'put y
 - `#I`: Window index
 - `#W`: Window name
 
-For the full list of aliases and variables you are referred to the `FORMATS` section of the [tmux manual](http://man7.org/linux/man-pages/man1/tmux.1.html).
+For the complete list of aliases and variables, you are referred to the `FORMATS` section of the [tmux manual](http://man7.org/linux/man-pages/man1/tmux.1.html).
 
 ### Enable telegram channel notifications
 
-To enable telegram channel notifications, put `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file. You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot. After this, you can use the telegram keybindings in the [usage](#usage) section to start a monitor with telegram channel notifications.
+By default, the notification is only sent to the operating system. We have also included a telegram channel notification option. When enabled, a notification is sent to a user-specified telegram channel.
+
+Put both `set -g @tnotify-telegram-bot-id 'your telegram bot id'` and `set -g @tnotify-telegram-channel-id 'your channel id'` in the `.tmux.conf` config file to enable this. Additionally, you can use the `set -g @tnotify-telegram-all 'on'` option to send all notifications to telegram. After enabling this option, the following key bindings are available:
+
+- `prefix + ctrl + M`: Start monitoring pane and notify in bash and telegram when it finishes.
+
+- `prefix + ctrl + alt + M`: Start monitoring a pane, return it in focus and notify in bash and telegram when it finishes.
+
+> **Note**
+> You can get your telegram bot id by creating a bot using [BotFather](https://core.telegram.org/bots#6-botfather) and your channel id by sending your channel invite link to the `@username_to_id_bot` bot.
 
 ### Change monitor update period
 
 By default, the monitor sleep period is set to 10 seconds. This means that tmux-notify checks the pane activity every 10 seconds.
 
-Put `set -g @tnotify-sleep-duration 'desired duration" in the`.tmux.conf\` file to change this duration.
+Put `set -g @tnotify-sleep-duration 'desired duration'` in the `.tmux.conf` file to change this duration.
 
-**NOTE:** Keep in mind that there is a trade-off between notification speed (short sleep duration) and the amount of memory this tool needs.
+> **Warning**
+> Remember that there is a trade-off between notification speed (short sleep duration) and the amount of memory this tool needs.
 
 ### Add additional shell suffixes
 
-The tmux notify script uses your shell prompt suffix to check whether a command has finished. It looks for the `$`, `#` and `%` suffixes by default. If you customise your shell to use different shell suffixes, you can add them by putting `set -g @tnotify-prompt-suffixes 'put your comma-separated bash suffix list here'` in the`.tmux.conf` file.
+The Tmux notify script uses your shell prompt suffix to check whether a command has finished. By default, it looks for the `$`, `#` and `%` suffixes. If you customise your shell to use different shell suffixes, you can add them by putting `set -g @tnotify-prompt-suffixes 'put your comma-separated bash suffix list here'` in the `.tmux.conf` file.
 
 Feel free to open [a pull](https://github.com/ChanderG/tmux-notify/pulls) request or [issue](https://github.com/ChanderG/tmux-notify/issues) if you think your shell prompt suffix should be included by default.
 
diff --git a/scripts/variables.sh b/scripts/variables.sh
index a3ca2e7..1c5f3a5 100644
--- a/scripts/variables.sh
+++ b/scripts/variables.sh
@@ -22,7 +22,7 @@ export prompt_suffixes_default="$,#,%"
 export verbose_option="@tnotify-verbose"
 export verbose_default="off"
 export verbose_msg_option="@tnotify-verbose-msg"
-export verbose_msg_default="(#S, #I:#P:#W) Tmux pane task completed!"
+export verbose_msg_default="(#S, #I:#P) Tmux pane task completed!"
 
 # Monitor checker interval
 export monitor_sleep_duration="@tnotify-sleep-duration"