maxapi-python 1.1.8__tar.gz → 1.1.10__tar.gz

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.1.8
+Version: 1.1.10
 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.10/examples/example.py

@@ -0,0 +1,68 @@
+import asyncio
+import logging
+
+from pymax import MaxClient, Message, SocketMaxClient
+from pymax.files import Photo
+from pymax.filters import Filter
+from pymax.static import AttachType
+
+phone = "+1234567890"
+
+
+client = MaxClient(phone=phone, work_dir="cache")
+# client = SocketMaxClient(phone=phone, work_dir="cache")
+
+
+@client.on_message(filter=Filter(chat_id=0))
+async def handle_message(message: Message) -> None:
+    print(str(message.sender) + ": " + message.text)
+
+
+@client.on_start
+async def handle_start() -> None:
+    print("Client started successfully!")
+    sessions = await client.get_sessions()
+    for session in sessions:
+        print(session.client)
+    # print(client.dialogs)
+    chat = await client.join_group("join/sdfdfsfdf")
+    print(chat.title)
+    # if history:
+    #     for message in history:
+    #         if message.link:
+    #             print(message.link.chat_id)
+    #             print(message.link.message.text)
+    # for attach in message.attaches:
+    #     if attach.type == AttachType.CONTROL:
+    #         print(attach.event)
+    #         print(attach.extra)
+    # if attach.type == AttachType.VIDEO:
+    #     print(message)
+    #     vid = await client.get_video_by_id(
+    #         chat_id=0,
+    #         video_id=attach.video_id,
+    #         message_id=message.id,
+    #     )
+    #     print(vid.url)
+    # elif attach.type == AttachType.FILE:
+    #     file = await client.get_file_by_id(
+    #         chat_id=0,
+    #         file_id=attach.file_id,
+    #         message_id=message.id,
+    #     )
+    #     print(file.url)
+    # print(client.me.names[0].first_name)
+    # user = await client.get_user(client.me.id)
+
+    # print(user.names[0].first_name)
+
+    # 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
+    # )
+
+
+if __name__ == "__main__":
+    asyncio.run(client.start())

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/pyproject.toml

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

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/src/pymax/mixins/__init__.py

@@ -1,5 +1,6 @@
 from .auth import AuthMixin
 from .channel import ChannelMixin
+from .group import GroupMixin
 from .handler import HandlerMixin
 from .message import MessageMixin
 from .self import SelfMixin
@@ -17,6 +18,7 @@ class ApiMixin(
     SelfMixin,
     MessageMixin,
     TelemetryMixin,
+    GroupMixin,
 ):
     pass
 

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/src/pymax/mixins/group.py

@@ -9,6 +9,7 @@ from pymax.payloads import (
     CreateGroupMessage,
     CreateGroupPayload,
     InviteUsersPayload,
+    JoinGroupPayload,
     RemoveUsersPayload,
 )
 from pymax.static import Opcode
@@ -218,3 +219,46 @@ class GroupMixin(ClientProtocol):
 
         except Exception:
             self.logger.exception("Change group profile failed")
+
+    def _process_chat_join_link(self, link: str) -> str | None:
+        idx = link.find("join/")
+        return link[idx:] if idx != -1 else None
+
+    async def join_group(self, link: str) -> Chat | None:
+        """
+        Вступает в группу по ссылке
+
+        Args:
+            link (str): Ссылка на группу.
+
+        Returns:
+            bool: True, если успешно вступил в группу
+        """
+        try:
+            proceed_link = self._process_chat_join_link(link)
+            if proceed_link is None:
+                self.logger.error("Invalid group link: %s", link)
+                return None
+
+            payload = JoinGroupPayload(link=proceed_link).model_dump(by_alias=True)
+
+            data = await self._send_and_wait(opcode=Opcode.CHAT_JOIN, payload=payload)
+
+            if error := data.get("payload", {}).get("error"):
+                self.logger.error("Join group error: %s", error)
+                return None
+
+            chat = Chat.from_dict(data["payload"]["chat"])
+            if chat:
+                cached_chat = await self._get_chat(chat.id)
+                if cached_chat is None:
+                    self.chats.append(chat)
+                else:
+                    idx = self.chats.index(cached_chat)
+                    self.chats[idx] = chat
+
+            return chat
+
+        except Exception:
+            self.logger.exception("Join group failed")
+            return None

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/src/pymax/mixins/user.py

@@ -1,7 +1,7 @@
 from pymax.interfaces import ClientProtocol
 from pymax.payloads import FetchContactsPayload, SearchByPhonePayload
 from pymax.static import Opcode
-from pymax.types import User
+from pymax.types import Session, User
 
 
 class UserMixin(ClientProtocol):
@@ -115,3 +115,19 @@ class UserMixin(ClientProtocol):
         except Exception:
             self.logger.exception("Search by phone failed")
             return None
