Reformat coms to use mysql

src/commands/coms.rs

@@ -1,34 +1,32 @@
 use crate::{Context, Error};
-use cached::proc_macro::cached;
+use mysql_async::{from_row, params, prelude::Queryable, Conn};
 use rand::seq::IteratorRandom;
-use serde_json::{
-    Map,
-    Value::{self, Object},
-};
-use std::fs;
 
-async fn autocomplete_command<'a>(
+async fn autocomplete_command<'a>(ctx: Context<'_>, partial: &'a str) -> Vec<String> {
-    _ctx: Context<'_>,
+    let mut conn = match ctx.data().database.get_conn().await {
-    partial: &'a str,
+        Ok(c) => c,
-) -> impl Iterator<Item = String> + 'a {
+        Err(_) => return vec![],
-    let res: Vec<String> = get_coms()
+    };
-        .keys()
+
-        .filter(move |e| e.contains(&partial))
+    let stmt = conn.prep("SELECT sign FROM commands WHERE sign LIKE CONCAT('%', :partial, '%') AND enabled ORDER BY priority DESC, sign ASC LIMIT 25").await.unwrap();
-        .map(|e| e.to_string())
+    // let ding = con.exec(&stmt, params! {partial}).await?;
-        .collect();
+    // let iter = ding.into_iter().map(|a| a.to_string());
-    res.into_iter()
+    let result = match conn.exec_iter(stmt, params! {partial}).await {
+        Ok(blah) => blah
+            .map_and_drop(|row| from_row::<String>(row))
+            .await
+            .unwrap_or_default(),
+        Err(e) => {
+            println!("Error autocomplete coms {}", e);
+            vec!["Error getting commands".to_owned()]
+        }
+    };
+    result
 }
 
-#[cached(time = 600)]
+pub async fn get_command(sign: &str, con: &mut Conn) -> Result<Option<String>, mysql_async::Error> {
-fn get_coms() -> Map<String, Value> {
+    let a: Option<String> = con.exec_first(r"SELECT response FROM commands WHERE sign = :sign and enabled order by priority desc limit 1", (sign,)).await?;
-    let path = "./data/commands.json";
+    Ok(a)
-    let data = fs::read_to_string(path).expect("Unable to read file");
-    let res: serde_json::Value = serde_json::from_str(&data).expect("Unable to parse");
-    if let Object(things) = res {
-        return things;
-    } else {
-        return Map::<String, Value>::new();
-    }
 }
 
 // F1TV links throughout the seasons
@@ -39,15 +37,15 @@ pub async fn coms(
     #[autocomplete = "autocomplete_command"]
     command: String,
 ) -> Result<(), Error> {
-    match get_coms().get(&command) {
+    let conn: &mut Conn = &mut ctx.data().database.get_conn().await?;
+    match get_command(&command, conn).await? {
         None => {
             ctx.say(format!("Command `{}` not found", command)).await?;
         }
         Some(com) => {
-            ctx.say(sky(com.as_str().unwrap())).await?;
+            ctx.say(sky(&com)).await?;
         }
     }
-
     Ok(())
 }