Add 1KV online/offline notification setting to the Telegram bot setti…

…ngs menu. Correct the 1KV online status change notification generator logic.
helikon-labs · Apr 29, 2022 · 6599d52 · 6599d52
1 parent 22c743c
commit 6599d52
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 4 deletions.
diff --git a/_template/email/chain_validator_offline_offence.html b/_template/email/chain_validator_offline_offence.html
@@ -1,4 +1,4 @@
 <strong>{{ validator_display }}</strong>
 🆘 was found to be <strong>offline</strong> at the end of the session{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}!
-This is going to cause the involuntary chilling of the validator.
+This is going to cause the involuntary chilling of the validator if it hasn't been chilled already.
 You may view the corresponding on-chain event <a href="https://{{ chain }}.subscan.io/block/{{ block_hash }}?tab=event">here</a>.
diff --git a/_template/push_notification/chain_validator_offline_offence.txt b/_template/push_notification/chain_validator_offline_offence.txt
@@ -1,3 +1,3 @@
 {{ validator_display }}
 🆘 was found to be offline at the end of the session{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}!
-This is going to cause the involuntary chilling of the validator.
+This is going to cause the involuntary chilling of the validator if it hasn't been chilled already.
diff --git a/_template/telegram/chain_validator_offline_offence.html b/_template/telegram/chain_validator_offline_offence.html
@@ -1,4 +1,4 @@
 <strong>{{ validator_display }}</strong>
 🆘 was found to be <strong>offline</strong> at the end of the session{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}!
-This is going to cause the involuntary chilling of the validator.
+This is going to cause the involuntary chilling of the validator if it hasn't been chilled already.
 You may view the corresponding on-chain event <a href="https://{{ chain }}.subscan.io/block/{{ block_hash }}?tab=event">here</a>.
diff --git a/_template/telegram/dialog/settings_item_onekv_online_status_change.html b/_template/telegram/dialog/settings_item_onekv_online_status_change.html
@@ -0,0 +1 @@
+{% if is_on %}🟢{% else %}⚪️{% endif %} Online / Offline
diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs
@@ -35,7 +35,8 @@ impl NotificationGenerator {
                 ),
                 _ => return Ok(()),
             };
-        if current_online_since != last_online_since || current_offline_since != last_offline_since
+        if (current_online_since > 0 && last_online_since == 0)
+            || (current_offline_since > 0 && last_offline_since == 0)
         {
             log::debug!(
                 "1KV online status (online_since, offline_since) of {} changed from {:?} to {:?}.",

diff --git a/subvt-telegram-bot/src/messenger/keyboard/settings/onekv.rs b/subvt-telegram-bot/src/messenger/keyboard/settings/onekv.rs
@@ -26,6 +26,14 @@ impl Messenger {
         )? {
             rows.push(item);
         }
+        if let Some(item) = self.get_notification_on_off_button(
+            NotificationTypeCode::OneKVValidatorOnlineStatusChange,
+            "settings_item_onekv_online_status_change.html",
+            SettingsEditQueryType::OneKVOnlineStatusChange,
+            notification_rules,
+        )? {
+            rows.push(item);
+        }
         if let Some(item) = self.get_notification_on_off_button(
             NotificationTypeCode::OneKVValidatorRankChange,
             "settings_item_onekv_rank_change.html",

diff --git a/subvt-telegram-bot/src/query/mod.rs b/subvt-telegram-bot/src/query/mod.rs
@@ -125,4 +125,6 @@ pub enum SettingsEditQueryType {
     OneKVValidityChange,
     #[serde(rename = "OKVL")]
     OneKVLocationChange,
+    #[serde(rename = "OKVO")]
+    OneKVOnlineStatusChange,
 }
diff --git a/subvt-telegram-bot/src/query/process/settings.rs b/subvt-telegram-bot/src/query/process/settings.rs
@@ -318,6 +318,15 @@ impl TelegramBot {
                 .await?;
                 SettingsSubSection::OneKV
             }
+            SettingsEditQueryType::OneKVOnlineStatusChange => {
+                self.process_notification_on_off_setting_query(
+                    user_id,
+                    query,
+                    NotificationTypeCode::OneKVValidatorOnlineStatusChange,
+                )
+                .await?;
+                SettingsSubSection::OneKV
+            }
         };
         let notification_rules = self
             .app_postgres
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{% if is_on %}🟢{% else %}⚪️{% endif %} Online / Offline