maxapi-python 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

{maxapi_python-1.1.2.dist-info → maxapi_python-1.1.4.dist-info}/METADATA

@@ -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.dist-info → maxapi_python-1.1.4.dist-info}/RECORD

@@ -3,26 +3,26 @@ pymax/core.py,sha256=6fqnP-eAgbUTM6F0Kj09TPJ3IOgvkHz5EsjJTI18r5A,7813
 pymax/crud.py,sha256=Mk-c87GItS91BlJu6INDbw1-ovXyoB2D9rXHK8voxpU,3207
 pymax/exceptions.py,sha256=msS11MD7qZPm0qZ6O8fobTm-GTldm2IA3uQLTX6eDxc,919
 pymax/files.py,sha256=Tpv-43gS7I4Pwlaimb8mZ2B-ZkF3aMsrLYT20NPaqhE,2656
-pymax/filters.py,sha256=EejNuJMmSBhw3bUqDoqXEnCnLjGy_sw5aH3Vynpxc0A,1306
+pymax/filters.py,sha256=fxC3Bl5AqrB8BSdN-CtiLWucbHCRA2IODpsOy2NagGU,1471
 pymax/interfaces.py,sha256=_D6iMQI74Gdtl6-HMoE1acRFRHeITgOZPVFpt5pvoow,2394
 pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
 pymax/navigation.py,sha256=16c1_FZrw24uFlP6W5-F8OrEQE73bkQA3HSFqTdBtgo,5725
 pymax/payloads.py,sha256=yeBRxiMq6ixUQjMBBFcBDtBpYzqqfaEII3Z1kJq8pe8,3907
 pymax/static.py,sha256=wwSV1ue5s5buqWz6TvCzjzN2ZWI-wITposTRvcS151g,4738
-pymax/types.py,sha256=SFjCG9GlFtJBDydd6pWtzFbJ6kTADZlxBIbKKRk7E1A,17820
+pymax/types.py,sha256=pC87lOfRmM33ed2LY_S2c2KJTMvWJfrkTqerTp-dluk,18179
 pymax/utils.py,sha256=F2TdoWfSwDLeh2uIcMIE_GTdXd7hU7gWti2i5P727bA,1364
 pymax/mixins/__init__.py,sha256=-PSMwTVioS-VTy-EGfV-epaKFLy58R4N2b-rX6wJf-M,649
 pymax/mixins/auth.py,sha256=vTNSZ6AunvDIMPQAvgYozpIZaCWMYiMDiabCBI7Sm6c,3079
 pymax/mixins/channel.py,sha256=Stnf63GPtlQnsMPVEC9P0oardEOz50I4DCXN5H5s1SM,823
-pymax/mixins/group.py,sha256=QJCd5MLYCVRrClcuAuRkLV3oylJRAOaGw0xUqFm2uXk,7820
+pymax/mixins/group.py,sha256=NFdq6VExTKR80tE9XzVBjuG_eRMKEdYSm2HZop5yPYE,7809
 pymax/mixins/handler.py,sha256=I1iNPaEgpvFnphaxV6liLwVaBCJ8sN6-h7908-_tPFk,2104
-pymax/mixins/message.py,sha256=0y7fO61zg9XG46SKxOPCOLMJW1LJBWfTi-PR3HjJfJo,10249
+pymax/mixins/message.py,sha256=fPQ69N-9O03BEsbhBQzHn6HTcHH3tWjR6VJtn_F2kzc,10099
 pymax/mixins/self.py,sha256=V0gbkY3jfX9fnd7v06n4_s7P3HTPcS1KNPqUzA0vNi8,1169
-pymax/mixins/socket.py,sha256=sgGxX7FmLyO3M82Nu2L-n00dCn0W2fV5TnrCipiKhaE,15738
+pymax/mixins/socket.py,sha256=UNMU1Fh9J3xDV76J2Mx8bVHXo0gcS81qocOw8MM0XXs,15643
 pymax/mixins/telemetry.py,sha256=0sQl6kvFVxobLthNAPNS9LzMrwwzZFA1xmOnvfiHWos,3522
 pymax/mixins/user.py,sha256=U-epgvLruTDHBCrLDE0N0iWeOypGE1_SU8cKD3TE90U,3045
-pymax/mixins/websocket.py,sha256=ndgcezJ1xqYCpaxc17rXxiXDQrTwTmtrgvx_d1H2Pcc,10094
-maxapi_python-1.1.2.dist-info/METADATA,sha256=qkRDjZ3klgt7LkzNjP6d-0w06hlQ2ph914NxphMIIWw,5930
-maxapi_python-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-maxapi_python-1.1.2.dist-info/licenses/LICENSE,sha256=oe-AGp86WMKawV4KmqF28Q0m-kGAhPfAOPrEUm4MnVw,1064
-maxapi_python-1.1.2.dist-info/RECORD,,
+pymax/mixins/websocket.py,sha256=L958bXTYh6U89jnmd0VWIUVtmJweUVFOMqjEuH8jWGo,10079
+maxapi_python-1.1.4.dist-info/METADATA,sha256=DziHH8WPX4Ed1xzJ8at5MEGp0kMcKORFGNlKW1bb_-0,5930
+maxapi_python-1.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+maxapi_python-1.1.4.dist-info/licenses/LICENSE,sha256=oe-AGp86WMKawV4KmqF28Q0m-kGAhPfAOPrEUm4MnVw,1064
+maxapi_python-1.1.4.dist-info/RECORD,,

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(

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)

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:

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)

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: заглушка! сделать отдельный хендлер

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