X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/6ccc70cb5cedd13170bac22b7efe6d0874e62a03..20c4ba82eda7e71635190228655360ee9a37f6c3:/bot.py?ds=inline

diff --git a/bot.py b/bot.py
index 0ac709e..649cfe6 100644
--- a/bot.py
+++ b/bot.py
@@ -4,7 +4,7 @@ import os
 
 import simplematrixbotlib as botlib
 
-from goals.db import Data
+from goals.db import Data, pretty_print
 
 
 SERVER = os.environ.get('MATRIX_SERVER')
@@ -40,7 +40,7 @@ async def do_goal(match):
     if match.command('add'):
         new = ' '.join(match.args()[1:])
         result = Data().add_goal(new)
-        return [result]
+        return [f'Goal added with id {result}']
 
     if match.command('list'):
         goals = Data().list_goals()
@@ -50,24 +50,35 @@ async def do_goal(match):
         return results
 
     if match.command('add-task'):
-        result = Data().add_task(goal_id=goal_id, name=name)
-        return [result]
+        goal_id = int(match.args()[1])
+        new = ' '.join(match.args()[2:])
+        result = Data().add_task(goal_id=goal_id, name=new)
+        return [f'Added task with id {result}']
 
     if match.command('print'):
         goal_id = int(match.args()[1])
         logger.debug(f'Searching for goal {goal_id}...')
         goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
+        return results
 
-        results = []
-        results.append(f' ## {goal}')
-        for task in tasks:
-            if(task.complete_date):
-                results.append(f' - [x] {task}')
-            else:
-                results.append(f' - [ ] {task}')
+    if match.command('goal-done'):
+        goal_id = int(match.args()[1])
+        logger.debug(f'Searching for goal {goal_id}...')
+        Data().complete_goal(goal_id)
+        goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
         return results
     
-    return 'Ye flask must be load bearing or something.'
+
+    if match.command('done'):
+        task_id = int(match.args()[1])
+        goal_id = Data().complete_task(task_id)
+        goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
+        return results
+
+    return __doc__
 
 
 @bot.listener.on_message_event