Fixup commands

[matrix-shop-bot.git] / matrix_shop_bot / bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 37677c53bec9e3762b3327f87f27f545bea3aeec..0b52d76d5d6f72b7d04d3c54d9aa2234d82dbdbd 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -13,34 +13,34 @@ DATE_FORMAT = '%Y-%m-%d'
 def today():
     return dt.now().strftime(DATE_FORMAT)
 
-PREFIX = f'!{MODULE}'
+PREFIX = f'.{MODULE}'
 logger = logging.getLogger(__name__)
 logging.basicConfig(filename=f'{MODULE}.log', encoding='utf-8', level=logging.DEBUG)
 logging.getLogger('nio').setLevel(logging.WARNING)
 
 async def do_shop(match):
     '''
-    Prefix: !shop
+    Prefix: .shop
 
     Synax:
-      !shop COMMAND ARGS
+      .shop COMMAND ARGS
 
     Commands:
       help - show this help
       extra.help - show extended help
       add  - add an item to shop for
       add.store - add a store
+      clear STORE - clear all purchased items for STORE
+      list - re-show list from last used store
       stores - list all stores
-      at STORE_ID - (!shop at STORE_ID) list all items assigned to store and use this store for future commands
-      assign ITEM_ID - assign item to last used store id
+      at STORE_ID - use this store for future commands
       buy - mark item as purchased
-      clear STORE_ID - clear all purchased items for STORE_ID from database
-      list - re-show list from last used store
     '''
     extended_help = '''
+      assign ITEM_ID - assign item to last used store id
       assign.item.to.store ITEM_ID STORE_ID - plan to shop for at store for item
-      clear.all STORE_ID - clear **all** items for STORE_ID from database
-      remove.item ITEM_ID - remove a shopping item from the datatbase
+      clear.all STORE - clear **all** items for STORE
+      remove ITEM_ID - remove a shopping item from the datatbase
       remove.store STORE_ID - remove a store from the datatbase (requires clearing the list first)
       setup - run one time database setup
       unsorted - list all items not assigned to any store
@@ -97,20 +97,18 @@ async def do_shop(match):
         return results
 
     if match.command('clear'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id)
-        self.last_store_id = None
-        return ['Success']
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name)
+        return results
 
     if match.command('clear.all'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id, clear_all=True)
-        return ['Success']
-
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name, clear_all=True)
+        return results
 
     if match.command('at'):
-        store_id = ' '.join(match.args()[1])
-        items = Data().get_shopping_list_for_store(store_id)
+        store_name = ' '.join(match.args()[1:])
+        items = Data().get_shopping_list(store_name)
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
@@ -123,6 +121,16 @@ async def do_shop(match):
             results.append(str(item))
         return results
 
+
+    if match.command('past'):
+        store_name = ' '.join(match.args()[1:])
+        items = Data().list_purchases(store_name)
+        results = ['Past purchases at {store_name}']
+        for item in items:
+            results.append(str(item))
+        return results
+    
+
     if match.command('unsorted'):
         items = Data().get_unsorted_list()
         results = ['Items assigned to no store']
@@ -130,7 +138,7 @@ async def do_shop(match):
             results.append(str(item))
         return results
 
-    if match.command('remove.item'):
+    if match.command('remove'):
         item_id = ' '.join(match.args()[1:])
         Data().remove_item(item_id)
         return ['Success']