add permission and command

nonebot/adapters/__init__.py

@@ -83,6 +83,16 @@ class BaseEvent(abc.ABC):
     def sub_type(self, value) -> None:
         raise NotImplementedError
 
+    @property
+    @abc.abstractmethod
+    def user_id(self) -> Optional[int]:
+        raise NotImplementedError
+
+    @user_id.setter
+    @abc.abstractmethod
+    def user_id(self, value) -> None:
+        raise NotImplementedError
+
     @property
     @abc.abstractmethod
     def message(self) -> Optional[Message]:
@@ -103,6 +113,21 @@ class BaseEvent(abc.ABC):
     def raw_message(self, value) -> None:
         raise NotImplementedError
 
+    @property
+    @abc.abstractmethod
+    def plain_text(self) -> Optional[str]:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def sender(self) -> Optional[dict]:
+        raise NotImplementedError
+
+    @sender.setter
+    @abc.abstractmethod
+    def sender(self, value) -> None:
+        raise NotImplementedError
+
 
 @dataclass
 class BaseMessageSegment(abc.ABC):

nonebot/adapters/cqhttp.py

@@ -142,7 +142,10 @@ class Bot(BaseBot):
 
             try:
                 async with httpx.AsyncClient(headers=headers) as client:
-                    response = await client.post(api_root + api, json=data)
+                    response = await client.post(
+                        api_root + api,
+                        json=data,
+                        timeout=self.config.api_timeout)
 
                 if 200 <= response.status_code < 300:
                     result = response.json()
@@ -193,6 +196,16 @@ class Event(BaseEvent):
     def sub_type(self, value) -> None:
         self._raw_event["sub_type"] = value
 
+    @property
+    @overrides(BaseEvent)
+    def user_id(self) -> Optional[int]:
+        return self._raw_event.get("user_id")
+
+    @user_id.setter
+    @overrides(BaseEvent)
+    def user_id(self, value) -> None:
+        self._raw_event["user_id"] = value
+
     @property
     @overrides(BaseEvent)
     def message(self) -> Optional["Message"]:
@@ -213,6 +226,21 @@ class Event(BaseEvent):
     def raw_message(self, value) -> None:
         self._raw_event["raw_message"] = value
 
+    @property
+    @overrides(BaseEvent)
+    def plain_text(self) -> Optional[str]:
+        return self.message and self.message.extract_plain_text()
+
+    @property
+    @overrides(BaseEvent)
+    def sender(self) -> Optional[dict]:
+        return self._raw_event.get("sender")
+
+    @sender.setter
+    @overrides(BaseEvent)
+    def sender(self, value) -> None:
+        self._raw_event["sender"] = value
+
 
 class MessageSegment(BaseMessageSegment):