d4rktg 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

d4rk/Handlers/_bot.py

@@ -51,8 +51,6 @@ class BotManager(Client):
         if self._loop:asyncio.run_coroutine_threadsafe(coro_func(), self._loop)
         else:logger.error("Event loop is not set for _safe_async")
 
-    
-
     async def powerup(self,appname):
         if hasattr(self, "db"):
             self.font = self.db.Settings.get(key="font",datatype=str)
@@ -169,8 +167,10 @@ class BotManager(Client):
             except Exception as e:logger.error(f"Failed to send restart notification: {e}")
             try:await self.edit_message_text(chat_id=chat_id,message_id=Message_id, text="Bot restarted successfully!")          
             except:
-                await self.send_message(chat_id=chat_id, text="Bot restarted successfully!",reply_to_message_id=Message_id-1,)
-                await self.delete_messages(chat_id=chat_id,message_ids=Message_id)
+                try:
+                    await self.send_message(chat_id=chat_id, text="Bot restarted successfully!",reply_to_message_id=Message_id-1,)
+                    await self.delete_messages(chat_id=chat_id,message_ids=Message_id)
+                except:pass
             os.remove('restart.txt')
         else:
             try:await self.send_message(chat_id=self.LOGS, text=f"{self._bot_info.mention} started successfully!")

d4rk/Utils/__init__.py

@@ -5,4 +5,4 @@ from ._delete import delete
 from ._ractions import Reacts
 from ._fonts import FontMessageMixin , get_font , web_app_data
 from ._movie_parser import parser
-from ._round import round_robin
+from ._round import round_robin , round

d4rk/Utils/_decorators.py

@@ -3,7 +3,7 @@ import asyncio
 import functools
 
 from typing import Union
-from pyrogram import Client 
+from pyrogram import Client , filters
 from d4rk.Logs import setup_logger
 from pyrogram.types import Message , CallbackQuery , ChatPrivileges
 
@@ -16,63 +16,57 @@ logger = setup_logger(__name__)
 
 OWNER = int(os.getenv("OWNER", 7859877609))
 
-def authorize(sudo=True,admin=False,delete_command=True, react=True,react_emoji:Reacts=Reacts.fire,alert=True,permission=None):
-    def decorator(func):
-        @functools.wraps(func)
-        async def wrapper(client: Client, message: Union[Message,CallbackQuery]):
-            try:
-                user = message.from_user
-                if not user:
-                    logger.warning(f"Unauthorized access attempt from non-user message: {message}")
-                me = await client.get_me()
-                is_admin = False
-                if admin:
-                    if message.chat.type.name.lower() in ["group","supergroup"]:
-                        role = await client.get_chat_member(message.chat.id, user.id)
-                        myrole = await client.get_chat_member(message.chat.id, me.id)
-                        if (user_admin:= role.status.name.lower() in ["creator", "administrator","owner"]) and (i_am_admin:=myrole.status.name.lower() in ["creator", "administrator","owner"]):
-                            if permission:
-                                privileges = getattr(role, "privileges", None)
-                                myprivileges = getattr(myrole, "privileges", None)
-                                if privileges and myprivileges:
-                                    has_permission = getattr(privileges, permission, False)
-                                    has_my_permission = getattr(myprivileges, permission, False)
-                                    if has_permission and has_my_permission:
-                                        is_admin = True
-                                    else:
-                                        msg = ""
-                                        if not has_permission and not has_my_permission:msg = f"❌ Neither you nor I "
-                                        elif not has_permission:msg = f"❌ You don't"
-                                        elif not has_my_permission:msg = f"❌ I don't"
-                                        msg += f" have the required permission: `{permission}`."
-                                        return await client.send_alert(message=message,text=msg)
-                            else:is_admin = True
-                    else:
-                        if alert:
-                            return await client.send_alert(message=message,text="❌ This command can only be used in groups.")
-                        
-                authorized = user.id == OWNER or (sudo and user.id in client.sudo_users) or is_admin
-                if react and isinstance(message, Message):
-                    try:await message.react(react_emoji)
-                    except:pass
-                
-                if not authorized:
-                    logger.warning(f"Unauthorized {func.__name__} request from user {user.id} @{user.username}")
-                    if alert:
-                        m = await client.send_alert(message=message,text="❌ Unauthorized access.")
-                        if react and isinstance(message, Message):
-                            await message.react(Reacts.shit)
-                            if m:await delete(client, message.chat.id, m.id, timeout=5)
-                
+
+def authorize(
+    sudo=True,
+    admin=False,
+    permission=None,
+    owner_id: int = None
+):
+    async def func(flt, client: Client, message: Union[Message, CallbackQuery]):
+        try:
+            user = message.from_user
+            if not user:
+                logger.warning(f"Unauthorized access attempt from non-user message: {message}")
+                return False
+
+            me = await client.get_me()
+            is_admin = False
+
+            if admin:
+                if message.chat.type.name.lower() in ["group", "supergroup"]:
+                    role = await client.get_chat_member(message.chat.id, user.id)
+                    myrole = await client.get_chat_member(message.chat.id, me.id)
+
+                    role_status = getattr(role.status, "name", role.status).lower()
+                    myrole_status = getattr(myrole.status, "name", myrole.status).lower()
+
+                    if role_status in ["creator", "administrator"] and \
+                       myrole_status in ["creator", "administrator"]:
+
+                        if permission:
+                            privileges = getattr(role, "privileges", None)
+                            myprivileges = getattr(myrole, "privileges", None)
+                            if privileges and myprivileges:
+                                has_permission = getattr(privileges, permission, False)
+                                has_my_permission = getattr(myprivileges, permission, False)
+                                if has_permission and has_my_permission:
+                                    is_admin = True
+                                else:
+                                    return False
+                        else:
+                            is_admin = True
                 else:
