maxapi-python 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

{maxapi_python-1.1.5.dist-info → maxapi_python-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.1.5
+Version: 1.1.7
 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.5.dist-info → maxapi_python-1.1.7.dist-info}/RECORD

@@ -7,22 +7,22 @@ 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=t-6xM3s8laQqBWyVdcQNV080sjfRsOtbQ-o6CKpAh20,4087
+pymax/payloads.py,sha256=494RYjE3AjRbIrme1hcb2q5WNNcoZF13elqJeSVOW0Q,4158
 pymax/static.py,sha256=wwSV1ue5s5buqWz6TvCzjzN2ZWI-wITposTRvcS151g,4738
-pymax/types.py,sha256=2huOPuGxwka_6s-Fw-7KbeAAoiFJrB7e07ArBKIRA6w,19020
+pymax/types.py,sha256=jaqhh-G2xMVVhpRCqRFat5BecPqNcZIROEGr6YICPFE,19158
 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=NFdq6VExTKR80tE9XzVBjuG_eRMKEdYSm2HZop5yPYE,7809
 pymax/mixins/handler.py,sha256=I1iNPaEgpvFnphaxV6liLwVaBCJ8sN6-h7908-_tPFk,2104
-pymax/mixins/message.py,sha256=GtwhoZaX2JPadhE9wq7M0YHBV1V2jbBIFwtQVIWP8sY,12896
+pymax/mixins/message.py,sha256=sIDNpLfCPCPJNq9kZNbNTSnAIs810WI4-E9VpJeGcRU,13386
 pymax/mixins/self.py,sha256=V0gbkY3jfX9fnd7v06n4_s7P3HTPcS1KNPqUzA0vNi8,1169
 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/user.py,sha256=VgAylqEeWMzgPaScakozZ1Wx0NwEnwVJLt1DtUbWaoM,4276
 pymax/mixins/websocket.py,sha256=L958bXTYh6U89jnmd0VWIUVtmJweUVFOMqjEuH8jWGo,10079
-maxapi_python-1.1.5.dist-info/METADATA,sha256=k2lznWoJb4fgMJg_abFlOXE064a5_eZjbMDknokgZh8,5930
-maxapi_python-1.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-maxapi_python-1.1.5.dist-info/licenses/LICENSE,sha256=oe-AGp86WMKawV4KmqF28Q0m-kGAhPfAOPrEUm4MnVw,1064
-maxapi_python-1.1.5.dist-info/RECORD,,
+maxapi_python-1.1.7.dist-info/METADATA,sha256=WRYdT7ZWOChOvAnNW6R5TK-gu8Q71MC46jL9j5fmBP0,5930
+maxapi_python-1.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+maxapi_python-1.1.7.dist-info/licenses/LICENSE,sha256=oe-AGp86WMKawV4KmqF28Q0m-kGAhPfAOPrEUm4MnVw,1064
+maxapi_python-1.1.7.dist-info/RECORD,,

pymax/mixins/message.py

@@ -10,16 +10,16 @@ from pymax.payloads import (
     DeleteMessagePayload,
     EditMessagePayload,
     FetchHistoryPayload,
+    GetFilePayload,
+    GetVideoPayload,
     PinMessagePayload,
     ReplyLink,
     SendMessagePayload,
     SendMessagePayloadMessage,
     UploadPhotoPayload,
-    GetVideoPayload,
-    GetFilePayload,
 )
 from pymax.static import AttachType, Opcode
-from pymax.types import Attach, Message, FileRequest, VideoRequest
+from pymax.types import Attach, FileRequest, Message, VideoRequest
 
 
 class MessageMixin(ClientProtocol):
@@ -143,7 +143,6 @@ class MessageMixin(ClientProtocol):
             data = await self._send_and_wait(opcode=Opcode.MSG_SEND, payload=payload)
             if error := data.get("payload", {}).get("error"):
                 self.logger.error("Send message error: %s", error)
-                print(data)
                 return None
             msg = Message.from_dict(data["payload"]) if data.get("payload") else None
             self.logger.debug("send_message result: %r", msg)
@@ -286,12 +285,11 @@ class MessageMixin(ClientProtocol):
             self.logger.exception("Fetch history failed")
             return None
 
-
     async def get_video_by_id(
         self,
         chat_id: int,
         message_id: int,
-        video_id: str,
+        video_id: int,
     ) -> VideoRequest | None:
         """
         Получает видео
@@ -307,33 +305,37 @@ class MessageMixin(ClientProtocol):
             url (str): Ссылка на видео
         """
         try:
-            self.logger.info(
-                "Getting video_id=%s message_id=%s", video_id, message_id
-            )
+            self.logger.info("Getting video_id=%s message_id=%s", video_id, message_id)
 
-            payload = GetVideoPayload(
-                chat_id=chat_id,
-                message_id=message_id,
-                video_id=video_id
-            ).model_dump(by_alias=True)
+            if self.is_connected and self._socket is not None:
+                payload = GetVideoPayload(
+                    chat_id=chat_id, message_id=message_id, video_id=video_id
+                ).model_dump(by_alias=True)
+            else:
+                payload = GetVideoPayload(
+                    chat_id=chat_id, message_id=str(message_id), video_id=video_id
+                ).model_dump(by_alias=True)
 
             data = await self._send_and_wait(opcode=Opcode.VIDEO_PLAY, payload=payload)
 
             if error := data.get("payload", {}).get("error"):
                 self.logger.error("Get video error: %s", error)
