diff --git a/src/bots/approved_bot/modules/search/mod.rs b/src/bots/approved_bot/modules/search/mod.rs index f78de84..4eaad3c 100644 --- a/src/bots/approved_bot/modules/search/mod.rs +++ b/src/bots/approved_bot/modules/search/mod.rs @@ -1,4 +1,5 @@ pub mod callback_data; +pub mod utils; use core::fmt::Debug; use smartstring::alias::String as SmartString; @@ -23,27 +24,11 @@ use crate::bots::{ BotHandlerInternal, }; -use self::callback_data::SearchCallbackData; +use self::{callback_data::SearchCallbackData, utils::get_query}; use super::utils::generic_get_pagination_keyboard; -fn get_query(cq: CallbackQuery) -> Option { - cq.message - .map(|message| { - message - .reply_to_message() - .map(|reply_to_message| { - reply_to_message - .text() - .map(|text| text.replace(['/', '&', '?'], "")) - }) - .unwrap_or(None) - }) - .unwrap_or(None) -} - - async fn generic_search_pagination_handler( cq: CallbackQuery, bot: CacheMe>, diff --git a/src/bots/approved_bot/modules/search/utils.rs b/src/bots/approved_bot/modules/search/utils.rs new file mode 100644 index 0000000..a97362f --- /dev/null +++ b/src/bots/approved_bot/modules/search/utils.rs @@ -0,0 +1,17 @@ +use teloxide::types::CallbackQuery; + + +pub fn get_query(cq: CallbackQuery) -> Option { + cq.message + .map(|message| { + message + .reply_to_message() + .map(|reply_to_message| { + reply_to_message + .text() + .map(|text| text.replace(['/', '&', '?'], "")) + }) + .unwrap_or(None) + }) + .unwrap_or(None) +}