X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/04946021957ba7daaad42df10973e2e5dfaf89bd..c905f2ae3a34fc05e285da897e6f83b85e182ea4:/bot.py

diff --git a/bot.py b/bot.py
index 02bead0..d57358d 100644
--- a/bot.py
+++ b/bot.py
@@ -35,14 +35,17 @@ async def do_goal(match):
       help - show this help
       add - add a goal
       add-task ID - add a task under the goal specified by ID
+      add-vision - add a new vision (collection of goals)
+      close-goal ID - mark goal done by ID
+      close-vision ID - mark vision as complete by ID
+      done ID - mark task done by ID
       list - list incomplete goals
       list-all - list everything
-      print ID - print a goal and all tasks
-      done ID - mark task done by ID
-      goal-done ID - mark goal done by ID
-      set-vision GOAL_ID VISION_ID - associate GOAL_ID with VISION_ID
+      list-done - list completed goals
+      print GOAL_ID - print a goal and all tasks
+      print-vision ID - print a vision and all goals
+      set-vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID
       visions - list incomplete visions
-
     '''
 
     if match.command('setup'):
@@ -56,16 +59,28 @@ async def do_goal(match):
 
     if match.command('list'):
         goals = Data().get_all_goals()
-        results = ['Goals list...']
+        results = ['# Goals list...']
+        for goal in goals:
+            results.append(str(goal))
+        return results
+
+
+    if match.command('list-done'):
+        goals = Data().get_done_goals()
+        results = ['# Completed Goals...']
         for goal in goals:
             results.append(str(goal))
         return results
 
+
     if match.command('add-task'):
         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}']
+        goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
+        return results
+    # return [f'Added task with id {result}']
 
     if match.command('add-vision'):
         new = ' '.join(match.args()[1:])
@@ -86,14 +101,20 @@ async def do_goal(match):
         results = pretty_print(vision, goals)
         return results
 
-    if match.command('goal-done'):
+    if match.command('close-goal'):
         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)
+        vision_id = Data().complete_goal(goal_id)
+        vision,goals = Data().get_vision(vision_id)
+        results = pretty_print(vision, goals)
         return results
-    
+
+    if match.command('close-vision'):
+        vision_id = int(match.args()[1])
+        Data().complete_vision(vision_id)
+        vision,goals = Data().get_vision(vision_id)
+        results = pretty_print(vision, goals)
+        return results
+
 
     if match.command('done'):
         task_id = int(match.args()[1])
@@ -104,7 +125,7 @@ async def do_goal(match):
 
     if match.command('list-all'):
         goals = Data().get_all_goals()
-        results = ['Everything is...']
+        results = ['# Everything is...']
         for goal in goals:
             _,tasks = Data().get_goal(goal.id)
             details = pretty_print(goal, tasks)
@@ -113,23 +134,25 @@ async def do_goal(match):
 
     if match.command('visions'):
         items = Data().get_all_visions()
-        results = ['Visions are']
+        results = ['# Visions']
+        if not items:
+            results.append('-- No current visions --')
+
         for item in items:
             results.append(item)
-        else:
-            results.append('-- No current visions --')
         return results
 
 
     if match.command('set-vision'):
         goal_id = int(match.args()[1])
-        vision_id = int(match.args()[1])
-        result = Data().assign_vision(goal_id, vision_id)
-        return [result]
+        vision_id = int(match.args()[2])
+        Data().assign_vision(goal_id=goal_id, vision_id=vision_id)
+        vision,goals = Data().get_vision(vision_id)
+        results = pretty_print(vision, goals)
+        return results
 
     return [do_goal.__doc__]
 
-
 @bot.listener.on_message_event
 async def goals(room, message):
     match = botlib.MessageMatch(room, message, bot, PREFIX)
@@ -137,11 +160,14 @@ async def goals(room, message):
     if not match.is_not_from_this_bot() and match.prefix():
         return
 
-    if match.prefix():
-        result_lines = await do_goal(match)
-        for line in result_lines:
-            await bot.api.send_text_message(
-                room.room_id, str(line))
+    try:
+        if match.prefix():
+            result_lines = await do_goal(match)
+            for line in result_lines:
+                await bot.api.send_text_message(
+                    room.room_id, str(line))
+    except Exception as ex:
+        return ['Ye cannot get ye flask.']
 
 
 bot.run()