fixing some issues

AmanoTeam · Apr 25, 2022 · 699e9f4 · 699e9f4
1 parent 5573672
commit 699e9f4
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 34 deletions.
diff --git a/eduu/__main__.py b/eduu/__main__.py
@@ -4,11 +4,13 @@
 import asyncio
 import logging
 import platform
+import sys
 
-from httpx import AsyncClient
+from pyrogram import idle
 
 from eduu.bot import Eduu
 from eduu.database import database
+from eduu.utils import http
 
 logging.basicConfig(
     level=logging.INFO,
@@ -31,21 +33,35 @@
         logger.warning("uvloop is not installed and therefore will be disabled.")
 
 
-if __name__ == "__main__":
-    # open new asyncio event loop
-    event_policy = asyncio.get_event_loop_policy()
-    event_loop = event_policy.new_event_loop()
+async def main():
+    eduu = Eduu()
+
     try:
         # start the bot
-        event_loop.run_until_complete(database.connect())
-        Eduu().run()
+        await database.connect()
+        await eduu.start()
+
+        if "test" not in sys.argv:
+            await idle()
     except KeyboardInterrupt:
         # exit gracefully
         logger.warning("Forced stop... Bye!")
     finally:
         # close https connections and the DB if open
-        event_loop.run_until_complete(AsyncClient().aclose())
+        await eduu.stop()
+        await http.aclose()
         if database.is_connected:
-            event_loop.run_until_complete(database.close())
-        # close asyncio event loop
-        event_loop.close()
+            await database.close()
+
+
+if __name__ == "__main__":
+    # open new asyncio event loop
+    event_policy = asyncio.get_event_loop_policy()
+    event_loop = event_policy.new_event_loop()
+    asyncio.set_event_loop(event_loop)
+
+    # start the bot
+    event_loop.run_until_complete(main())
+
+    # close asyncio event loop
+    event_loop.close()
diff --git a/eduu/bot.py b/eduu/bot.py
@@ -2,7 +2,6 @@
 # Copyright (c) 2018-2022 Amano Team
 
 import logging
-import sys
 import time
 
 import pyrogram
@@ -48,26 +47,25 @@ async def start(self):
             self.me.username,
         )
 
-        if "test" not in sys.argv:
-            from eduu.database.restarted import del_restarted, get_restarted
+        from eduu.database.restarted import del_restarted, get_restarted
 
-            wr = await get_restarted()
-            await del_restarted()
+        wr = await get_restarted()
+        await del_restarted()
 
-            start_message = (
-                "<b>EduuRobot started!</b>\n\n"
-                f"<b>Version:</b> <code>v{eduu.__version__} ({self.version_code})</code>\n"
-                f"<b>Pyrogram:</b> <code>v{pyrogram.__version__}</code>"
-            )
+        start_message = (
+            "<b>EduuRobot started!</b>\n\n"
+            f"<b>Version:</b> <code>v{eduu.__version__} ({self.version_code})</code>\n"
+            f"<b>Pyrogram:</b> <code>v{pyrogram.__version__}</code>"
+        )
 
-            try:
-                await self.send_message(chat_id=LOG_CHAT, text=start_message)
-                if wr:
-                    await self.edit_message_text(
-                        wr[0], wr[1], text="Restarted successfully!"
-                    )
-            except BadRequest:
-                logger.warning("Unable to send message to LOG_CHAT.")
+        try:
+            await self.send_message(chat_id=LOG_CHAT, text=start_message)
+            if wr:
+                await self.edit_message_text(
+                    wr[0], wr[1], text="Restarted successfully!"
+                )
+        except BadRequest:
+            logger.warning("Unable to send message to LOG_CHAT.")
 
     async def stop(self):
         await super().stop()

diff --git a/eduu/utils/utils.py b/eduu/utils/utils.py
@@ -2,7 +2,6 @@
 # Copyright (c) 2018-2022 Amano Team
 
 import asyncio
-import atexit
 import inspect
 import math
 import os.path
@@ -14,7 +13,7 @@
 
 import httpx
 from pyrogram import Client, emoji, filters
-from pyrogram.enums import ChatMemberStatus, ChatType
+from pyrogram.enums import ChatMemberStatus
 from pyrogram.types import CallbackQuery, InlineKeyboardButton, Message, User
 
 from eduu.config import SUDOERS
@@ -321,6 +320,3 @@ async def shell_exec(code, treat=True):
 def get_format_keys(string: str) -> List[str]:
     """Return a list of formatting keys present in string."""
     return [i[1] for i in Formatter().parse(string) if i[1] is not None]
-
-
-atexit.register(run_async, http.aclose)