mirrortea/__main__.py

@@ -5,43 +5,28 @@ import sys
 import aiogram as telegram
 import nio as matrix
 
-def main():
-    config = Config(
-        matrix_homeserver_url=os.environ['MATRIX_HOMESERVER_URL'],
-        matrix_full_user_id=os.environ['MATRIX_FULL_USER_ID'],
-        matrix_password=os.environ['MATRIX_PASSWORD'],
-        telegram_bot_token=os.environ['TELEGRAM_BOT_TOKEN'],
-    )
+MATRIX_HOMESERVER_URL = os.environ['MATRIX_HOMESERVER_URL']
+MATRIX_FULL_USER_ID   = os.environ['MATRIX_FULL_USER_ID']
+MATRIX_PASSWORD       = os.environ['MATRIX_PASSWORD']
+TELEGRAM_BOT_TOKEN    = os.environ['TELEGRAM_BOT_TOKEN']
 
-    asyncio.run(Application(config).run())
+async def main():
+    try:
+        matrix_loop = None
 
-class Config:
-    def __init__(self, **kwargs):
-        self.matrix_homeserver_url = kwargs['matrix_homeserver_url']
-        self.matrix_full_user_id   = kwargs['matrix_full_user_id']
-        self.matrix_password       = kwargs['matrix_password']
-        self.telegram_bot_token    = kwargs['telegram_bot_token']
+        matrix_loop = MatrixLoop(MATRIX_HOMESERVER_URL, MATRIX_FULL_USER_ID,
+                                 MATRIX_PASSWORD)
+        await matrix_loop.prepare()
 
-class Application:
-    def __init__(self, config):
-        self.config = config
-        self.matrix_loop = MatrixLoop(
-            config.matrix_homeserver_url,
-            config.matrix_full_user_id,
-            config.matrix_password,
+        telegram_loop = TelegramLoop(TELEGRAM_BOT_TOKEN)
+
+        await asyncio.gather(
+            matrix_loop.run(),
+            telegram_loop.run(),
         )
-        self.telegram_loop = TelegramLoop(config.telegram_bot_token)
-
-    async def run(self):
-        try:
-            await self.matrix_loop.prepare()
-            await asyncio.gather(
-                self.matrix_loop.run(),
-                self.telegram_loop.run(),
-            )
-        finally:
-            if self.matrix_loop:
-                await self.matrix_loop.finish()
+    finally:
+        if matrix_loop:
+            await matrix_loop.finish()
 
 class MatrixLoop:
     def __init__(self, homeserver_url, full_user_id, password):
@@ -74,4 +59,4 @@ class TelegramLoop:
         print(msg, file=sys.stderr)
 
 if __name__ == '__main__':
-    main()
+    asyncio.run(main())