RubigramClient 1.3.2__tar.gz → 1.3.3__tar.gz

{rubigramclient-1.3.2 → rubigramclient-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.3.2
+Version: 1.3.3
 Summary: A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters.
 Author-email: Javad RZ <Javad.Py1385@gmail.com>
 Classifier: Programming Language :: Python :: 3

{rubigramclient-1.3.2 → rubigramclient-1.3.3}/RubigramClient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.3.2
+Version: 1.3.3
 Summary: A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters.
 Author-email: Javad RZ <Javad.Py1385@gmail.com>
 Classifier: Programming Language :: Python :: 3

{rubigramclient-1.3.2 → rubigramclient-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "RubigramClient"
-version = "1.3.2"
+version = "1.3.3"
 description = "A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters."
 readme = "README.md"
 requires-python = ">=3.7"

{rubigramclient-1.3.2 → rubigramclient-1.3.3}/rubigram/client.py

@@ -1,4 +1,4 @@
-from rubigram.types import Update, MessageId, Keypad, Chat, Bot
+from rubigram.types import Update, MessageId, InlineMessage, Keypad, Chat, Bot
 from aiohttp import ClientSession, FormData, web
 from typing import Literal, Optional
 import aiofiles
@@ -26,7 +26,7 @@ class Client:
         return decorator
     
     async def update(self, data: dict):
-        event = Update.read(data["update"], self)
+        event = Update.read(data["update"], self) if data.get("update") else InlineMessage.read(data["inline_message"])
         for handler in self.messages_handler:
             await handler(self, event)
            

rubigramclient-1.3.3/rubigram/filters.py

@@ -0,0 +1,58 @@
+from rubigram.types import Update, InlineMessage
+from typing import Union
+
+
+class filter:
+    @staticmethod
+    def command(command: Union[str, list[str]], prefixes: Union[str, list[str]] = "/"):
+        def inner(update: Update):
+            if isinstance(update, Update) and update.new_message and update.new_message.text:
+                message = update.new_message
+                commands = command if isinstance(command, list) else [command]
+                commands = [c.lower() for c in commands]
+                prefix_list = [] if prefixes is None else prefixes
+                prefix_list = prefix_list if isinstance(prefix_list, list) else [prefix_list]
+                for prefix in prefix_list:
+                    if message.text.startswith(prefix) and commands:
+                        return message.text[len(prefix):].split()[0].lower() in commands
+                    return False
+            return False
+        return inner
+    
+    @staticmethod
+    def text():
+        def inner(update: Update):
+            if isinstance(update, Update) and update.new_message:
+                return update.new_message.text is not None
+            return False
+        return inner
+
+    @staticmethod
+    def private():
+        def inner(update: Update):
+            if isinstance(update, Update) and update.new_message:
+                return update.new_message.sender_type == "User"
+            return False
+        return inner
+    
+    @staticmethod
+    def chat(chat_id: str):
+        def inner(update: Update):
+            return getattr(update, "chat_id", None) == chat_id
+        return inner
+    
+    @staticmethod
+    def file():
+        def inner(update: Update):
+            if isinstance(update, Update) and update.new_message:
+                return update.new_message.file is not None
+            return False
+        return inner
+    
+    @staticmethod
+    def button(id: str):
+        def inner(update: InlineMessage):
+            if isinstance(update, InlineMessage):
+                return update.aux_data.button_id == id
+            return False
+        return inner

rubigramclient-1.3.2/rubigram/filters.py

@@ -1,50 +0,0 @@
-from rubigram.types import Update
-from typing import Union
-
-
-class filter:
-    @staticmethod
-    def text():
-        def inner(update: Update):
-            return update.new_message.text
-        return inner
-
-    @staticmethod
-    def private():
-        def inner(update: Update):
-            return update.new_message.sender_type == "User"
-        return inner
-    
-    @staticmethod
-    def command(cmd: Union[str, list[str]]):
-        def inner(update: Update):
-            if not update.new_message.text:
-                return False
-            if not update.new_message.text.startswith("/"):
-                return False
-            return update.new_message.text.lstrip("/").split()[0] == cmd
-        return inner
-    
-    @staticmethod
-    def text_filter(text: str):
-        def inner(update: Update):
-            return update.new_message.text == text if update.new_message.text else False
-        return inner
-    
-    @staticmethod
-    def chat(chat_id: str):
-        def inner(update: Update):
-            return update.chat_id == chat_id
-        return inner
-    
-    @staticmethod
-    def file():
-        def inner(update: Update):
-            return update.new_message.file
-        return inner
-    
-    @staticmethod
-    def button(id: str):
-        def inner(update: Update):
-            return update.new_message.aux_data.button_id == id if update.new_message.aux_data else False
-        return inner