Bump many libs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "desubot"
-version = "0.5.3"
+version = "0.5.5"
 authors = ["AB <ab@hexor.ru>"]
 edition = "2018"
 
@@ -8,23 +8,23 @@ edition = "2018"
 
 [dependencies]
 bytes = "0.5"
-tokio = { version = "0.2", features = ["full"]}
+tokio = { version = "1.10.0", features = ["full"]}
 tracing = "0.1.9"
 tracing-futures = "0.2"
 multipart = { version = "0.16", default-features = false, features = ["client"] }
 telegram-bot = "0.8.0"
 silicon = "0.4.0"
-hyper = "0.13"
+hyper = "0.14"
 hyper-tls = { version = "0.4", optional = true  }
 futures = "0.3"
 hyper-rustls = { version = "0.19", optional = true }
 rusqlite = { version = "0.24.2", features = ["bundled"]}
 html-escape = "0.2"
 regex = "1"
-reqwest = "0.10.9"
+reqwest = "0.11.4"
 uuid = { version = "0.8", features = ["v4"] }
 sha1 = "0.6.0"
-env_logger = "0.7"
+env_logger = "0.9.0"
 log = { version = "^0.4.5", features = ["std"] }
 subprocess = "0.2.6"
 serde_json = "1.0"
@@ -33,7 +33,7 @@ rand = "0.7.3"
 mystem = "^0.2"
 #mystem = { path = "../mystem-rs" }
 async-trait = "0.1.42"
-sqlparser = "0.7.0"
+sqlparser = "0.9.0"
 
 [dependencies.syntect]
 version = "4.4"

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()).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

@@ -180,18 +180,29 @@ pub(crate) async fn get_messages_user_all(
     Ok(messages)
 }
 
-pub(crate) fn get_members(id: telegram_bot::ChatId) -> Result<Vec<telegram_bot::User>> {
+pub(crate) fn get_members(id: telegram_bot::ChatId, limit: u32) -> Result<Vec<telegram_bot::User>> {
+    let where_statement = if limit > 0 {
+        format!("and days_seen <= {}", limit)
+    } else {
+        "".into()
+    };
+    debug!("{}", where_statement);
     let conn = open()?;
-    let mut stmt = conn.prepare_cached(
+    let mut stmt = conn.prepare_cached(&format!(
         "
-        SELECT DISTINCT(u.username), u.id, u.first_name, u.last_name, u.date
+        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
         JOIN user u
         ON u.id = r.user_id
         LEFT JOIN conf c
         ON r.conf_id = c.id
-        WHERE c.id = :id",
+        WHERE c.id = :id
-    )?;
+        {}
+        GROUP BY u.id
+        ORDER BY r.date DESC",
+        where_statement
+    ))?;
     let mut rows = stmt.query_named(&[(":id", &id.to_string())])?;
     let mut users = Vec::new();
 
@@ -283,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()
@@ -417,6 +432,7 @@ pub(crate) async fn add_sentence(
         };
 
     // Save stemmed words
+    debug!("Going to stem: {}", text);
     let words = mystem.stemming(text)?;
     conn.execute("BEGIN TRANSACTION", params![]);
     for word in words {

src/handlers.rs

@@ -53,7 +53,7 @@ pub async fn handler(
                         }
                     }
                 }
-                s if s.contains("/here") || s.contains("@here") => {
+                s if s.contains("/here") || s.contains("@here") || s.contains("/хере") || s.contains("@хере") || s.contains("\"хере") => {
                     db::add_sentence(&message, mystem).await?;
                     Here {
                         data: "".to_string(),
@@ -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, .. } => {

src/main.rs

@@ -1,3 +1,4 @@
+#![allow(unreachable_code)]
 use std::{env, process};
 
 use futures::StreamExt;
@@ -16,7 +17,7 @@ use mystem::MyStem;
 
 #[tokio::main]
 async fn main() -> Result<(), errors::Error> {
-    env_logger::from_env(Env::default().default_filter_or("info")).init();
+    env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
     let mut mystem = match MyStem::new() {
         Ok(mystem) => mystem,
         Err(e) => {
@@ -44,16 +45,18 @@ async fn main() -> Result<(), errors::Error> {
         me.first_name,
         me.id
     );
-    while let Some(update) = stream.next().await {
+    loop {
-        let update = update?;
+        while let Some(update) = stream.next().await {
-        if let UpdateKind::Message(message) = update.kind {
+            let update = update?;
-            db::add_conf(message.clone()).await?;
+            if let UpdateKind::Message(message) = update.kind {
-            db::add_user(message.clone()).await?;
+                db::add_conf(message.clone()).await?;
-            match handlers::handler(api.clone(), message, token.clone(), &mut mystem, me.clone())
+                db::add_user(message.clone()).await?;
-                .await
+                match handlers::handler(api.clone(), message, token.clone(), &mut mystem, me.clone())
-            {
+                    .await
-                Ok(_) => {}
+                {
-                Err(e) => warn!("An error occurred handling command. {:?}", e),
+                    Ok(_) => {}
+                    Err(e) => warn!("An error occurred handling command. {:?}", e),
+                }
             }
         }
     }