maxapi-python 1.1.2__tar.gz → 1.1.4__tar.gz

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.1.2
+Version: 1.1.4
 Summary: Python wrapper для API мессенджера Max
 Project-URL: Homepage, https://github.com/noxzion/PyMax
 Project-URL: Repository, https://github.com/noxzion/PyMax

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/examples/example.py

@@ -9,8 +9,8 @@ from pymax.static import AttachType
 phone = "+1234567890"
 
 
-# client = MaxClient(phone=phone, work_dir="cache")
-client = SocketMaxClient(phone=phone, work_dir="cache")
+client = MaxClient(phone=phone, work_dir="cache")
+# client = SocketMaxClient(phone=phone, work_dir="cache")
 
 
 async def main() -> None:
@@ -38,7 +38,7 @@ async def main() -> None:
     await client.close()
 
 
-@client.on_message(filter=Filter(text=["Привет"]))
+@client.on_message(filter=Filter(chat_id=0))
 async def handle_message(message: Message) -> None:
     print(str(message.sender) + ": " + message.text)
 
@@ -50,22 +50,24 @@ async def handle_start() -> None:
     if history:
         for message in history:
             user_id = message.sender
+            chat_id = message.chat_id
+            print(chat_id)
             user = await client.get_user(user_id)
 
             if user:
                 print(f"{user.names[0].name}: {message.text}")
 
-    print(client.me.names[0].first_name)
-    user = await client.get_user(client.me.id)
+    # print(client.me.names[0].first_name)
+    # user = await client.get_user(client.me.id)
 
-    print(user.names[0].first_name)
+    # print(user.names[0].first_name)
 
-    photo1 = Photo(path="tests/test.jpeg")
-    photo2 = Photo(path="tests/test.jpg")
+    # photo1 = Photo(path="tests/test.jpeg")
+    # photo2 = Photo(path="tests/test.jpg")
 
-    await client.send_message(
-        "Hello with photo!", chat_id=0, photos=[photo1, photo2], notify=True
-    )
+    # await client.send_message(
+    #     "Hello with photo!", chat_id=0, photos=[photo1, photo2], notify=True
+    # )
 
 
 if __name__ == "__main__":

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "maxapi-python"
-version = "1.1.2"
+version = "1.1.4"
 description = "Python wrapper для API мессенджера Max"
 readme = "README.md"
 requires-python = ">=3.10"

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/filters.py

@@ -5,6 +5,7 @@ from .types import Message
 class Filter:
     def __init__(
         self,
+        chat_id: int | None = None,
         user_id: int | None = None,
         text: list[str] | None = None,
         status: MessageStatus | str | None = None,
@@ -12,6 +13,7 @@ class Filter:
         text_contains: str | None = None,
         reaction_info: bool | None = None,
     ) -> None:
+        self.chat_id = chat_id
         self.user_id = user_id
         self.text = text
         self.status = status
@@ -20,6 +22,8 @@ class Filter:
         self.text_contains = text_contains
 
     def match(self, message: Message) -> bool:
+        if self.chat_id is not None and message.chat_id != self.chat_id:
+            return False
         if self.user_id is not None and message.sender != self.user_id:
             return False
         if self.text is not None and any(

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/mixins/group.py

@@ -51,7 +51,7 @@ class GroupMixin(ClientProtocol):
                 return None
 
             chat = Chat.from_dict(data["payload"]["chat"])
-            message = Message.from_dict(data["payload"]["message"])
+            message = Message.from_dict(data["payload"])
 
             if chat:
                 cached_chat = await self._get_chat(chat.id)

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/mixins/message.py

@@ -143,11 +143,7 @@ class MessageMixin(ClientProtocol):
                 self.logger.error("Send message error: %s", error)
                 print(data)
                 return None
-            msg = (
-                Message.from_dict(data["payload"]["message"])
-                if data.get("payload")
-                else None
-            )
+            msg = Message.from_dict(data["payload"]) if data.get("payload") else None
             self.logger.debug("send_message result: %r", msg)
             return msg
         except Exception:
@@ -174,11 +170,7 @@ class MessageMixin(ClientProtocol):
             data = await self._send_and_wait(opcode=Opcode.MSG_EDIT, payload=payload)
             if error := data.get("payload", {}).get("error"):
                 self.logger.error("Edit message error: %s", error)
-            msg = (
-                Message.from_dict(data["payload"]["message"])
-                if data.get("payload")
-                else None
-            )
+            msg = Message.from_dict(data["payload"]) if data.get("payload") else None
             self.logger.debug("edit_message result: %r", msg)
             return msg
         except Exception:

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/mixins/socket.py

@@ -214,9 +214,7 @@ Socket connections may be unstable, SSL issues are possible.
                                 for handler, filter in self._on_message_handlers:
                                     payload = data_item.get("payload", {})
                                     msg_dict = (
-                                        payload.get("message")
-                                        if isinstance(payload, dict)
-                                        else None
+                                        payload if isinstance(payload, dict) else None
                                     )
                                     msg = (
                                         Message.from_dict(msg_dict)

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/mixins/websocket.py

@@ -118,7 +118,7 @@ class WebSocketMixin(ClientProtocol):
                         try:
                             for handler, filter in self._on_message_handlers:
                                 payload = data.get("payload", {})
-                                msg = Message.from_dict(payload.get("message"))
+                                msg = Message.from_dict(payload)
                                 if msg:
                                     if msg.status:
                                         continue  # TODO: заглушка! сделать отдельный хендлер

{maxapi_python-1.1.2 → maxapi_python-1.1.4}/src/pymax/types.py

@@ -47,7 +47,7 @@ class PhotoAttach:
         width: int,
         photo_id: int,
         photo_token: str,
-        preview_data: str,
+        preview_data: str | None,
         type: AttachType,
     ) -> None:
         self.base_url = base_url
@@ -66,7 +66,7 @@ class PhotoAttach:
             width=data["width"],
             photo_id=data["photoId"],
             photo_token=data["photoToken"],
-            preview_data=data["previewData"],
+            preview_data=data.get("previewData"),
             type=AttachType(data["_type"]),
         )
 
@@ -230,6 +230,7 @@ class Element:
 class Message:
     def __init__(
         self,
+        chat_id: int | None,
         sender: int | None,
         elements: list[Element] | None,
         reaction_info: dict[str, Any] | None,
@@ -241,6 +242,7 @@ class Message:
         type: MessageType | str,
         attaches: list[PhotoAttach | VideoAttach | FileAttach],
     ) -> None:
+        self.chat_id = chat_id
         self.sender = sender
         self.elements = elements
         self.options = options
@@ -254,8 +256,9 @@ class Message:
 
     @classmethod
     def from_dict(cls, data: dict[Any, Any]) -> "Message":
+        message = data["message"] if data.get("message") else data
         attaches = []
-        for a in data.get("attaches", []):
+        for a in message.get("attaches", []):
             if a["_type"] == AttachType.PHOTO:
                 attaches.append(PhotoAttach.from_dict(a))
             elif a["_type"] == AttachType.VIDEO:
@@ -263,16 +266,17 @@ class Message:
             elif a["_type"] == AttachType.FILE:
                 attaches.append(FileAttach.from_dict(a))
         return cls(
-            sender=data.get("sender"),
-            elements=[Element.from_dict(e) for e in data.get("elements", [])],
-            options=data.get("options"),
-            id=data["id"],
-            time=data["time"],
-            text=data["text"],
-            type=data["type"],
+            chat_id=data.get("chatId"),
+            sender=message.get("sender"),
+            elements=[Element.from_dict(e) for e in message.get("elements", [])],
+            options=message.get("options"),
+            id=message["id"],
+            time=message["time"],
+            text=message["text"],
+            type=message["type"],
             attaches=attaches,
-            status=data.get("status"),
-            reaction_info=data.get("reactionInfo"),
+            status=message.get("status"),
+            reaction_info=message.get("reactionInfo"),
         )
 
     @override
@@ -280,6 +284,7 @@ class Message:
         return (
             f"Message(id={self.id!r}, sender={self.sender!r}, text={self.text!r}, "
             f"type={self.type!r}, status={self.status!r}, elements={self.elements!r})"
+            f"attaches={self.attaches!r}, chat_id={self.chat_id!r}, time={self.time!r}, options={self.options!r}, reactionInfo={self.reactionInfo!r})"
         )
 
     @override