+
+    async def get_sessions(self) -> list[Session] | None:
+        try:
+            self.logger.info("Fetching sessions")
+
+            data = await self._send_and_wait(opcode=Opcode.SESSIONS_INFO, payload={})
+
+            if error := data.get("payload", {}).get("error"):
+                self.logger.error("Fetching sessions error: %s", error)
+                return None
+
+            return [Session.from_dict(s) for s in data["payload"].get("sessions", [])]
+
+        except Exception:
+            self.logger.exception("Fetching sessions failed")
+            return None

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/src/pymax/payloads.py

@@ -209,3 +209,7 @@ class GetFilePayload(CamelModel):
 
 class SearchByPhonePayload(CamelModel):
     phone: str
+
+
+class JoinGroupPayload(CamelModel):
+    link: str

{maxapi_python-1.1.8 → maxapi_python-1.1.10}/src/pymax/types.py

@@ -294,6 +294,29 @@ class Element:
         return f"{self.type}({self.length})"
 
 
+class MessageLink:
+    def __init__(self, chat_id: int, message: "Message", type: str) -> None:
+        self.chat_id = chat_id
+        self.message = message
+        self.type = type
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> "MessageLink":
+        return cls(
+            chat_id=data["chatId"],
+            message=Message.from_dict(data["message"]),
+            type=data["type"],
+        )
+
+    @override
+    def __repr__(self) -> str:
+        return f"MessageLink(chat_id={self.chat_id!r}, message={self.message!r}, type={self.type!r})"
+
+    @override
+    def __str__(self) -> str:
+        return f"MessageLink: {self.chat_id}/{self.message.id}"
+
+
 class Message:
     def __init__(
         self,
@@ -304,6 +327,7 @@ class Message:
         options: int | None,
         id: int,
         time: int,
+        link: MessageLink | None,
         text: str,
         status: MessageStatus | str | None,
         type: MessageType | str,
@@ -319,6 +343,7 @@ class Message:
         self.type = type
         self.attaches = attaches
         self.status = status
+        self.link = link
         self.reactionInfo = reaction_info
 
     @classmethod
@@ -345,6 +370,9 @@ class Message:
             type=message["type"],
             attaches=attaches,
             status=message.get("status"),
+            link=MessageLink.from_dict(message.get("link"))
+            if message.get("link")
+            else None,
             reaction_info=message.get("reactionInfo"),
         )
 
@@ -642,3 +670,40 @@ class Attach:  # УБРАТЬ ГАДА!!! или нет...
     @override
     def __str__(self) -> str:
         return f"Attach: {self.type}"
+
+
+class Session:
+    def __init__(
+        self,
+        client: str,
+        info: str,
+        location: str,
+        time: int,
+        current: bool | None = None,
+    ) -> None:
+        self.client = client
+        self.info = info
+        self.location = location
+        self.time = time
+        self.current = current if current is not None else False
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> "Session":
+        return cls(
+            client=data["client"],
+            info=data["info"],
+            location=data["location"],
+            time=data["time"],
+            current=data.get("current"),
+        )
+
+    @override
+    def __repr__(self) -> str:
+        return (
+            f"Session(client={self.client!r}, info={self.info!r}, "
+            f"location={self.location!r}, time={self.time!r}, current={self.current!r})"
+        )
+
+    @override
+    def __str__(self) -> str:
+        return f"Session: {self.client} from {self.location} at {self.time} (current={self.current})"

maxapi_python-1.1.8/examples/example.py

@@ -1,62 +0,0 @@
-import asyncio
-import logging
-
-from pymax import MaxClient, Message, SocketMaxClient
-from pymax.files import Photo
-from pymax.filters import Filter
-from pymax.static import AttachType
-
-phone = "+1234567890"
-
-
-client = MaxClient(phone=phone, work_dir="cache")
-# client = SocketMaxClient(phone=phone, work_dir="cache")
-
-
-@client.on_message(filter=Filter(chat_id=0))
-async def handle_message(message: Message) -> None:
-    print(str(message.sender) + ": " + message.text)
-
-
-@client.on_start
-async def handle_start() -> None:
-    print("Client started successfully!")
-    # print(client.dialogs)
-    history = await client.fetch_history(chat_id=0)
-    if history:
-        for message in history:
-            if message.attaches:
-                for attach in message.attaches:
-                    if attach.type == AttachType.CONTROL:
-                        print(attach.event)
-                        print(attach.extra)
-                    # if attach.type == AttachType.VIDEO:
-                    #     print(message)
-                    #     vid = await client.get_video_by_id(
-                    #         chat_id=0,
-                    #         video_id=attach.video_id,
-                    #         message_id=message.id,
-                    #     )
-                    #     print(vid.url)
-                    # elif attach.type == AttachType.FILE:
-                    #     file = await client.get_file_by_id(
-                    #         chat_id=0,
-                    #         file_id=attach.file_id,
-                    #         message_id=message.id,
-                    #     )
-                    #     print(file.url)
-    # print(client.me.names[0].first_name)
-    # user = await client.get_user(client.me.id)
-
-    # print(user.names[0].first_name)
-
-    # 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
-    # )
-
-
-if __name__ == "__main__":
-    asyncio.run(client.start())