X-Git-Url: https://apps.delaporte.us/gitweb/matrix-chore-bot.git/blobdiff_plain/0e8e2296efcfab2892ec552b04e46450554fd06a..b602bd00cf0d253cc1d035333a39f0e884120bc5:/app.py

diff --git a/app.py b/app.py
index fcc2652..682b96a 100644
--- a/app.py
+++ b/app.py
@@ -1,22 +1,28 @@
 import os
 
-import simplematrixbotlib as botlib
+from matrix_chore_bot.bot import ChoreBot
 
-from matrix_chore_bot.bot import chore_bot
+kwargs = {}
+# How to connect to Matrix
+kwargs['matrix_server'] = os.environ.get('MATRIX_SERVER')
+kwargs['bot_name'] = os.environ.get('MATRIX_BOT')
+kwargs['bot_pwd'] = os.environ.get('MATRIX_BOT_PWD')
 
-SERVER = os.environ.get('MATRIX_SERVER')
-BOT_NAME = os.environ.get('MATRIX_BOT')
-BOT_PWD = os.environ.get('MATRIX_BOT_PWD')
-BOT_PREFIX = os.environ.get('MATRIX_BOT_PREFIX', '!chore')
+# Prefix to listen for
+kwargs['bot_prefix'] = os.environ.get('MATRIX_BOT_PREFIX', '!chore')
 
-def get_bot():
-    creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
-    return botlib.Bot(creds)
+# Where to store data
+DATA_DIR = os.environ.get('MATRIX_DATA_DIR', '')
+DB_FILE = os.environ.get('MATRIX_DB_FILE', 'chore.db')
+kwargs['db_file'] = os.path.join(DATA_DIR, DB_FILE)
 
-bot = get_bot()
+print(kwargs)
 
-@bot.listener.on_message_event
+chore_bot = ChoreBot(**kwargs) 
+
+@chore_bot.bot.listener.on_message_event
 async def do_bot_stuff(room, message):
-    await chore_bot(room, message, bot, BOT_PREFIX)
+    '''Pass messages to our bot'''
+    await chore_bot.handle_message(room, message)
 
-bot.run()
+chore_bot.run()