From 87a7c69b765f59f77fccf3797c5a6bf7248c39dd Mon Sep 17 00:00:00 2001
From: jude <judesouthworth@pm.me>
Date: Sat, 17 Oct 2020 02:10:36 +0100
Subject: [PATCH] improving the todo interface. switched up some of the dp.py
 include_strs to use cargo_manifest_dir

---
 .idea/dictionaries/jude.xml   |  1 +
 src/commands/reminder_cmds.rs |  4 +--
 src/commands/todo_cmds.rs     | 62 ++++++++++++++++++++++++++++-------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/.idea/dictionaries/jude.xml b/.idea/dictionaries/jude.xml
index ac7ff8c..eada3dc 100644
--- a/.idea/dictionaries/jude.xml
+++ b/.idea/dictionaries/jude.xml
@@ -2,6 +2,7 @@
   <dictionary name="jude">
     <words>
       <w>reqwest</w>
+      <w>subcommand</w>
       <w>todos</w>
       <w>webhook</w>
       <w>webhooks</w>
diff --git a/src/commands/reminder_cmds.rs b/src/commands/reminder_cmds.rs
index 226ab5c..8f0e874 100644
--- a/src/commands/reminder_cmds.rs
+++ b/src/commands/reminder_cmds.rs
@@ -1034,7 +1034,7 @@ async fn natural(ctx: &Context, msg: &Message, args: String) -> CommandResult {
     if let (Some(time_crop), Some(msg_crop)) = (time_crop_opt, msg_crop_opt) {
         let python_call = Command::new(&*PYTHON_LOCATION)
             .arg("-c")
-            .arg(include_str!("../../dp.py"))
+            .arg(include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/dp.py")))
             .arg(time_crop)
             .arg(&user_data.timezone)
             .arg(&*LOCAL_TIMEZONE)
@@ -1094,7 +1094,7 @@ async fn natural(ctx: &Context, msg: &Message, args: String) -> CommandResult {
 
                     let python_call = Command::new(&*PYTHON_LOCATION)
                         .arg("-c")
-                        .arg(include_str!("../../dp.py"))
+                        .arg(include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/dp.py")))
                         .arg(&format!("1 {}", interval_str))
                         .arg(&*LOCAL_TIMEZONE)
                         .arg(&*LOCAL_TIMEZONE)
diff --git a/src/commands/todo_cmds.rs b/src/commands/todo_cmds.rs
index ebfb769..ea8287d 100644
--- a/src/commands/todo_cmds.rs
+++ b/src/commands/todo_cmds.rs
@@ -17,6 +17,7 @@ use crate::{
     SQLPool,
 };
 use sqlx::MySqlPool;
+use std::convert::TryFrom;
 
 #[derive(Debug)]
 struct TodoNotFound;
@@ -240,6 +241,24 @@ enum SubCommand {
     Clear,
 }
 
+impl TryFrom<Option<&str>> for SubCommand {
+    type Error = ();
+
+    fn try_from(value: Option<&str>) -> Result<Self, Self::Error> {
+        match value {
+            Some("add") => Ok(SubCommand::Add),
+
+            Some("remove") => Ok(SubCommand::Remove),
+
+            Some("clear") => Ok(SubCommand::Clear),
+
+            None => Ok(SubCommand::View),
+
+            Some(_unrecognised) => Err(()),
+        }
+    }
+}
+
 impl ToString for SubCommand {
     fn to_string(&self) -> String {
         match self {
@@ -252,6 +271,35 @@ impl ToString for SubCommand {
     }
 }
 
+#[command]
+#[permission_level(Managed)]
+async fn todo_user(ctx: &Context, msg: &Message, args: String) -> CommandResult {
+    let mut split = args.split(' ');
+
+    let target = TodoTarget {
+        user: msg.author.id,
+        guild: None,
+        channel: None,
+    };
+
+    let subcommand_opt = SubCommand::try_from(split.next());
+
+    if let Ok(subcommand) = subcommand_opt {
+        todo(
+            ctx,
+            msg,
+            target,
+            subcommand,
+            split.collect::<Vec<&str>>().join(" "),
+        )
+        .await;
+    } else {
+        show_help(&ctx, msg, Some(target)).await;
+    }
+
+    Ok(())
+}
+
 #[command]
 #[permission_level(Managed)]
 async fn todo_parse(ctx: &Context, msg: &Message, args: String) -> CommandResult {
@@ -293,19 +341,9 @@ async fn todo_parse(ctx: &Context, msg: &Message, args: String) -> CommandResult
         };
 
         if let Some(target) = target_opt {
-            let subcommand_opt = match split.next() {
-                Some("add") => Some(SubCommand::Add),
+            let subcommand_opt = SubCommand::try_from(split.next());
 
-                Some("remove") => Some(SubCommand::Remove),
-
-                Some("clear") => Some(SubCommand::Clear),
-
-                None => Some(SubCommand::View),
-
-                Some(_unrecognised) => None,
-            };
-
-            if let Some(subcommand) = subcommand_opt {
+            if let Ok(subcommand) = subcommand_opt {
                 todo(
                     ctx,
                     msg,