Hexor/desubot
1
0
Fork 0
mirror of https://github.com/house-of-vanity/desubot.git synced 2025-08-21 15:27:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite command parsing.

Browse Source
This commit is contained in:
AB
2020-12-31 01:42:36 +03:00
parent 7adc629292
commit 17442819c4
3 changed files with 447 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -34,3 +34,4 @@ serde_json = "1.0"
markov = "1.1.0"
rand = "0.7.3"
mystem = "0.2"
async-trait = "0.1.42"

125
src/commands.rs
View File

@@ -1,5 +1,6 @@
use crate::db;
use crate::errors::Error;
use async_trait::async_trait;
use html_escape::encode_text;
use markov::Chain;
use mystem::Case::Nominative;
@@ -13,7 +14,44 @@ use regex::Regex;
use telegram_bot::prelude::*;
use telegram_bot::{Api, Message, ParseMode};
pub(crate) async fn here(api: Api, message: Message) -> Result<(), Error> {
pub struct Here {
pub data: String,
}
pub struct Top {
pub data: String,
}
pub struct MarkovAll {
pub data: String,
}
pub struct Markov {
pub data: String,
}
pub struct Omedeto {
pub data: String,
}
// pub enum Command {
// Here(Here),
// Top { data: String },
// MarkovAll { data: String },
// Markov { data: String },
// Omedeto { data: String },
// }
#[async_trait]
pub trait Execute {
async fn run(&self, api: Api, message: Message) -> Result<(), Error>;
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error>;
}
#[async_trait]
impl Execute for Here {
async fn run(&self, api: Api, message: Message) -> Result<(), Error> {
let members: Vec<telegram_bot::User> = db::get_members(message.chat.id()).unwrap();
for u in &members {
debug!("Found user {:?} in chat {}", u, message.chat.id());
@@ -41,9 +79,21 @@ pub(crate) async fn here(api: Api, message: Message) -> Result<(), Error> {
//api.send(message.chat.text("Text to message chat")).await?;
//api.send(message.from.text("Private text")).await?;
Ok(())
}
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error> {
unimplemented!()
}
}
pub(crate) async fn top(api: Api, message: Message) -> Result<(), Error> {
#[async_trait]
impl Execute for Top {
async fn run(&self, api: Api, message: Message) -> Result<(), Error> {
let top = db::get_top(&message).await?;
let mut msg = "<b>Your top using words:</b>\n<pre>".to_string();
let mut counter = 1;
@@ -65,9 +115,21 @@ pub(crate) async fn top(api: Api, message: Message) -> Result<(), Error> {
//api.send(message.chat.text("Text to message chat")).await?;
//api.send(message.from.text("Private text")).await?;
Ok(())
}
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error> {
unimplemented!()
}
}
pub(crate) async fn markov_all(api: Api, message: Message) -> Result<(), Error> {
#[async_trait]
impl Execute for MarkovAll {
async fn run(&self, api: Api, message: Message) -> Result<(), Error> {
let messages = db::get_messages_random_all().await?;
let mut chain = Chain::new();
chain.feed(messages);
@@ -86,9 +148,21 @@ pub(crate) async fn markov_all(api: Api, message: Message) -> Result<(), Error>
//api.send(message.chat.text("Text to message chat")).await?;
//api.send(message.from.text("Private text")).await?;
Ok(())
}
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error> {
unimplemented!()
}
}
pub(crate) async fn markov(api: Api, message: Message) -> Result<(), Error> {
#[async_trait]
impl Execute for Markov {
async fn run(&self, api: Api, message: Message) -> Result<(), Error> {
let messages = db::get_messages_random_group(&message).await?;
let mut chain = Chain::new();
chain.feed(messages);
@@ -107,9 +181,30 @@ pub(crate) async fn markov(api: Api, message: Message) -> Result<(), Error> {
//api.send(message.chat.text("Text to message chat")).await?;
//api.send(message.from.text("Private text")).await?;
Ok(())
}
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error> {
unimplemented!()
}
}
pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) -> Result<(), Error> {
#[async_trait]
impl Execute for Omedeto {
async fn run(&self, api: Api, message: Message) -> Result<(), Error> {
unimplemented!()
}
async fn run_mystem(
&self,
api: Api,
message: Message,
mystem: &mut MyStem,
) -> Result<(), Error> {
let all_msg = db::get_messages_user_all(&message).await?;
let re = Regex::new(r"^[яЯ] [а-яА-Я]+(-[а-яА-Я]+(_[а-яА-Я]+)*)*").unwrap();
let mut nouns: Vec<String> = all_msg
@@ -138,7 +233,7 @@ pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) ->
nouns.sort();
nouns.dedup();
nouns.shuffle(&mut rand::thread_rng());
debug!("Found {} nouns. {:#?}", nouns.len(), nouns);
//debug!("Found {} nouns. {:#?}", nouns.len(), nouns);
let mut verbs_p: Vec<String> = all_msg
.clone()
@@ -166,7 +261,7 @@ pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) ->
verbs_p.sort();
verbs_p.dedup();
verbs_p.shuffle(&mut rand::thread_rng());
debug!("Found {} past verbs. {:#?}", verbs_p.len(), verbs_p);
//debug!("Found {} past verbs. {:#?}", verbs_p.len(), verbs_p);
let mut verbs_i: Vec<String> = all_msg
.clone()
@@ -200,7 +295,7 @@ pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) ->
verbs_i.sort();
verbs_i.dedup();
verbs_i.shuffle(&mut rand::thread_rng());
debug!("Found {} inpresent verbs. {:#?}", verbs_i.len(), verbs_i);
//debug!("Found {} inpresent verbs. {:#?}", verbs_i.len(), verbs_i);
if nouns.is_empty() {
nouns.push(message.from.first_name.to_string());
@@ -261,33 +356,32 @@ pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) ->
}
})
.collect::<()>();
debug!("fm - {}, mu - {}", fm, mu);
//debug!("fm - {}, mu - {}", fm, mu);
if fm >= mu {
true
} else {
false
}
};
debug!("Is Feminine - {}", fem);
//debug!("Is Feminine - {}", fem);
let result = format!(
"{} {} известн{} как {}, {}, а так же конечно {}. В прошедшем году ты часто давал{} нам знать, что ты {}, {} и {}. Нередко ты говорил{} я {}, я {} или даже я {}. =*",
start.choose(&mut rand::thread_rng()).unwrap(),
message.from.first_name.to_string(),
{if fem {"ая"} else {"ый"}},
{ if fem { "ая" } else { "ый" } },
nouns.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
nouns.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
nouns.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
{if fem {"а"} else {""}},
{ if fem { "а" } else { "" } },
verbs_p.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
verbs_p.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
verbs_p.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
{if fem {"а"} else {""}},
{ if fem { "а" } else { "" } },
verbs_i.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
verbs_i.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
verbs_i.pop().unwrap_or(placeholders.choose(&mut rand::thread_rng()).unwrap().to_string()),
);
debug!("{:?}", result);
//debug!("{:?}", result);
match api
.send(
message
@@ -300,4 +394,5 @@ pub(crate) async fn omedeto(api: Api, message: Message, mystem: &mut MyStem) ->
Err(_) => warn!("/omedeto command sent failed to {}", message.chat.id()),
}
Ok(())
}
}

101
src/handlers.rs
View File

@@ -1,11 +1,56 @@
use crate::commands;
//use crate::commands::Command;
use crate::commands::{Execute, Here, Markov, MarkovAll, Omedeto, Top};
use crate::db;
use crate::errors;
use crate::utils;
use mystem::MyStem;
use telegram_bot::*;
//async fn detector()
// struct Command {
// command: Commands,
// explicit: bool,
// rest: String,
// }
// async fn detector(msg: String, me: &User) -> Result<Command, ()> {
// let cleaned_message = msg.replace(&format!("@{}", me.clone().username.unwrap()), "");
// match cleaned_message.as_str() {
// "/here" => Ok(Command::Here {
// data: "".to_string(),
// }),
// s if s.contains("/here") => Ok(Command::Here {
// data: s.to_string(),
// }),
// "/top" => Ok(Command::Top {
// data: "".to_string(),
// }),
// "/stat" => Ok(Command::Top {
// data: "".to_string(),
// }),
// s if s.contains(|z| z == "/top" || z == "/stat") => Ok(Command::Top {
// data: s.to_string(),
// }),
// "/markov_all" => Ok(Command::MarkovAll {
// data: "".to_string(),
// }),
// s if s.contains("/markov_all") => Ok(Command::MarkovAll {
// data: s.to_string(),
// }),
// "/markov" => Ok(Command::Markov {
// data: "".to_string(),
// }),
// s if s.contains("/markov") => Ok(Command::Markov {
// data: s.to_string(),
// }),
// "/omedeto" => Ok(Command::Omedeto {
// data: "".to_string(),
// }),
// s if s.contains("/Omedeto") => Ok(Command::Omedeto {
// data: s.to_string(),
// }),
// _ => Err(()),
// }
// }
pub async fn handler(
api: Api,
@@ -27,15 +72,51 @@ pub async fn handler(
);
db::add_sentence(&message, mystem).await?;
let cleaned_message = data
.to_string()
.replace(&format!("@{}", me.username.unwrap()), "");
.replace(&format!("@{}", me.clone().username.unwrap()), "");
debug!("Cleaned - {}", cleaned_message);
match cleaned_message.as_str() {
"/here" => commands::here(api, message).await?,
"/top" => commands::top(api, message).await?,
"/stat" => commands::top(api, message).await?,
"/markov_all" => commands::markov_all(api, message).await?,
"/markov" => commands::markov(api, message).await?,
"/omedeto" => commands::omedeto(api, message, mystem).await?,
s if s.contains("/here") => {
Here {
data: "".to_string(),
}
.run(api, message)
.await?
}
"/top" => {
Top {
data: "".to_string(),
}
.run(api, message)
.await?
}
"/stat" => {
Top {
data: "".to_string(),
}
.run(api, message)
.await?
}
"/markov_all" => {
MarkovAll {
data: "".to_string(),
}
.run(api, message)
.await?
}
"/markov" => {
MarkovAll {
data: "".to_string(),
}
.run(api, message)
.await?
}
"/omedeto" => {
Omedeto {
data: "".to_string(),
}
.run_mystem(api, message, mystem)
.await?
}
_ => (),
}
}