-            
-            video = VideoRequest.from_dict(data["payload"]) if data.get("payload") else None 
-            self.logger.debug(" result: %r", video)
+                return
+
+            video = (
+                VideoRequest.from_dict(data["payload"]) if data.get("payload") else None
+            )
+            self.logger.debug("result: %r", video)
             return video
         except Exception:
             self.logger.exception("Get video error")
             return None
-        
+
     async def get_file_by_id(
         self,
         chat_id: int,
         message_id: int,
-        file_id: str,
+        file_id: int,
     ) -> FileRequest | None:
         """
         Получает файл
@@ -348,20 +350,28 @@ class MessageMixin(ClientProtocol):
             url (str): Ссылка на скачивание файла
         """
         try:
-            self.logger.info(
-                "Getting file_id=%s message_id=%s", file_id, message_id
+            self.logger.info("Getting file_id=%s message_id=%s", file_id, message_id)
+            if self.is_connected and self._socket is not None:
+                payload = GetFilePayload(
+                    chat_id=chat_id, message_id=message_id, file_id=file_id
+                ).model_dump(by_alias=True)
+            else:
+                payload = GetFilePayload(
+                    chat_id=chat_id, message_id=str(message_id), file_id=file_id
+                ).model_dump(by_alias=True)
+            data = await self._send_and_wait(
+                opcode=Opcode.FILE_DOWNLOAD, payload=payload
             )
-            payload = GetFilePayload(
-                chat_id=chat_id,
-                message_id=message_id,
-                file_id=file_id
-            ).model_dump(by_alias=True)
-            data = await self._send_and_wait(opcode=Opcode.FILE_DOWNLOAD, payload=payload)
+
             if error := data.get("payload", {}).get("error"):
                 self.logger.error("Get file error: %s", error)
-            file = FileRequest.from_dict(data["payload"]) if data.get("payload") else None 
+                return
+
+            file = (
+                FileRequest.from_dict(data["payload"]) if data.get("payload") else None
+            )
             self.logger.debug(" result: %r", file)
             return file
         except Exception:
             self.logger.exception("Get video error")
-            return None
+            return None

pymax/mixins/user.py

@@ -1,5 +1,5 @@
 from pymax.interfaces import ClientProtocol
-from pymax.payloads import FetchContactsPayload
+from pymax.payloads import FetchContactsPayload, SearchByPhonePayload
 from pymax.static import Opcode
 from pymax.types import User
 
@@ -80,3 +80,38 @@ class UserMixin(ClientProtocol):
         except Exception:
             self.logger.exception("Fetch users failed")
             return []
+
+    async def search_by_phone(self, phone: str) -> User | None:
+        """
+        Ищет пользователя по номеру телефона.
+
+        Args:
+            phone (str): Номер телефона.
+
+        Returns:
+            User | None: Объект User или None при ошибке.
+        """
+        try:
+            self.logger.info("Searching user by phone: %s", phone)
+
+            payload = SearchByPhonePayload(phone=phone).model_dump(by_alias=True)
+
+            data = await self._send_and_wait(
+                opcode=Opcode.CONTACT_INFO_BY_PHONE, payload=payload
+            )
+            if error := data.get("payload", {}).get("error"):
+                self.logger.error("Search by phone error: %s", error)
+                return None
+
+            user = (
+                User.from_dict(data["payload"]["contact"])
+                if data.get("payload")
+                else None
+            )
+            if user:
+                self._users[user.id] = user
+                self.logger.debug("Found user by phone: %s", user)
+            return user
+        except Exception:
+            self.logger.exception("Search by phone failed")
+            return None

pymax/payloads.py

@@ -194,12 +194,18 @@ class NavigationEventPayload(CamelModel):
 class NavigationPayload(CamelModel):
     events: list[NavigationEventPayload]
 
+
 class GetVideoPayload(CamelModel):
     chat_id: int
-    message_id: str
+    message_id: int | str
     video_id: int
 
+
 class GetFilePayload(CamelModel):
     chat_id: int
-    message_id: str
+    message_id: str | int
     file_id: int
+
+
+class SearchByPhonePayload(CamelModel):
+    phone: str

pymax/types.py

@@ -181,7 +181,7 @@ class FileRequest:
         return cls(
             unsafe=data["unsafe"],
             url=data["url"],
-    )
+        )
 
 
 class VideoRequest:
@@ -197,15 +197,16 @@ class VideoRequest:
 
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> "VideoRequest":
-
-        listdata = list(data.values()) # Костыль ✅
-
+        # listdata = list(data.values()) # Костыль ✅
+        url = [v for k, v in data.items() if k not in ("EXTERNAL", "cache")][
+            0
+        ]  # Еще больший костыль ✅
         return cls(
             external=data["EXTERNAL"],
             cache=data["cache"],
-            url=listdata[2],
-    )
-        
+            url=url,
+        )
+
 
 class Me:
     def __init__(