X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/913b65b598c1a233cce4f69724b4aca8ca6ef02a..390a4cf60a66718bed359b3a4141a51d0f9571b0:/app.py

diff --git a/app.py b/app.py
index b3b352f..d9254b8 100644
--- a/app.py
+++ b/app.py
@@ -1,9 +1,27 @@
-from matrix_goal_bot.bot import get_bot, goal_bot
+import os
 
-bot = get_bot()
+from matrix_goal_bot.bot import GoalBot
 
-@bot.listener.on_message_event
+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')
+
+# Prefix to listen for
+kwargs['bot_prefix'] = os.environ.get('MATRIX_BOT_PREFIX', '!chore')
+
+# Where to store data
+DATA_DIR = os.environ.get('MATRIX_DATA_DIR', '')
+DB_FILE = os.environ.get('MATRIX_DB_FILE', 'goal.db')
+kwargs['db_file'] = os.path.join(DATA_DIR, DB_FILE)
+
+goal_bot = GoalBot(**kwargs) 
+
+@goal_bot.bot.listener.on_message_event
 async def do_bot_stuff(room, message):
-    await goal_bot(room, message, bot)
+    '''Pass messages to our bot'''
+    await goal_bot.handle_message(room, message)
+
+goal_bot.run()
 
-bot.run()