X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/676f4f8ee14b83a0a962cc320295954a5bbc4a14..HEAD:/matrix_goal_bot/bot.py?ds=sidebyside

diff --git a/matrix_goal_bot/bot.py b/matrix_goal_bot/bot.py
index 2417d04..037173b 100644
--- a/matrix_goal_bot/bot.py
+++ b/matrix_goal_bot/bot.py
@@ -1,8 +1,8 @@
 '''
-Prefix: !goal
+Prefix: .goal
 
 Synax:
-    !goal COMMAND ARGS
+    .goal COMMAND ARGS
 
 Commands:
   help - show this help
@@ -20,8 +20,9 @@ ex_help = '''
 More commands:
     add.vision - add a new vision (collection of goals)
     close.vision ID - mark vision as complete by ID
-    later GOAL_ID - put off goal for 14 days
-    list.all - list everything
+    dump - dump the full data set - BEWARE - so many messages
+    later VISION_ID - put off all goals in VISION for 14 days
+    list.later - list all 'later' goals
     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
@@ -29,6 +30,7 @@ More commands:
     remove ID - remove a task by ID
     start GOAL_ID - un-put-off a goal (reverse of later)
     visionless - list goals with no set vision
+    wins - list recently completed goals
 '''
 
 
@@ -63,7 +65,7 @@ class GoalBot():
                  bot_name,
                  bot_pwd,
                  db_file=None,
-                 bot_prefix='!goal'):
+                 bot_prefix='.goal'):
 
         creds = botlib.Creds(matrix_server, bot_name, bot_pwd)
         self.bot = botlib.Bot(creds)
@@ -88,9 +90,16 @@ class GoalBot():
         if match.prefix():
             try:
                 result_lines = await self._handle_match(match)
+
+                message_lines = []
                 for line in result_lines:
-                    await self.bot.api.send_text_message(
-                        room.room_id, str(line))
+                    message_lines.append(str(line))
+
+                message = '\n'.join(message_lines)
+
+                await self.bot.api.send_text_message(
+                    room.room_id, message)
+
             except Exception as ex:
                 logger.warn(f'Caught exception: {str(ex)}')
                 dumb_msg_idx = len(str(ex)) % len(snark)
@@ -122,9 +131,10 @@ class GoalBot():
             return results
 
         if match.command('list'):
-            logger.debug('Asked to list goals...')
-            goals = self.data.get_all_goals()
-            results = ['# Goals list...']
+            logger.debug('Asked to list current goals...')
+            goals = self.data.get_current_goals()
+            results = ['# Goals list']
+            results.append('------------')
             for goal in goals:
                 results.append(str(goal))
             return results
@@ -190,16 +200,18 @@ class GoalBot():
 
         if match.command('start'):
             goal_id = int(match.args()[1])
-            vision_id = self.data.start(goal_id)
-            vision,goals = self.data.get_vision(vision_id)
+            vision,goals  = self.data.start_goal(goal_id)
             results = pretty_print(vision, goals)
             return results
 
         if match.command('later'):
-            goal_id = int(match.args()[1])
-            vision_id = self.data.put_off_goal(goal_id)
-            vision,goals = self.data.get_vision(vision_id)
-            results = pretty_print(vision, goals)
+            vision_id = int(match.args()[1])
+            self.data.put_off_vision(vision_id)
+            # Want to see what we just cleaned up
+            goals = self.data.get_current_goals()
+            results = ['# Goals list...']
+            for goal in goals:
+                results.append(str(goal))
             return results
 
 
@@ -219,15 +231,21 @@ class GoalBot():
             results = pretty_print(goal, tasks)
             return results
 
-        if match.command('list.all'):
+        if match.command('dump'):
             goals = self.data.get_all_goals()
-            results = ['# Everything is...']
+            results = ['# Everything ... ']
             for goal in goals:
                 _,tasks = self.data.get_goal(goal.id)
                 details = pretty_print(goal, tasks)
                 results += details
             return results
 
+
+        if match.command('list.later'):
+            goals = self.data.get_all_goals()
+            results = ['# All Goals ... ']
+            return results
+
         if match.command('visions'):
             items = self.data.get_all_visions()
             results = ['# Visions']
@@ -248,6 +266,18 @@ class GoalBot():
                 results.append(item)
             return results
 
+        if match.command('wins'):
+            items = self.data.wins()
+            results = ['# Wins']
+            if not items:
+                results.append('-- No wins yet --')
+
+            for item in items:
+                results.append(item)
+            return results
+
+
+
         if match.command('set.vision'):
             goal_id = int(match.args()[1])
             vision_id = int(match.args()[2])