X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-shop-bot.git/blobdiff_plain/dc9596331e7950ed257dd0e0ccffd36590ab8cc0..d3e89743c10b7d8a5d4367471995366afa8d497c:/matrix_shop_bot/bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 5c8e6c5..734cdb2 100644
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -29,14 +29,14 @@ async def do_shop(match):
       help - show this help
       add  - add an item to shop for
       add-store - add a store
-      assign STORE_ID ITEM_ID - plan to shop for at store for item
+      assign ITEM_ID STORE_ID - plan to shop for at store for item
       buy - mark item as purchased
       clear STORE_ID - clear all purchased items for STORE_ID from database
       clear-all STORE_ID - clear **all** items for STORE_ID from database
       list STORE_ID - list all items assigned to store
       list-stores - list all stores
-      list-unsorted - list all items not assigned to any store
-      remove ITEM_ID - remove a shopping item from the datatbase
+      unsorted - list all items not assigned to any store
+      remove-item 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
     '''
@@ -63,9 +63,13 @@ async def do_shop(match):
         return [f'Store added with id {result}']
 
     if match.command('assign'):
-        store_id = int(match.args()[1])
-        item_id  = int(match.args()[2])
-        Data().assign_store(store_id, item_id)
+        item_id  = int(match.args()[1])
+        store_id = int(match.args()[2])
+
+        if not isinstance(store_id, int):
+            store_id = None
+
+        Data().assign_store(item_id, store_id)
 
         # Now print the list for the assigned store
         items = Data().get_shopping_list(store_id)
@@ -82,6 +86,7 @@ async def do_shop(match):
     if match.command('clear'):
         store_id = ' '.join(match.args()[1:])
         Data().clear_list(store_id)
+        self.last_store_id = None
         return ['Success']
 
     if match.command('clear-all'):
@@ -90,8 +95,11 @@ async def do_shop(match):
         return ['Success']
 
     if match.command('list'):
-        store_id = ' '.join(match.args()[1:])
+        store_id_str = ' '.join(match.args()[1])
+
+        store_id = int(store_id_str) if store_id_str else None
         items = Data().get_shopping_list(store_id)
+
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
@@ -99,7 +107,8 @@ async def do_shop(match):
 
 
     if match.command('unsorted'):
-        items = Data().list_unsorted()
+        items = Data().get_unsorted_list()
+        results = ['Items assigned to no store']
         for item in items:
             results.append(str(item))
         return results
@@ -129,6 +138,9 @@ async def shop_bot(room, message, bot):
                 await bot.api.send_text_message(
                     room.room_id, str(line))
     except Exception as ex:
-        return ['You have:', '    no tea']
+        for line in ['You have:', '    no tea', str(ex)]:
+            await bot.api.send_text_message(
+                room.room_id, str(line))
+