RubigramClient 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

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)
            

rubigram/filters.py

@@ -1,50 +1,58 @@
-from rubigram.types import Update
+from rubigram.types import Update, InlineMessage
 from typing import Union
 
 
 class filter:
     @staticmethod
-    def text():
-        def inner(update: Update):
-            return update.new_message.text
-        return inner
-
-    @staticmethod
-    def private():
+    def command(command: Union[str, list[str]], prefixes: Union[str, list[str]] = "/"):
         def inner(update: Update):
-            return update.new_message.sender_type == "User"
+            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 command(cmd: Union[str, list[str]]):
+    def text():
         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
+            if isinstance(update, Update) and update.new_message:
+                return update.new_message.text is not None
+            return False
         return inner
-    
+
     @staticmethod
-    def text_filter(text: str):
+    def private():
         def inner(update: Update):
-            return update.new_message.text == text if update.new_message.text else False
+            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 update.chat_id == chat_id
+            return getattr(update, "chat_id", None) == chat_id
         return inner
     
     @staticmethod
     def file():
         def inner(update: Update):
-            return update.new_message.file
+            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: Update):
-            return update.new_message.aux_data.button_id == id if update.new_message.aux_data else False
+        def inner(update: InlineMessage):
+            if isinstance(update, InlineMessage):
+                return update.aux_data.button_id == id
+            return False
         return inner

{rubigramclient-1.3.1.dist-info → rubigramclient-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.3.1
+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
@@ -10,7 +10,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: pydantic<3.0,>=2.0
 Dynamic: license-file
 
 # Rubigram

rubigramclient-1.3.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+rubigram/__init__.py,sha256=K1WXGcBx9-1cLmImtnruqFk91nb_6XuhY_Ud0KS_IUk,55
+rubigram/client.py,sha256=bwt5209q4wcT9nUP67KLWryWF4TWmz1r1PR1lNuM1S8,11591
+rubigram/filters.py,sha256=nvROwHxBdjokWezfAZBjRgBdJdcOcjz0IuR3BShyiJw,2153
+rubigram/types.py,sha256=GIGvTGdDURuwJ3oHPvRR7B8oJ3V1f8MDaMAqjvOOO-0,16813
+rubigramclient-1.3.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rubigramclient-1.3.3.dist-info/METADATA,sha256=JAm-gGFFLj-ea9Br1sx8GhREUYLGx-JO7dBTSbsLxKA,984
+rubigramclient-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubigramclient-1.3.3.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
+rubigramclient-1.3.3.dist-info/RECORD,,

rubigramclient-1.3.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-rubigram/__init__.py,sha256=K1WXGcBx9-1cLmImtnruqFk91nb_6XuhY_Ud0KS_IUk,55
-rubigram/client.py,sha256=5xaA_HOMQIU5HyEadUdT-WpD9CxGE0wxbwImqQg29Zw,11506
-rubigram/filters.py,sha256=HuW_Rscb02TK3Qm7jKVyvy-83FP-plIjTLTccypVniw,1468
-rubigram/types.py,sha256=GIGvTGdDURuwJ3oHPvRR7B8oJ3V1f8MDaMAqjvOOO-0,16813
-rubigramclient-1.3.1.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rubigramclient-1.3.1.dist-info/METADATA,sha256=U-bfJY1MaOHP4U81eFcVdPqQyHAocD9uMfEK02DhdBM,1019
-rubigramclient-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubigramclient-1.3.1.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
-rubigramclient-1.3.1.dist-info/RECORD,,