support topics (#310)

* support topics resolves #304 * big refactoring * save thread_id * fix most tests * fix remaining tests * update deps * fix test
ayrat555 · Feb 18, 2023 · 3d97657 · 3d97657
1 parent fc93c66
commit 3d97657
Show file tree

Hide file tree

Showing 23 changed files with 417 additions and 555 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/migrations/2023-02-18-045257_add_thread_id_to_subscriptions/down.sql b/migrations/2023-02-18-045257_add_thread_id_to_subscriptions/down.sql
@@ -0,0 +1 @@
+ALTER TABLE telegram_subscriptions DROP COLUMN thread_id;
diff --git a/migrations/2023-02-18-045257_add_thread_id_to_subscriptions/up.sql b/migrations/2023-02-18-045257_add_thread_id_to_subscriptions/up.sql
@@ -0,0 +1 @@
+ALTER TABLE telegram_subscriptions ADD COLUMN thread_id integer;
diff --git a/src/bot/commands.rs b/src/bot/commands.rs
@@ -324,6 +324,7 @@ pub trait Command {
         let message_params = SimpleMessageParams::builder()
             .message(text)
             .chat_id(message.chat.id)
+            .message_thread_id(message.message_thread_id)
             .build();
 
         if let Err(error) = self.api().reply_with_text_message(&message_params) {
@@ -359,7 +360,7 @@ pub trait Command {
         self.api().remove_message(message)
     }
 
-    fn simple_keyboard(&self, message: String, back_command: String, chat_id: i64) -> Response {
+    fn simple_keyboard(&self, text: String, back_command: String, message: &Message) -> Response {
         let mut buttons: Vec<Vec<InlineKeyboardButton>> = Vec::new();
         let mut row: Vec<InlineKeyboardButton> = Vec::new();
 
@@ -376,13 +377,15 @@ pub trait Command {
             .inline_keyboard(buttons)
             .build();
 
-        let params = SendMessageParams::builder()
-            .chat_id(chat_id)
+        let mut params = SendMessageParams::builder()
+            .chat_id(message.chat.id)
             .disable_web_page_preview(true)
-            .text(message)
+            .text(text)
             .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
             .build();
 
+        params.message_thread_id = message.message_thread_id;
+
         Response::Params(params)
     }
 
@@ -441,7 +444,10 @@ pub trait Command {
         chat_id: i64,
         feed_id: i64,
     ) -> Option<TelegramSubscription> {
-        let telegram_subscription = NewTelegramSubscription { chat_id, feed_id };
+        let telegram_subscription = NewTelegramSubscription::builder()
+            .chat_id(chat_id)
+            .feed_id(feed_id)
+            .build();
 
         telegram::find_subscription(db_connection, telegram_subscription)
     }

diff --git a/src/bot/commands/commands_keyboard.rs b/src/bot/commands/commands_keyboard.rs
@@ -91,11 +91,15 @@ impl CommandsKeyboard {
             .inline_keyboard(buttons)
             .build();
 
-        SendMessageParams::builder()
+        let mut params = SendMessageParams::builder()
             .chat_id(self.message.chat.id)
             .text("Select a command")
             .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
-            .build()
+            .build();
+
+        params.message_thread_id = self.message.message_thread_id;
+
+        params
     }
 }
 

diff --git a/src/bot/commands/get_filter.rs b/src/bot/commands/get_filter.rs
@@ -40,7 +40,7 @@ impl GetFilter {
                     ShowFeedKeyboard::command(),
                     subscription.external_id
                 ),
-                self.message.chat.id,
+                &self.message,
             )
         } else {
             Response::Simple(response)

diff --git a/src/bot/commands/get_template.rs b/src/bot/commands/get_template.rs
@@ -46,7 +46,7 @@ impl Command for GetTemplate {
             self.simple_keyboard(
                 response,
                 format!("{} {}", ShowFeedKeyboard::command(), self.args),
-                self.message.chat.id,
+                &self.message,
             )
         } else {
             Response::Simple(response)

diff --git a/src/bot/commands/help.rs b/src/bot/commands/help.rs
@@ -202,12 +202,16 @@ impl Help {
             .inline_keyboard(buttons)
             .build();
 
-        SendMessageParams::builder()
+        let mut params = SendMessageParams::builder()
             .chat_id(self.message.chat.id)
             .text("In private chats use keyboards to interact with the bot. Send /commands to display the keyboard. \n\nIn channels and groups you will have to type commands directly.\n\nJoin https://t.me/el_monitorro with your feedback, suggestions, found bugs, etc.\n\nSelect a command:")
             .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
             .disable_web_page_preview(true)
-            .build()
+            .build();
+
+        params.message_thread_id = self.message.message_thread_id;
+
+        params
     }
 
     pub fn button_row() -> Vec<InlineKeyboardButton> {

diff --git a/src/bot/commands/help_command_info.rs b/src/bot/commands/help_command_info.rs
@@ -104,11 +104,7 @@ impl Command for HelpCommandInfo {
     fn response(&self) -> Response {
         let help_for_command = self.command_info();
 
-        self.simple_keyboard(
-            help_for_command,
-            Help::command().to_string(),
-            self.message.chat.id,
-        )
+        self.simple_keyboard(help_for_command, Help::command().to_string(), &self.message)
     }
 
     fn send_message(&self, send_message_params: SendMessageParams) {

diff --git a/src/bot/commands/list_subscriptions_keyboard.rs b/src/bot/commands/list_subscriptions_keyboard.rs
@@ -66,11 +66,15 @@ impl ListSubscriptionsKeyboard {
             .inline_keyboard(buttons)
             .build();
 
-        SendMessageParams::builder()
+        let mut params = SendMessageParams::builder()
             .chat_id(self.message.chat.id)
             .text(message)
             .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
-            .build()
+            .build();
+
+        params.message_thread_id = self.message.message_thread_id;
+
+        params
     }
 
     pub fn command() -> &'static str {

diff --git a/src/bot/commands/remove_filter.rs b/src/bot/commands/remove_filter.rs
@@ -50,7 +50,7 @@ impl Command for RemoveFilter {
             self.simple_keyboard(
                 response,
                 format!("{} {}", ShowFeedKeyboard::command(), self.args),
-                self.message.chat.id,
+                &self.message,
             )
         } else {
             Response::Simple(response)

diff --git a/src/bot/commands/remove_template.rs b/src/bot/commands/remove_template.rs
@@ -50,7 +50,7 @@ impl Command for RemoveTemplate {
             self.simple_keyboard(
                 response,
                 format!("{} {}", ShowFeedKeyboard::command(), self.args),
-                self.message.chat.id,
+                &self.message,
             )
         } else {
             Response::Simple(response)

diff --git a/src/bot/commands/show_feed_keyboard.rs b/src/bot/commands/show_feed_keyboard.rs
@@ -117,11 +117,15 @@ impl ShowFeedKeyboard {
             .inline_keyboard(buttons)
             .build();
 
-        SendMessageParams::builder()
+        let mut params = SendMessageParams::builder()
             .chat_id(self.message.chat.id)
             .text(feed.link)
             .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
-            .build()
+            .build();
+
+        params.message_thread_id = self.message.message_thread_id;
+
+        params
     }
 }
 

diff --git a/src/bot/commands/subscribe.rs b/src/bot/commands/subscribe.rs
@@ -72,10 +72,11 @@ impl Subscribe {
                 telegram::create_chat(db_connection, (*self.message.chat.clone()).into()).unwrap();
             let feed = feeds::create(db_connection, &self.args, feed_type).unwrap();
 
-            let new_telegram_subscription = NewTelegramSubscription {
-                chat_id: chat.id,
-                feed_id: feed.id,
-            };
+            let new_telegram_subscription = NewTelegramSubscription::builder()
+                .chat_id(chat.id)
+                .feed_id(feed.id)
+                .thread_id(self.message.message_thread_id)
+                .build();
 
             self.check_if_subscription_exists(db_connection, new_telegram_subscription)?;
             self.check_number_of_subscriptions(db_connection, chat.id)?;

diff --git a/src/bot/commands/unknown_command.rs b/src/bot/commands/unknown_command.rs
@@ -59,13 +59,15 @@ impl Command for UnknownCommand {
                 .inline_keyboard(buttons)
                 .build();
 
-            let params = SendMessageParams::builder()
+            let mut params = SendMessageParams::builder()
                 .chat_id(self.message.chat.id)
                 .text(text)
                 .reply_markup(ReplyMarkup::InlineKeyboardMarkup(keyboard))
                 .reply_to_message_id(message.message_id)
                 .build();
 
+            params.message_thread_id = message.message_thread_id;
+
             self.send_message(params)
         }
     }

diff --git a/src/bot/commands/unsubscribe.rs b/src/bot/commands/unsubscribe.rs
@@ -51,10 +51,10 @@ impl Unsubscribe {
 
         let feed = feeds::find(db_connection, subscription.feed_id).unwrap();
 
-        let telegram_subscription = NewTelegramSubscription {
-            chat_id: self.message.chat.id,
-            feed_id: feed.id,
-        };
+        let telegram_subscription = NewTelegramSubscription::builder()
+            .chat_id(self.message.chat.id)
+            .feed_id(feed.id)
+            .build();
 
         match telegram::remove_subscription(db_connection, telegram_subscription) {
             Ok(_) => Ok(feed.link),
@@ -78,7 +78,7 @@ impl Command for Unsubscribe {
             self.simple_keyboard(
                 response,
                 ListSubscriptionsKeyboard::command().to_string(),
-                self.message.chat.id,
+                &self.message,
             )
         } else {
             Response::Simple(response)
@@ -120,10 +120,10 @@ mod unsubscribe_tests {
             let chat = telegram::create_chat(connection, new_chat).unwrap();
             let feed = feeds::create(connection, &link, "rss".to_string()).unwrap();
 
-            let new_subscription = NewTelegramSubscription {
-                feed_id: feed.id,
-                chat_id: chat.id,
-            };
+            let new_subscription = NewTelegramSubscription::builder()
+                .chat_id(chat.id)
+                .feed_id(feed.id)
+                .build();
 
             telegram::create_subscription(connection, new_subscription).unwrap();
 

diff --git a/src/bot/telegram_client.rs b/src/bot/telegram_client.rs
@@ -62,6 +62,8 @@ pub struct SimpleMessageParams {
     reply_message_id: Option<i32>,
     #[builder(default = false)]
     preview_enabled: bool,
+    #[builder(default, setter(into))]
+    message_thread_id: Option<i32>,
 }
 
 impl Api {
@@ -116,19 +118,17 @@ impl Api {
         &self,
         simple_params: &SimpleMessageParams,
     ) -> Result<(), Error> {
-        let message_params = SendMessageParams::builder()
+        let mut message_params = SendMessageParams::builder()
             .chat_id(simple_params.chat_id)
             .text(simple_params.message.clone())
             .disable_web_page_preview(!simple_params.preview_enabled)
-            .parse_mode(ParseMode::Html);
-
-        let send_message_params = match simple_params.reply_message_id {
-            None => message_params.build(),
+            .parse_mode(ParseMode::Html)
+            .build();
 
-            Some(message_id_value) => message_params.reply_to_message_id(message_id_value).build(),
-        };
+        message_params.reply_to_message_id = simple_params.reply_message_id;
+        message_params.message_thread_id = simple_params.message_thread_id;
 
-        self.send_message_with_params(&send_message_params)
+        self.send_message_with_params(&message_params)
     }
 
     pub fn send_message_with_params(

diff --git a/src/db/feeds.rs b/src/db/feeds.rs
@@ -792,10 +792,10 @@ mod tests {
         };
         let chat = telegram::create_chat(connection, new_chat).unwrap();
 
-        let new_subscription = NewTelegramSubscription {
-            feed_id: feed.id,
-            chat_id: chat.id,
-        };
+        let new_subscription = NewTelegramSubscription::builder()
+            .chat_id(chat.id)
+            .feed_id(feed.id)
+            .build();
 
         telegram::create_subscription(connection, new_subscription).unwrap()
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE telegram_subscriptions DROP COLUMN thread_id;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE telegram_subscriptions ADD COLUMN thread_id integer;