RubigramClient 1.6.8__py3-none-any.whl → 1.7.0__py3-none-any.whl

rubigram/client.py

@@ -36,6 +36,8 @@ class Client(Method):
         self.ROUTES = []
         self.MESSAGE_HANDLER = []
         self.INLINE_HANDLER = []
+        self.EDIT_HANDLER = []
+        self.DELETE_HANDLER = []
         self.state = StateManager()
         super().__init__(token)
         
@@ -61,6 +63,28 @@ class Client(Method):
             self.INLINE_HANDLER.append(wrapper)
             return func
         return decorator
+    
+    def on_edit_message(self, filters: Optional[Filter] = None):
+        def decorator(func: Callable) -> Callable:
+            async def wrapper(client: Client, update: Update):
+                if filters is None or await filters(update):
+                    await func(client, update)
+                    return True
+                return False
+            self.EDIT_HANDLER.append(wrapper)
+            return func
+        return decorator
+    
+    def on_delete_message(self, filters: Optional[Filter] = None):
+        def decorator(func: Callable) -> Callable:
+            async def wrapper(client: Client, update: Update):
+                if filters is None or await filters(update):
+                    await func(client, update)
+                    return True
+                return False
+            self.DELETE_HANDLER.append(wrapper)
+            return func
+        return decorator
 
     def on_create_app(self, path: str, method: str = "GET"):
         def decorator(func):
@@ -69,7 +93,19 @@ class Client(Method):
         return decorator
     
     async def dispatch(self, update: Union[Update, InlineMessage]):
-        handlers = self.MESSAGE_HANDLER if isinstance(update, Update) else self.INLINE_HANDLER
+        if isinstance(update, InlineMessage):
+            handlers = self.INLINE_HANDLER
+        else:
+            type = update.type
+            if type == "NewMessage":
+                handlers = self.MESSAGE_HANDLER
+            elif type == "UpdatedMessage":
+                handlers = self.EDIT_HANDLER
+            elif type == "RemovedMessage":
+                handlers = self.DELETE_HANDLER
+            else:
+                logging.warning("Update type invalid : {}".format(type))
+
         for handler in handlers:
             matched = await handler(self, update)
             if matched:

rubigram/enums.py

@@ -132,6 +132,4 @@ class FileType(str, Enum):
 class ChatAction(str, Enum):
     Typing = "Typing"
     Uploading = "Uploading"
-    Recording = "Recording"
-    
-    
+    Recording = "Recording"

rubigram/filters.py

@@ -25,7 +25,7 @@ class Filter:
 
 async def TEXT(message: Update):
     if isinstance(message, Update):
-        return True if message.new_message and message.new_message.text else False
+        return True if message.new_message and message.new_message.text or message.updated_message.text else False
     return False
 
 async def FILE(message: Update):
@@ -126,8 +126,12 @@ class command(Filter):
         super().__init__(self.filter)
 
     async def filter(self, update: Update):
-        if isinstance(update, Update) and update.type == "NewMessage":
-            text = update.new_message.text or ""
+        if isinstance(update, Update):
+            if update.new_message:
+                text = update.new_message.text
+            elif update.updated_message:
+                text = update.updated_message.text
+            else: return False
             text = text if self.case_sensitive else text.lower()
             return any(text.startswith(cmd) for cmd in self.cmds)
         return False
@@ -143,7 +147,7 @@ class button(Filter):
 
     async def filter(self, update: InlineMessage):
         if isinstance(update, InlineMessage):
-            text = update.text or ""
+            text = update.aux_data.button_id or ""
             text = text if self.case_sensitive else text.lower()
             return any(text.startswith(btn) for btn in self.btn_ids)
         return False
@@ -163,9 +167,7 @@ class regex(Filter):
         elif isinstance(update, InlineMessage):
             text = getattr(update, "text", "")
 
-        if text:
-            return bool(re.search(self.pattern, text))
-        return False
+        return bool(re.search(self.pattern, text)) if text else False
 
 
 class chat(Filter):

rubigram/method.py

@@ -36,19 +36,19 @@ class Method(Network):
         return response
 
     async def delete_message(self, chat_id: str, message_id: str):
-        await self.request("deleteMessage", {"chat_id": chat_id, "message_id": message_id})
+        return await self.request("deleteMessage", {"chat_id": chat_id, "message_id": message_id})
 
     async def remove_chat_keypad(self, chat_id: str):
-        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
+        return await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
 
     async def edit_chat_keypad(self, chat_id: str, chat_keypad: Keypad):
-        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.asdict()})
+        return await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.asdict()})
 
     async def edit_message_keypad(self, chat_id: str, message_id: str, inline_keypad: Keypad):
-        await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.asdict()})
+        return await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.asdict()})
 
     async def edit_message_text(self, chat_id: str, message_id: str, text: str):
-        await self.request("editMessageText", {"chat_id": chat_id, "message_id": message_id, "text": text})
+        return await self.request("editMessageText", {"chat_id": chat_id, "message_id": message_id, "text": text})
         
     async def edit_message(
         self,
@@ -306,4 +306,49 @@ class Method(Network):
     
     async def get_bot_start_messagel(self):
         bot = await self.get_me()
-        return bot.start_message
+        return bot.start_message
+    
+    # async def pin_message(self):
+    #     return
+    
+    # async def unpin_message(self):
+    #     return
+    
+    # async def ban_chat_member(self):
+    #     return
+    
+    # async def unban_chat_member(self):
+    #     return
+    
+    # async def get_chat_member(self):
+    #     return
+    
+    # async def copy_message(self):
+    #     return
+    
+    # async def edit_message_caption(self):
+    #     return
+    
+    # async def get_chat_administrators(self):
+    #     return
+    
+    # async def get_chat_member_count(self):
+    #     return
+    
+    # async def join_chat(self):
+    #     return
+    
+    # async def leave_chat(self):
+    #     return
+    
+    # async def set_chat_description(self):
+    #     return
+    
+    # async def set_chat_photo(self):
+    #     return
+    
+    # async def set_chat_title(self):
+    #     return
+    
+    # async def unpin_all_message(self):
+    #     return

rubigram/network.py

@@ -2,7 +2,6 @@ from aiohttp import ClientSession, FormData
 from typing import Any, Optional, Union
 from pathlib import Path
 from urllib.parse import urlparse
-from random import randint
 import aiofiles
 import os
 
@@ -34,7 +33,7 @@ class Network:
         async with self.session.post(self.api + method, json=json) as response:
             response.raise_for_status()
             data: dict = await response.json()
-            return data.get("data")
+            return data.get("data", {})
 
     async def getBytes(self, url: str) -> bytes:
         await self.start()