Merge pull request #5 from house-of-vanity/matching_commands

Fix typo.
This commit is contained in:
House of Vanity
2021-01-05 01:44:09 +03:00
committed by GitHub

View File

@@ -192,7 +192,7 @@ impl Execute for Sql {
let _ = api let _ = api
.send( .send(
message message
.text_reply(format!("❌ An error ocurred {}", e)) .text_reply(format!("❌ An error occurred {}", e))
.parse_mode(ParseMode::Html), .parse_mode(ParseMode::Html),
) )
.await; .await;
@@ -393,8 +393,7 @@ impl Execute for Omedeto {
let all_msg = db::get_messages_user_all(&message).await?; let all_msg = db::get_messages_user_all(&message).await?;
let re = Regex::new(r"^[яЯ] [а-яА-Я]+(-[а-яА-Я]+(_[а-яА-Я]+)*)*").unwrap(); let re = Regex::new(r"^[яЯ] [а-яА-Я]+(-[а-яА-Я]+(_[а-яА-Я]+)*)*").unwrap();
let mut nouns: Vec<String> = all_msg let mut nouns: Vec<String> = all_msg
.clone() .iter()
.into_iter()
.filter(|m| re.is_match(m)) .filter(|m| re.is_match(m))
.map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone()) .map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone())
.filter(|m| { .filter(|m| {
@@ -421,8 +420,7 @@ impl Execute for Omedeto {
//debug!("Found {} nouns. {:#?}", nouns.len(), nouns); //debug!("Found {} nouns. {:#?}", nouns.len(), nouns);
let mut verbs_p: Vec<String> = all_msg let mut verbs_p: Vec<String> = all_msg
.clone() .iter()
.into_iter()
.filter(|m| re.is_match(m)) .filter(|m| re.is_match(m))
.map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone()) .map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone())
.filter(|m| { .filter(|m| {
@@ -449,8 +447,7 @@ impl Execute for Omedeto {
//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 let mut verbs_i: Vec<String> = all_msg
.clone() .iter()
.into_iter()
.filter(|m| re.is_match(m)) .filter(|m| re.is_match(m))
.map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone()) .map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone())
.filter(|m| { .filter(|m| {