Bump

code

.github/workflows/automerge.yml

@@ -0,0 +1,27 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.13.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

Cargo.toml

@@ -1,40 +1,41 @@
-[package]
-name = "desubot"
-version = "0.5.0"
-authors = ["AB <ab@hexor.ru>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bytes = "0.5"
-tokio = { version = "0.2", 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-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"
-uuid = { version = "0.8", features = ["v4"] }
-sha1 = "0.6.0"
-env_logger = "0.7"
-log = { version = "^0.4.5", features = ["std"] }
-subprocess = "0.2.6"
-serde_json = "1.0"
-markov = "1.1.0"
-rand = "0.7.3"
-mystem = "0.2.1"
-async-trait = "0.1.42"
-sqlparser = "0.7.0"
-
-[dependencies.syntect]
-version = "4.4"
-default-features = false
+[package]
+name = "desubot"
+version = "0.5.3"
+authors = ["AB <ab@hexor.ru>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bytes = "0.5"
+tokio = { version = "0.2", 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-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"
+uuid = { version = "0.8", features = ["v4"] }
+sha1 = "0.6.0"
+env_logger = "0.7"
+log = { version = "^0.4.5", features = ["std"] }
+subprocess = "0.2.6"
+serde_json = "1.0"
+markov = "1.1.0"
+rand = "0.7.3"
+mystem = "^0.2"
+#mystem = { path = "../mystem-rs" }
+async-trait = "0.1.42"
+sqlparser = "0.7.0"
+
+[dependencies.syntect]
+version = "4.4"
+default-features = false
 features = ["parsing", "dump-load", "regex-onig"]

README

@@ -7,10 +7,8 @@ Telegram bot with light group statistic and heavy spy features.
 * /here command to mention all members.
 * Alongside with saving whole message bot perform blacklist filter and stemming for every word (only Russian). "Красивую собаку мыли негры" -> "красивый собака мыть негр"
 * Generate sentences using Markov Chains trained on history with /markov_all.
-
-== TODO ==
 * Syntax highlighting for CODE exported to image.
 
 == Important ==
 * Desubot uses MyStem by Yandex for word stemming and assume that mystem binary is available in PATH.
-On Windows it may be placed on working directory. Both Linux and Windows mystem binary is in repo.
+On Windows it may be placed on working directory. Both Linux and Windows mystem binary is in repo.

assets/help_text.rs

@@ -1,10 +1,10 @@
-static CODE: &str = "<b>Code highlighter</b>
+#[allow(dead_code)]
+static CODE_HELP: &str = "<b>Code highlighter</b>
 
 <i>Usage</i>
-<pre>/CODE
-#&lt;theme - Dracula by default&gt;
+<pre>/code
 &lt;CODE&gt;
-#&lt;lang - JS by default&gt;</pre>
+#&lt;lang - JS by default&gt; #&lt;theme - Dracula by default&gt;</pre>
 
 Language may be defined by both name and extension - Rust, rs...
 Max lines - 80
@@ -33,4 +33,11 @@ gruvbox
 gruvbox-light
 gruvbox-white
 zenburn
-";
+";
+
+#[allow(dead_code)]
+pub static SQL_HELP: &str = "<b>Perform an SQL command</b>
+<i>* Only one sentence per message.
+* Only SELECT command.
+* Max result length is 100 lines. Use LIMIT 100.
+* SQLITE syntax is available only.</i>";

src/commands.rs

@@ -17,11 +17,13 @@ use sqlparser::ast::Statement;
 use sqlparser::dialect::GenericDialect;
 use sqlparser::parser::Parser;
 use syntect::easy::HighlightLines;
+use syntect::highlighting::Theme;
 use syntect::parsing::SyntaxReference;
 use syntect::util::LinesWithEndings;
 use telegram_bot::prelude::*;
 use telegram_bot::{Api, Message, ParseMode};
-use syntect::highlighting::Theme;
+
+include!("../assets/help_text.rs");
 
 pub struct Here {
     pub data: String,
@@ -65,6 +67,10 @@ impl Execute for Sql {
 
     async fn exec_with_result(&self, api: &Api, message: &Message) -> Result<String, Error> {
         let mut sql = self.data.clone();
+        debug!("PIZDA - {}", sql);
+        if sql == "/sql" || sql == "/sql-" {
+            return Ok(SQL_HELP.to_string())
+        }
         let is_head = if sql.starts_with('-') {
             sql = sql.replacen("-", "", 1);
             false
@@ -137,7 +143,7 @@ impl Execute for Sql {
             }
             res.push(tmp);
         }
-        if res.len() > 100 {
+        if res.len() >= 100 {
             return Err(Error::SQLResultTooLong(
                 "SQL result too long. Lines limit is 100. Use LIMIT".to_string(),
             ));
@@ -551,11 +557,16 @@ impl Execute for Code {
         unimplemented!()
     }
     async fn exec_with_result(&self, api: &Api, message: &Message) -> Result<String, Error> {
-        let mut lines: Vec<String> = self.data.trim().split("\n").map(|s| s.to_string()).collect();
+        let mut lines: Vec<String> = self
+            .data
+            .trim()
+            .split("\n")
+            .map(|s| s.to_string())
+            .collect();
         if lines.len() >= 81 {
             return Err(CodeHighlightningError);
         }
-        let last_line = &lines[lines.len()-1];
+        let last_line = &lines[lines.len() - 1];
 
         let tags = last_line
             .trim()
@@ -593,7 +604,6 @@ impl Execute for Code {
             .map(|s| s.unwrap())
             .collect();
 
-
         let theme = if theme.len() != 1 {
             ts.themes.get("Dracula").unwrap()
         } else {
@@ -606,6 +616,7 @@ impl Execute for Code {
             .collect::<Vec<_>>();
         let formatter = silicon::formatter::ImageFormatterBuilder::<String>::new()
             .window_controls(false)
+            .line_offset(1)
             .round_corner(false);
         let mut formatter = formatter.build().unwrap();
         let image = formatter.format(&highlight, &theme);

src/db.rs

@@ -214,7 +214,7 @@ pub(crate) async fn add_conf(message: Message) -> Result<(), Error> {
 
     match get_conf(message.chat.id()) {
         Ok(_) => {
-            //info!("Group found: {:?}", message.chat.id());
+            debug!("Group found: {:?}", message.chat.id());
             let update = Conf {
                 id: message.chat.id(),
                 title,
@@ -228,10 +228,10 @@ pub(crate) async fn add_conf(message: Message) -> Result<(), Error> {
                 id = :id",
             )?;
             stmt.execute_named(&[(":id", &update.id.to_string()), (":title", &update.title)])?;
-            //info!("Conf {:?} updated: {:?}", update.title, get_conf(update.id));
+            debug!("Conf {:?} updated: {:?}", update.title, get_conf(update.id));
         }
         Err(_) => {
-            //info!("Group didn't found: {:?}", message.chat.id());
+            debug!("Group didn't found: {:?}", message.chat.id());
 
             let update = Conf {
                 id: message.chat.id(),
@@ -250,7 +250,7 @@ pub(crate) async fn add_conf(message: Message) -> Result<(), Error> {
                 (":title", &update.title),
                 (":date", &unix_time),
             ])?;
-            //info!("Conf {:?} added: {:?}", update.title, get_conf(update.id));
+            debug!("Conf {:?} added: {:?}", update.title, get_conf(update.id));
         }
     }
     Ok(())
@@ -283,7 +283,7 @@ pub(crate) async fn add_user(message: Message) -> Result<(), Error> {
                 (":first_name", &update.first_name),
                 (":last_name", &update.last_name),
             ])?;
-            //println!("User {} updated: {:?}", update.first_name, get_user(user.id));
+            debug!("User {} updated: {:?}", update.first_name, get_user(update.id));
         }
         Err(_) => {
             let unix_time = SystemTime::now()
@@ -310,7 +310,7 @@ pub(crate) async fn add_user(message: Message) -> Result<(), Error> {
                 (":last_name", &user.last_name),
                 (":date", &unix_time),
             ])?;
-            //println!("User added: {:?}", user);
+            debug!("User added: {:?}", user);
         }
     }
     Ok(())

src/handlers.rs

@@ -6,7 +6,6 @@ use crate::utils;
 use mystem::MyStem;
 use telegram_bot::*;
 
-
 include!("../assets/help_text.rs");
 
 pub async fn handler(
@@ -25,19 +24,18 @@ pub async fn handler(
                 title,
                 &message.from.id,
                 &message.from.first_name,
-                {if data.len() <= 200 {data} else {&data[..200]}}.replace("\n", " ")
+                data.replace("\n", " ")
             );
 
             let cleaned_message = data.replace(&format!("@{}", me.clone().username.unwrap()), "");
             match cleaned_message.as_str() {
                 s if s.to_string().starts_with("/code") => {
-
                     match {
                         Code {
                             data: s.replace("/code", ""),
                         }
-                            .exec_with_result(&api, &message)
-                            .await
+                        .exec_with_result(&api, &message)
+                        .await
                     } {
                         Ok(path) => {
                             let file = InputFileUpload::with_path(path.clone());
@@ -50,12 +48,12 @@ pub async fn handler(
                         }
                         Err(_) => {
                             let _ = api
-                                .send(message.text_reply(CODE).parse_mode(ParseMode::Html))
+                                .send(message.text_reply(CODE_HELP).parse_mode(ParseMode::Html))
                                 .await?;
                         }
                     }
                 }
-                s if s.contains("/here") => {
+                s if s.contains("/here") || s.contains("@here") => {
                     db::add_sentence(&message, mystem).await?;
                     Here {
                         data: "".to_string(),
@@ -120,7 +118,9 @@ 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, .. } => {