Добавил загрузку фото профиля

Author: ink-developer

examples/example.py

@@ -6,12 +6,12 @@
 
 import pymax
 from pymax import MaxClient, Message, ReactionInfo, SocketMaxClient
-from pymax.files import File, Video
+from pymax.files import File, Photo, Video
 from pymax.payloads import UserAgentPayload
 from pymax.static.enum import AttachType, Opcode
 from pymax.types import Chat
 
-phone = "+7903223111"
+phone = "+79291250363"
 headers = UserAgentPayload(device_type="WEB")
 
 client = MaxClient(
@@ -24,34 +24,16 @@
 client.logger.setLevel(logging.INFO)
 
 
-@client.on_raw_receive
-async def handle_raw_receive(data: dict[str, Any]) -> None:
-    print(f"Raw data received: {data}")
-
-
-@client.task(seconds=10)
-async def periodic_task() -> None:
-    # print(f"Periodic task executed at {datetime.datetime.now()}")
-    ...
-
-
 @client.on_start
 async def handle_start() -> None:
     print(f"Client started as {client.me.names[0].first_name}!")
 
-    chat_id = -1
-    max_messages = 1000
-    messages = []
-    from_time = int(time() * 1000)
-    while len(messages) < max_messages:
-        r = await client.fetch_history(chat_id=chat_id, from_time=from_time, backward=30)
-        if not r:
-            break
-        from_time = r[0].time
-        messages.extend(r)
-        print(f"First message time: {from_time}, id: {r[0].id}, text: {r[0].text}")
-        print(f"Last message time: {from_time}, id: {r[-1].id}, text: {r[-1].text}")
-        print(f"Loaded {len(messages)}/{max_messages} messages...")
+    photo = Photo(path="/tests2/test.png")
+
+    await client.change_profile(
+        first_name="Dima",
+        photo=photo,
+    )
     # channel = await client.resolve_channel_by_name("fm92")
     # if channel:
     #     print(f"Resolved channel by name: {channel.title}, ID: {channel.id}")

src/pymax/files.py

@@ -46,6 +46,11 @@ class Photo(BaseFile):
     }  # FIXME: костыль ✅
 
     def __init__(self, url: str | None = None, path: str | None = None) -> None:
+        if path:
+            self.file_name = Path(path).name
+        elif url:
+            self.file_name = Path(url).name
+
         super().__init__(url, path)
 
     def validate_photo(self) -> tuple[str, str] | None:

src/pymax/mixins/self.py

@@ -1,7 +1,13 @@
+import urllib.parse
+from http import HTTPStatus
 from typing import Any
+from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
+import aiohttp
+
 from pymax.exceptions import Error
+from pymax.files import Photo
 from pymax.interfaces import ClientProtocol
 from pymax.mixins.utils import MixinsUtils
 from pymax.payloads import (
@@ -10,17 +16,60 @@
     DeleteFolderPayload,
     GetFolderPayload,
     UpdateFolderPayload,
+    UploadPayload,
 )
 from pymax.static.enum import Opcode
-from pymax.types import Folder, FolderList, FolderUpdate
+from pymax.types import Folder, FolderList, FolderUpdate, Me
 
 
 class SelfMixin(ClientProtocol):
+    async def _request_photo_upload_url(self) -> str:
+        self.logger.info("Requesting profile photo upload URL")
+
+        data = await self._send_and_wait(
+            opcode=Opcode.PHOTO_UPLOAD,
+            payload=UploadPayload(profile=True).model_dump(by_alias=True),
+        )
+
+        if data.get("payload", {}).get("error"):
+            MixinsUtils.handle_error(data)
+
+        return data["payload"]["url"]
+
+    async def _upload_profile_photo(self, upload_url: str, photo: Photo) -> str:
+        self.logger.info("Uploading profile photo")
+
+        parsed_url = urlparse(upload_url)
+        photo_id = parse_qs(parsed_url.query)["photoIds"][0]
+
+        form = aiohttp.FormData()
+        form.add_field(
+            "file",
+            await photo.read(),
+            filename=photo.file_name,
+        )
+
+        async with (
+            aiohttp.ClientSession() as session,
+            session.post(upload_url, data=form) as response,
+        ):
+            if response.status != HTTPStatus.OK:
+                raise Error(
+                    "Failed to upload profile photo.", message="UploadError", title="Upload Error"
+                )
+
+            self.logger.info("Upload successful")
+            data = await response.json()
+            return data["photos"][photo_id][
+                "token"
+            ]  # TODO: сделать нормальную типизацию и чекнинг ответа
+
     async def change_profile(
         self,
         first_name: str,
         last_name: str | None = None,
         description: str | None = None,
+        photo: Photo | None = None,
     ) -> bool:
         """
         Изменяет информацию профиля текущего пользователя.
@@ -35,20 +84,36 @@ async def change_profile(
         :rtype: bool
         """
 
-        payload = ChangeProfilePayload(
-            first_name=first_name,
-            last_name=last_name,
-            description=description,
-        ).model_dump(
-            by_alias=True,
-            exclude_none=True,
-        )
+        if photo:
+            upload_url = await self._request_photo_upload_url()
+            photo_token = await self._upload_profile_photo(upload_url, photo)
+
+            payload = ChangeProfilePayload(
+                first_name=first_name,
+                last_name=last_name,
+                description=description,
+                photo_token=photo_token,
+            ).model_dump(
+                by_alias=True,
+                exclude_none=True,
+            )
+        else:
+            payload = ChangeProfilePayload(
+                first_name=first_name,
+                last_name=last_name,
+                description=description,
+            ).model_dump(
+                by_alias=True,
+                exclude_none=True,
+            )
 
         data = await self._send_and_wait(opcode=Opcode.PROFILE, payload=payload)
 
         if data.get("payload", {}).get("error"):
             MixinsUtils.handle_error(data)
 
+        self.me = Me.from_dict(data["payload"]["profile"]["contact"])
+
         return True
 
     async def create_folder(

src/pymax/payloads.py

@@ -97,6 +97,7 @@ class ReplyLink(CamelModel):
 
 class UploadPayload(CamelModel):
     count: int = 1
+    profile: bool = False
 
 
 class AttachPhotoPayload(CamelModel):
@@ -168,6 +169,8 @@ class ChangeProfilePayload(CamelModel):
     first_name: str
     last_name: str | None = None
     description: str | None = None
+    photo_token: str | None = None
+    avatar_type: str = "USER_AVATAR"  # TODO: вынести гада в энам
 
 
 class ResolveLinkPayload(CamelModel):

src/pymax/types.py

@@ -47,7 +47,7 @@ class Name:
     def __init__(
         self,
         name: str | None,
-        first_name: None,
+        first_name: None | str,
         last_name: str | None,
         type: str | None,
     ) -> None: