Add handler in case of error in here command.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "desubot"
-version = "0.5.4"
+version = "0.5.5"
 authors = ["AB <ab@hexor.ru>"]
 edition = "2018"
 
@@ -38,4 +38,4 @@ sqlparser = "0.7.0"
 [dependencies.syntect]
 version = "4.4"
 default-features = false
-features = ["parsing", "dump-load", "regex-onig"]
+features = ["parsing", "dump-load", "regex-onig"]

src/commands.rs

@@ -21,7 +21,7 @@ use syntect::highlighting::Theme;
 use syntect::parsing::SyntaxReference;
 use syntect::util::LinesWithEndings;
 use telegram_bot::prelude::*;
-use telegram_bot::{Api, Message, ParseMode};
+use telegram_bot::{Api, Message, ParseMode, UserId};
 
 include!("../assets/help_text.rs");
 
@@ -69,7 +69,7 @@ impl Execute for Sql {
         let mut sql = self.data.clone();
         debug!("PIZDA - {}", sql);
         if sql == "/sql" || sql == "/sql-" {
-            return Ok(SQL_HELP.to_string())
+            return Ok(SQL_HELP.to_string());
         }
         let is_head = if sql.starts_with('-') {
             sql = sql.replacen("-", "", 1);
@@ -192,7 +192,15 @@ impl Execute for Sql {
 #[async_trait]
 impl Execute for Here {
     async fn exec(&self, api: &Api, message: &Message) -> Result<(), Error> {
-        let members: Vec<telegram_bot::User> = db::get_members(message.chat.id(), 60).unwrap();
+        let members: Vec<telegram_bot::User> =
+            db::get_members(message.chat.id(), 60).unwrap_or(vec![telegram_bot::User {
+                id: UserId::new(124317807),
+                first_name: "Ultradesu".to_string(),
+                last_name: None,
+                username: None,
+                is_bot: false,
+                language_code: None,
+            }]);
         for u in &members {
             debug!("Found user {:?} in chat {}", u, message.chat.id());
         }

src/db.rs

@@ -188,8 +188,8 @@ pub(crate) fn get_members(id: telegram_bot::ChatId, limit: u32) -> Result<Vec<te
     };
     debug!("{}", where_statement);
     let conn = open()?;
-    let mut stmt = conn.prepare_cached(
-        &format!("
+    let mut stmt = conn.prepare_cached(&format!(
+        "
         SELECT DISTINCT(u.username), u.id, u.first_name, u.last_name, u.date,
         (strftime('%s','now')-r.date)/60/60/24 as days_seen
         FROM relations r
@@ -200,8 +200,9 @@ pub(crate) fn get_members(id: telegram_bot::ChatId, limit: u32) -> Result<Vec<te
         WHERE c.id = :id
         {}
         GROUP BY u.id
-        ORDER BY r.date DESC", where_statement),
-    )?;
+        ORDER BY r.date DESC",
+        where_statement
+    ))?;
     let mut rows = stmt.query_named(&[(":id", &id.to_string())])?;
     let mut users = Vec::new();
 
@@ -293,7 +294,11 @@ pub(crate) async fn add_user(message: Message) -> Result<(), Error> {
                 (":first_name", &update.first_name),
                 (":last_name", &update.last_name),
             ])?;
-            debug!("User {} updated: {:?}", update.first_name, get_user(update.id));
+            debug!(
+                "User {} updated: {:?}",
+                update.first_name,
+                get_user(update.id)
+            );
         }
         Err(_) => {
             let unix_time = SystemTime::now()

src/handlers.rs

@@ -118,9 +118,7 @@ pub async fn handler(
                     .exec_mystem(&api, &message, mystem)
                     .await?
                 }
-                _ => {
-                    db::add_sentence(&message, mystem).await?
-                }
+                _ => db::add_sentence(&message, mystem).await?,
             }
         }
         MessageKind::Photo { ref caption, .. } => {