fix: support web message deletion events

Author: ink-developer

src/pymax/dispatch/resolvers.py

@@ -45,6 +45,8 @@ def resolve_message(frame: InboundFrame) -> EventType | None:
 
         if model.status == MessageStatus.EDITED:
             return EventType.MESSAGE_EDIT
+        if model.status == MessageStatus.REMOVED:
+            return EventType.MESSAGE_DELETE
         else:
             return EventType.MESSAGE_NEW
     except ValidationError:

src/pymax/types/events/message.py

@@ -1,15 +1,19 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from logging import getLogger
+from typing import TYPE_CHECKING, Any
 
-from pydantic import PrivateAttr
+from pydantic import PrivateAttr, model_validator
 
 from pymax.types.domain import Chat
 from pymax.types.domain.base import CamelModel
+from pymax.types.domain.message import Message
 
 if TYPE_CHECKING:
     from pymax.api.messages import MessageService
 
+logger = getLogger(__name__)
+
 
 class MessageDeleteEvent(CamelModel):
     """Событие удаления сообщений.
@@ -25,12 +29,45 @@ class MessageDeleteEvent(CamelModel):
     :vartype ttl: bool
     """
 
-    chat: Chat
     message_ids: list[int]
+    chat_id: int
+    chat: Chat | None = None
+    message: Message | None = None
     ttl: bool = False
 
     _actions: MessageService | None = PrivateAttr(default=None)
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_payload(cls, data: Any) -> Any:
+        # i really hate it cause of stupid web version thats send other type
+        # of payload (128, expect 142)
+        # TODO: impl it in the better way maybe
+
+        if not isinstance(data, dict):
+            return data
+
+        if "chat" in data:  # case opcode == 142
+            chat = data["chat"]
+
+            return {
+                "chat": chat,
+                "ttl": data.get("ttl"),
+                "messageIds": data["messageIds"],
+                "chatId": chat["id"],
+            }
+        if "message" in data:  # case opcode == 128
+            message = data["message"]
+            return {
+                "chatId": data["chatId"],
+                "message": message,
+                "ttl": data["ttl"],
+                "messageIds": [message["id"]],
+            }
+
+        logger.warning("Illegal state during MessageDeleteEvent validation. Starting fallback")
+        return data  # stupid fallback but who cares. Still better than KeyError
+
     def bind(self, actions: MessageService) -> MessageDeleteEvent:
         """Привязывает сервис сообщений к событию удаления."""
         self._actions = actions

tests/dispatch/test_dispatcher.py

@@ -86,7 +86,11 @@ async def on_file(signal, _client):
     )
     await dispatcher.dispatch(
         frame(
-            {"chat": chat_payload(5), "messageIds": [1, 2]},
+            {
+                "chat": chat_payload(5),
+                "messageIds": [1, 2],
+                "ttl": False,
+            },
             opcode=Opcode.NOTIF_MSG_DELETE,
             cmd=Command.REQUEST,
         )
@@ -102,6 +106,58 @@ async def on_file(signal, _client):
     ]
 
 
+@pytest.mark.asyncio
+async def test_dispatcher_maps_web_removed_message_to_delete_event() -> None:
+    app = FakeApp()
+    router: Router[str] = Router()
+    dispatcher: Dispatcher[str] = Dispatcher(app, router)
+    dispatcher.bind_client("client")
+    seen: list[tuple[int, list[int], int | None, bool, bool]] = []
+
+    @router.on_message_delete()
+    async def on_delete(event, _client):
+        seen.append(
+            (
+                event.chat_id,
+                event.message_ids,
+                event.message.id if event.message is not None else None,
+                event.ttl,
+                event.message is not None and event.message._actions is app.api.messages,
+            )
+        )
+
+    await dispatcher.dispatch(
+        frame(
+            {
+                "chatId": 0,
+                "message": {
+                    "id": "116738762887754287",
+                    "time": 1781292158321,
+                    "type": "USER",
+                    "status": "REMOVED",
+                    "text": "deleted",
+                    "attaches": [],
+                },
+                "ttl": False,
+                "unread": 0,
+                "mark": 1781292158321,
+            },
+            opcode=Opcode.NOTIF_MESSAGE,
+            cmd=Command.REQUEST,
+        )
+    )
+
+    assert seen == [
+        (
+            0,
+            [116738762887754287],
+            116738762887754287,
+            False,
+            True,
+        )
+    ]
+
+
 @pytest.mark.asyncio
 async def test_dispatcher_requires_bound_client_for_callbacks() -> None:
     dispatcher: Dispatcher[str] = Dispatcher(FakeApp())