-                    logger.info(f"Authorized user {user.id} executing {func.__name__}")
-                    await func(client, message)
-                if delete_command:
-                    try:await delete(client, message.chat.id, message.id, timeout=5)
-                    except:pass
-            except Exception as e:
-                logger.error(f"Error in {func.__name__}: {e}")
-            return
-        return wrapper
-    return decorator
+                    return False
+
+            authorized = (
+                (owner_id and user.id == owner_id)
+                or (sudo and user.id in getattr(client, "sudo_users", []))
+                or is_admin
+            )
+            return bool(authorized)
+        except Exception as e:
+            logger.error(f"Error in authorize filter: {e}")
+            return bool(owner_id and user.id == user.id)
 
+    return filters.create(func, name="AuthorizeFilter")

d4rk/Utils/_round.py

@@ -11,6 +11,39 @@ responded_messages = {}
 # Lock per chat to prevent race conditions
 chat_locks = {}
 
+def round():
+    async def func(flt, client: Client, message: Union[Message, CallbackQuery]):
+        chat_id = message.chat.id
+        msg_id = message.id
+
+        if message.chat.type.name.lower() == "private":
+            return True
+
+        if chat_id not in bot_order_per_chat:
+            bot_order_per_chat[chat_id] = [client.me.id]
+            last_index_per_chat[chat_id] = 0
+            responded_messages[chat_id] = set()
+            chat_locks[chat_id] = asyncio.Lock()
+        
+        if client.me.id not in bot_order_per_chat[chat_id]:
+            bot_order_per_chat[chat_id].append(client.me.id)
+        
+        async with chat_locks[chat_id]:
+            # Skip if message already responded
+            if msg_id in responded_messages[chat_id]:
+                return False
+
+            # Decide which bot should respond
+            current_index = last_index_per_chat[chat_id]
+            selected_bot_id = bot_order_per_chat[chat_id][current_index]
+
+            if client.me.id == selected_bot_id:
+                # Mark message as responded
+                responded_messages[chat_id].add(msg_id)
+                # Rotate for next message
+                last_index_per_chat[chat_id] = (current_index + 1) % len(bot_order_per_chat[chat_id])
+                return True
+
 def round_robin():
     def decorator(func):
         @wraps(func)

