change rule

nonebot/adapters/__init__.py

@@ -6,7 +6,7 @@ from functools import reduce, partial
 from dataclasses import dataclass, field
 
 from nonebot.config import Config
-from nonebot.typing import Driver, WebSocket
+from nonebot.typing import Driver, Message, WebSocket
 from nonebot.typing import Any, Dict, Union, Optional, Callable, Iterable, Awaitable
 
 
@@ -83,6 +83,26 @@ class BaseEvent(abc.ABC):
     def sub_type(self, value) -> None:
         raise NotImplementedError
 
+    @property
+    @abc.abstractmethod
+    def message(self) -> Optional[Message]:
+        raise NotImplementedError
+
+    @message.setter
+    @abc.abstractmethod
+    def message(self, value) -> None:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def raw_message(self) -> Optional[str]:
+        raise NotImplementedError
+
+    @raw_message.setter
+    @abc.abstractmethod
+    def raw_message(self, value) -> None:
+        raise NotImplementedError
+
 
 @dataclass
 class BaseMessageSegment(abc.ABC):

nonebot/adapters/cqhttp.py

@@ -193,6 +193,26 @@ class Event(BaseEvent):
     def sub_type(self, value) -> None:
         self._raw_event["sub_type"] = value
 
+    @property
+    @overrides(BaseEvent)
+    def message(self) -> Optional["Message"]:
+        return self._raw_event.get("message")
+
+    @message.setter
+    @overrides(BaseEvent)
+    def message(self, value) -> None:
+        self._raw_event["message"] = value
+
+    @property
+    @overrides(BaseEvent)
+    def raw_message(self) -> Optional[str]:
+        return self._raw_event.get("raw_message")
+
+    @raw_message.setter
+    @overrides(BaseEvent)
+    def raw_message(self, value) -> None:
+        self._raw_event["raw_message"] = value
+
 
 class MessageSegment(BaseMessageSegment):