[•] - Improve decorator and another

AyiinXd · Aug 29, 2023 · 5a4d08f · 5a4d08f
1 parent dfda7ea
commit 5a4d08f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 23 deletions.
diff --git a/AyiinXd/__main__.py b/AyiinXd/__main__.py
@@ -23,16 +23,10 @@
 from AyiinXd.ayiin import autobot, autopilot, checking, heroku
 from AyiinXd.modules import ALL_MODULES
 
-from .database.core import db
-
 
 async def AyiinMain():
     from config import var
 
-    if db.is_connected:
-        db.close()
-    db.connect()
-
     await Ayiin.start()
     if not var.BOTLOG_CHATID:
         await autopilot()

diff --git a/AyiinXd/ayiin/decorator.py b/AyiinXd/ayiin/decorator.py
@@ -30,7 +30,9 @@
     bot
 )
 
+from .tools import AyiinChanger
 from .toolsyins import eod, eor
+from ..database.sudoer import sudoer
 
 
 def ayiin_cmd(
@@ -102,19 +104,27 @@ async def wrapper(event):
             if admins_only:
                 if event.is_private:
                     return await eor(
-                        event, "**Perintah ini hanya bisa digunakan di grup.**", time=10
+                        event,
+                        "**Perintah ini hanya bisa digunakan di grup.**",
+                        time=10
                     )
                 if not (chat.admin_rights or chat.creator):
                     return await eor(
-                        event, f"**Maaf anda bukan admin di {chat.title}**", time=10
+                        event,
+                        f"**Maaf anda bukan admin di {chat.title}**",
+                        time=10
                     )
             if group_only and not event.is_group:
                 return await eor(
-                    event, "**Perintah ini hanya bisa digunakan di grup.**", time=10
+                    event,
+                    "**Perintah ini hanya bisa digunakan di grup.**",
+                    time=10
                 )
             if private_only and not event.is_private:
                 return await eor(
-                    event, "**Perintah ini hanya bisa digunakan di private chat.**", time=10
+                    event,
+                    "**Perintah ini hanya bisa digunakan di private chat.**",
+                    time=10
                 )
             try:
                 await func(event)
@@ -127,19 +137,26 @@ async def wrapper(event):
                 LOGS.error(er)
             except BotInlineDisabledError:
                 await eor(
-                    event, "**Silahkan aktifkan mode Inline untuk bot**", time=10
+                    event,
+                    "**Silahkan aktifkan mode Inline untuk bot**",
+                    time=10
                 )
             except ChatSendStickersForbiddenError:
                 await eor(
-                    event, "**Tidak dapat mengirim stiker di obrolan ini**", time=10
+                    event,
+                    "**Tidak dapat mengirim stiker di obrolan ini**",
+                    time=10
                 )
             except BotResponseTimeoutError:
                 await eod(
-                    event, "**The bot didnt answer to your query in time**"
+                    event,
+                    "**The bot didnt answer to your query in time**"
                 )
             except ChatSendMediaForbiddenError:
                 await eor(
-                    event, "**Tidak dapat mengirim media dalam obrolan ini**", time=10
+                    event,
+                    "**Tidak dapat mengirim media dalam obrolan ini**",
+                    time=10
                 )
             except AlreadyInConversationError:
                 await eod(
@@ -169,23 +186,35 @@ async def wrapper(event):
             if not disable_edited:
                 Ayiin.add_event_handler(
                     wrapper, events.MessageEdited(
-                        **args, outgoing=True, pattern=ayiin_reg))
-            Ayiin.add_event_handler(wrapper, events.NewMessage(
-                **args, outgoing=True, pattern=ayiin_reg))
+                        **args,
+                        outgoing=True,
+                        pattern=ayiin_reg
+                    )
+                )
+            Ayiin.add_event_handler(
+                wrapper, events.NewMessage(
+                    **args,
+                    outgoing=True,
+                    pattern=ayiin_reg
+                )
+            )
         if Ayiin:
             if allow_sudo:
                 if not disable_edited:
                     Ayiin.add_event_handler(
                         wrapper,
                         events.MessageEdited(
                             **args,
-                            from_users=list(var.SUDO_USERS),
-                            pattern=sudo_reg),
+                            from_users=AyiinChanger(sudoer()),
+                            pattern=sudo_reg
+                        ),
                     )
                 Ayiin.add_event_handler(
                     wrapper,
                     events.NewMessage(
-                        **args, from_users=list(var.SUDO_USERS), pattern=sudo_reg
+                        **args,
+                        from_users=AyiinChanger(sudoer()),
+                        pattern=sudo_reg
                     ),
                 )
         try:

diff --git a/AyiinXd/database/core.py b/AyiinXd/database/core.py
@@ -150,7 +150,7 @@ def get_conn(self) -> sqlite3.Connection:
         Copyright (C) 2023-present AyiinXd <https://github.com/AyiinXd>
         """
         if not self.is_connected:
-            raise RuntimeError("Database anda sudah terhubung.")
+            self.connect()
 
         return self.conn
 

diff --git a/AyiinXd/modules/_callback.py b/AyiinXd/modules/_callback.py
@@ -306,10 +306,10 @@ async def on_plug_in_callback_query_handler(event):
 »  **Perintah : **`{cmd}stopvc`
 »  **Kegunaan :** __Untuk Memberhentikan voice chat group.__
 
-»  **Perintah :** `{cmd}joinvc` atau `{cmd}joinvc` <chatid/username gc>
+»  **Perintah :** `{cmd}joinvc`
 »  **Kegunaan :** __Untuk Bergabung ke voice chat group.__
 
-»  **Perintah : **`{cmd}leavevc` atau `{cmd}leavevc` <chatid/username gc>
+»  **Perintah : **`{cmd}leavevc`
 »  **Kegunaan :** __Untuk Turun dari voice chat group.__
 
 »  **Perintah : **`{cmd}vctitle` <title vcg>