{d4rktg-0.5.2.dist-info → d4rktg-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d4rktg
-Version: 0.5.2
+Version: 0.5.4
 Summary: A module for create with easy and fast
 Author: D4rkShell
 Author-email: premiumqtrst@gmail.com

{d4rktg-0.5.2.dist-info → d4rktg-0.5.4.dist-info}/RECORD

@@ -2,23 +2,23 @@ d4rk/__init__.py,sha256=Xq5qqX-FwosTJBLrSPF53FPD6fEISH750hbImZpSu5k,202
 d4rk/Database/__init__.py,sha256=TQB5D8PBDCq80jPq6rsC2G939yYYKTh_bCcOWsZ-nA8,18
 d4rk/Database/db.py,sha256=5T-dbHPQp9JF2rQb707SLSSkAaz8ghX4lO7g_Siy7oA,1870
 d4rk/Handlers/__init__.py,sha256=lO1b7Tnu3GWgwcJmX5qepiNqaBBi6qTgjj0SlzVUyEA,63
-d4rk/Handlers/_bot.py,sha256=zQgo3NTofTMgDNV2YE-VDbJyq05ajJetuimfd7kR2zQ,9015
+d4rk/Handlers/_bot.py,sha256=FaWw5EHx4GFGjJikrno_fNxxDp2gBEQVH0bnD3O1kbk,9066
 d4rk/Handlers/_scheduler.py,sha256=AyqexO4nxZlIzRfU9vWTfJtTWQVQmP4de7GRPg-3JkA,1236
 d4rk/Logs/__init__.py,sha256=mXWD5jXnyH3_AvS7K_ki3iw5BpoEAvrDFbmr-iEFNnY,22
 d4rk/Logs/_logger.py,sha256=lqfVvCO0vZ_IaGOdIE4HA2KAUQZh7yW2iAHZcBz7F4o,4120
 d4rk/Models/__init__.py,sha256=7bYM2c5Uk_VEg7NxIGH2EcEXGcAguwxvH23-Gy1orMM,100
 d4rk/Models/_commands.py,sha256=U831pYCQbAYxyn3t6f49Wlk7vWycynR0sjxIOy0xjS8,2816
 d4rk/Models/_movie_title.py,sha256=Xp8eafBP-kD3MxAdeNcb7EyiAojn5fDQ18la7vxrg10,812
-d4rk/Utils/__init__.py,sha256=uOF0bJacA7Lv944I4qHLtC-vKrgs7B7QFfmnKRfSVzw,325
-d4rk/Utils/_decorators.py,sha256=G5gGayvcpZRRVo6ondbRqQYDN4yVczlEdSHwaOQ_TLI,4145
+d4rk/Utils/__init__.py,sha256=nWnDrvTJ8BgbqEE9aiVOcT8JoxK6P4XvP9_rgUwEHXs,333
+d4rk/Utils/_decorators.py,sha256=BDxTvsDpbmWQuTIMkgR0GsAC2AjqPdNOtAEzQcfEw7g,2708
 d4rk/Utils/_delete.py,sha256=gSmQAENGmM5XCCJfPuJ4vRMSxtixYG0vYdocU-2TSFg,581
 d4rk/Utils/_fonts.py,sha256=CQsDqPgvp27t3f75Cxod0EmZogEssLwIpyesH-YY5KM,7518
 d4rk/Utils/_ip.py,sha256=KJJW2QSngshIVWCO5YPXF1wj4IPQzVN5oFofpfzlU5w,559
 d4rk/Utils/_movie_parser.py,sha256=QEPd3z04p4pk2vxZ-2fYlRxHmQbmwQd2mCIlBsBM5AY,7039
 d4rk/Utils/_ractions.py,sha256=wOVPyoFnbDuMgoP6NF_gLO1DYcfhERC0trdAK1jWSE8,2170
-d4rk/Utils/_round.py,sha256=jMFTG0eLcL3RVQZrgdSpKhLLus0Nc1WZFgJCET5Fdaw,2100
+d4rk/Utils/_round.py,sha256=8mWNKfCSlN8-ClcG8MG1NydyDH3trGInFwV-Ede2bjA,3425
 d4rk/Utils/_terminal.py,sha256=Anu4OcffY3v6LMOrCskP1cHrJIliomo1Hjownbhh2sQ,125
-d4rktg-0.5.2.dist-info/METADATA,sha256=FlotNejt4GX6EIWcQb68jZBehFZ9-JwU-RgvCHsQUrM,652
-d4rktg-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-d4rktg-0.5.2.dist-info/top_level.txt,sha256=qs1qTnKWImmGi7E0FoJS0OAEOHoVZA9vHRS3Pm6ncAo,5
-d4rktg-0.5.2.dist-info/RECORD,,
+d4rktg-0.5.4.dist-info/METADATA,sha256=8QjqlkoEHkRLEdbPIgDeqjVHQlo7fGlp-5OdIvyZMjA,652
+d4rktg-0.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+d4rktg-0.5.4.dist-info/top_level.txt,sha256=qs1qTnKWImmGi7E0FoJS0OAEOHoVZA9vHRS3Pm6ncAo,5
+d4rktg-0.5.4.dist-info/RECORD,,