Repack for easier reuse

diff --git a/Makefile b/Makefile
index 42608b6e260472107d575b58022cc16259abccac..a73de668f0e338952bebd8b553453417c190fb9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ MODULE=goals
        .venv/bin/pip install .
 
 serve: .venv
        .venv/bin/pip install .
 
 serve: .venv

-       .venv/bin/python bot.py
+       .venv/bin/python app.py

 
 clean:
        rm -rf .venv
 
 clean:
        rm -rf .venv

diff --git a/app.py b/app.py
new file mode 100644 (file)
index 0000000..a4a6395
--- /dev/null
+++ b/app.py
@@ -0,0 +1,9 @@
+from goals.bot import get_bot, goal_bot
+
+bot = get_bot()
+
+@bot.listener.on_message_event
+def do_bot_stuff(room, message):
+    goal_bot(room, message)
+
+bot.run()

diff --git a/bot.py b/goals/bot.py
similarity index 97%
rename from bot.py
rename to goals/bot.py
index d57358d09a4df26dc55ab9a92475ea595e50ec64..9b630f867e88de6479f1487a2524119b39a33344 100644 (file)
--- a/bot.py
+++ b/goals/bot.py
@@ -6,18 +6,19 @@ import simplematrixbotlib as botlib
 
 from goals.db import Data, pretty_print
 
 
 from goals.db import Data, pretty_print
 

-

 SERVER = os.environ.get('MATRIX_SERVER')
 BOT_NAME = os.environ.get('GOAL_BOT')
 BOT_PWD = os.environ.get('GOAL_BOT_PWD')
 
 SERVER = os.environ.get('MATRIX_SERVER')
 BOT_NAME = os.environ.get('GOAL_BOT')
 BOT_PWD = os.environ.get('GOAL_BOT_PWD')
 

+def get_bot():
+    creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
+    return botlib.Bot(creds)
+

 DATE_FORMAT = '%Y-%m-%d'
 
 def today():
     return dt.now().strftime(DATE_FORMAT)
 
 DATE_FORMAT = '%Y-%m-%d'
 
 def today():
     return dt.now().strftime(DATE_FORMAT)
 

-creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
-bot = botlib.Bot(creds)

 PREFIX = '!goal'
 
 logger = logging.getLogger(__name__)
 PREFIX = '!goal'
 
 logger = logging.getLogger(__name__)


@@ -153,8 +154,7 @@ async def do_goal(match):
 
     return [do_goal.__doc__]
 
 
     return [do_goal.__doc__]
 

-@bot.listener.on_message_event
-async def goals(room, message):
+async def goal_bot(room, message):

     match = botlib.MessageMatch(room, message, bot, PREFIX)
 
     if not match.is_not_from_this_bot() and match.prefix():
     match = botlib.MessageMatch(room, message, bot, PREFIX)
 
     if not match.is_not_from_this_bot() and match.prefix():


@@ -170,5 +170,3 @@ async def goals(room, message):
         return ['Ye cannot get ye flask.']
 
 
         return ['Ye cannot get ye flask.']
 
 

-bot.run()
-