Merge pull request #6 from MihailPreis/feature/use_default_words_if_no_db

use default words for message if words for db are not found in message

Author: chanramen

src/bots/tg.rs

@@ -115,7 +115,7 @@ async fn get_custom_words_from_db(chat_id: i64) -> Option<String> {
 }
 
 async fn handle_message<'a>(bot: &Bot, message: &Message) -> Result<(), HandlerError> {
-    let user = match message.from() {
+    let user = match &message.from {
         None => return Ok(()),
         Some(user) => user,
     };
@@ -189,7 +189,7 @@ async fn handle_message<'a>(bot: &Bot, message: &Message) -> Result<(), HandlerE
                 if let Some(custom_words) =
                     get_custom_words_from_db(message.chat.id.clone().0).await
                 {
-                    let _words = contains_in(custom_words, String::from(data));
+                    let _words = contains_in(custom_words, data);
                     if !_words.is_empty() {
                         if let Ok(content) = db_conn
                             .get_random_content(message.chat.id.0, true, _words)
@@ -217,7 +217,7 @@ async fn handle_message<'a>(bot: &Bot, message: &Message) -> Result<(), HandlerE
                 if let Some(custom_words) =
                     get_custom_words_from_db(message.chat.id.clone().0).await
                 {
-                    let _words = contains_in(custom_words, String::from(data));
+                    let _words = contains_in(custom_words, data);
                     if !_words.is_empty() {
                         if let Ok(content) = db_conn
                             .get_random_content(message.chat.id.0, false, _words)
@@ -551,7 +551,7 @@ impl Locale {
     /// Return: localized string or key
     fn get_tg(&self, key: &str, msg: &Message) -> String {
         let lang = &msg
-            .from()
+            .from.clone()
             .and_then(|u| u.language_code.clone())
             .unwrap_or(String::from("en"));
         self.get(&*format!("tg_{}", key), lang.as_str())

src/engine/engine.rs

@@ -70,12 +70,10 @@ pub async fn build_message(
     audio_handler: impl Future<Output = Option<Vec<u8>>>,
 ) -> Result<VData, HandlerError> {
     let message: &str;
-    if let Some(words) = custom_words {
-        info!("Found trigger words in DB: {:?}", words);
-        let words = contains_in(words, String::from(res));
-        if words.is_empty() {
-            return Err(HandlerError::empty());
-        }
+    let found_custom_words = custom_words.inspect(|words| info!("Found trigger words in DB: {:?}", words))
+        .map(|words| contains_in(words, res))
+        .and_then(|words| if words.is_empty() { None } else { Some(words) });
+    if let Some(words) = found_custom_words {
         info!("Trigger words: {:?}", words);
         message = res;
     } else if !TRIGGER_WORDS.is_empty() {

src/models/text_size_box.rs

@@ -17,7 +17,7 @@ impl TextSizeBox {
     /// Return: TextSizeBox instance
     pub fn from<T : Font>(text: &str, font: T, scale: PxScale) -> Self {
         let scaled_font = font.as_scaled(scale);
-        let mut w = 0f32;
+        let w = 0f32;
         let mut last: Option<GlyphId> = None;
         text.chars().map(|char| {
             let glyph_id = scaled_font.glyph_id(char);

src/utils/string_utils.rs

@@ -50,7 +50,7 @@ fn truncated(s: String, max_ln: usize) -> String {
 ///  - message: message
 ///
 /// Return: contains trigger words in vector
-pub fn contains_in(words: String, message: String) -> Vec<String> {
+pub fn contains_in(words: String, message: &str) -> Vec<String> {
     let l_msg = message.to_lowercase();
     words
         .to_lowercase()