Add ability to run with separate prefix and database file

[matrix-chore-bot.git] / matrix_chore_bot / bot.py

diff --git a/matrix_chore_bot/bot.py b/matrix_chore_bot/bot.py
index 62ef475a5b80925a4d3922159dfc49c05e43fcea..7e33ade92560c452a0914aad5a0cceda0b6e6d47 100644 (file)
--- a/matrix_chore_bot/bot.py
+++ b/matrix_chore_bot/bot.py
@@ -6,22 +6,18 @@ import simplematrixbotlib as botlib
 
 from .db import Data as ChoreData
 
-CHORES = ChoreData()
-
 SERVER = os.environ.get('MATRIX_SERVER')
 BOT_NAME = os.environ.get('MATRIX_BOT')
 BOT_PWD = os.environ.get('MATRIX_BOT_PWD')
 
-def get_bot():
-    creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
-    return botlib.Bot(creds)
+CHORES = ChoreData()
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(filename='matrix-chore-bot.log', encoding='utf-8', level=logging.DEBUG)
 logging.getLogger('nio').setLevel(logging.WARNING)
 
-async def chore_bot(room, message, bot):
-    match = botlib.MessageMatch(room, message, bot, '!chore')
+async def chore_bot(room, message, bot, prefix='!chore'):
+    match = botlib.MessageMatch(room, message, bot, prefix)
 
     if not match.is_not_from_this_bot() and match.prefix():
         return
@@ -33,9 +29,7 @@ async def chore_bot(room, message, bot):
                 await bot.api.send_text_message(
                     room.room_id, str(line))
         except Exception as ex:
-            raise ex
-
-            line = 'Ye cannot get ye flask.'
+            line = f'Ye flask must be load bearing, or something... {str(ex)}'
             await bot.api.send_text_message(
                 room.room_id, str(line))