feat: 加群退群事件和主动消息设置事件

Author: liaoyanglay

botpy/api.py

@@ -1469,6 +1469,7 @@ async def post_group_file(
         上传/发送群聊图片
 
         Args:
+          group_openid (str): 您要将消息发送到的群的 ID
           file_type (int): 媒体类型：1 图片png/jpg，2 视频mp4，3 语音silk，4 文件（暂不开放）
           url (str): 需要发送媒体资源的url
           srv_send_msg (bool): 设置 true 会直接发送消息到目标端，且会占用主动消息频次
@@ -1489,6 +1490,7 @@ async def post_c2c_file(
         上传/发送c2c图片
 
         Args:
+          openid (str): 您要将消息发送到的用户的 ID
           file_type (int): 媒体类型：1 图片png/jpg，2 视频mp4，3 语音silk，4 文件（暂不开放）
           url (str): 需要发送媒体资源的url
           srv_send_msg (bool): 设置 true 会直接发送消息到目标端，且会占用主动消息频次

botpy/client.py

@@ -103,6 +103,9 @@ async def close(self) -> None:
     def is_closed(self) -> bool:
         return self._closed
 
+    async def on_ready(self):
+        pass
+
     async def on_error(self, event_method: str, *args: Any, **kwargs: Any) -> None:
         traceback.print_exc()
 
@@ -255,7 +258,7 @@ def ws_dispatch(self, event: str, *args: Any, **kwargs: Any) -> None:
         try:
             coro = getattr(self, method)
         except AttributeError:
-            pass
+            _log.warning("[botpy] 事件: %s 未注册", event)
         else:
             self._schedule_event(coro, method, *args, **kwargs)
 

botpy/connection.py

@@ -5,6 +5,7 @@
 from .channel import Channel
 from .guild import Guild
 from .interaction import Interaction
+from .manage import C2CManageEvent, GroupManageEvent
 from .message import C2CMessage, GroupMessage, Message, DirectMessage, MessageAudit
 from .user import Member
 from .reaction import Reaction
@@ -200,7 +201,7 @@ def parse_public_message_delete(self, payload):
         _message = Message(self.api, payload.get('id', None), payload.get('d', {}))
         self._dispatch("public_message_delete", _message)
 
-     # botpy.flags.Intents.public_messages
+    # botpy.flags.Intents.public_messages
     def parse_group_at_message_create(self, payload):
         _message = GroupMessage(self.api, payload.get("id", None), payload.get("d", {}))
         self._dispatch("group_at_message_create", _message)
@@ -209,6 +210,38 @@ def parse_c2c_message_create(self, payload):
         _message = C2CMessage(self.api, payload.get("id", None), payload.get("d", {}))
         self._dispatch("c2c_message_create", _message)
 
+    def parse_group_add_robot(self, payload):
+        _event = GroupManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("group_add_robot", _event)
+
+    def parse_group_del_robot(self, payload):
+        _event = GroupManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("group_del_robot", _event)
+
+    def parse_group_msg_reject(self, payload):
+        _event = GroupManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("group_msg_reject", _event)
+
+    def parse_group_msg_receive(self, payload):
+        _event = GroupManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("group_msg_receive", _event)
+
+    def parse_friend_add(self, payload):
+        _event = C2CManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("friend_add", _event)
+
+    def parse_friend_del(self, payload):
+        _event = C2CManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("friend_del", _event)
+
+    def parse_c2c_msg_reject(self, payload):
+        _event = C2CManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("c2c_msg_reject", _event)
+
+    def parse_c2c_msg_receive(self, payload):
+        _event = C2CManageEvent(self.api, payload.get("id", None), payload.get("d", {}))
+        self._dispatch("c2c_msg_receive", _event)
+
     # botpy.flags.Intents.forums
     def parse_forum_thread_create(self, payload):
         _forum = Thread(self.api, payload.get('id', None), payload.get('d', {}))

botpy/flags.py

@@ -17,7 +17,7 @@ def decorator(cls: Type[BF]) -> Type[BF]:
 
         if inverted:
             max_bits = max(cls.VALID_FLAGS.values()).bit_length()
-            cls.DEFAULT_VALUE = -1 + (2 ** max_bits)
+            cls.DEFAULT_VALUE = -1 + (2**max_bits)
         else:
             cls.DEFAULT_VALUE = 0
 
@@ -317,7 +317,7 @@ def open_forum_event(self):
 
         """
         return 1 << 18
-    
+
     @Flag
     def public_messages(self):
         """:class:`bool`: 是否打开公域群/C2C消息事件的监听.
@@ -326,10 +326,19 @@ def public_messages(self):
 
         - :func:`on_group_at_message_create`            // 当收到群@机器人的消息时
         - :func:`on_c2c_message_create`                 // 当收到c2c的消息时
+        - :func:`on_group_add_robot`                    // 机器人加入群聊
+        - :func:`on_group_del_robot`                    // 机器人退出群聊
+        - :func:`on_group_msg_reject`                   // 群聊拒绝机器人主动消息
+        - :func:`on_group_msg_receive`                  // 群聊接受机器人主动消息
+        - :func:`on_friend_add`                         // 用户添加机器人
+        - :func:`on_friend_del`                         // 用户删除机器人
+        - :func:`on_c2c_msg_reject`                     // 用户拒绝机器人主动消息
+        - :func:`on_c2c_msg_receive`                    // 用户接受机器人主动消息
 
         """
         return 1 << 25
 
+
 @fill_with_flags()
 class Permission(BaseFlags):
     def __init__(self, **kwargs: bool) -> None:

botpy/manage.py

@@ -0,0 +1,40 @@
+from typing import Dict
+from .api import BotAPI
+
+
+class GroupManageEvent:
+    __slots__ = (
+        "_api",
+        "event_id",
+        "timestamp",
+        "group_openid",
+        "op_member_openid",
+    )
+
+    def __init__(self, api: BotAPI, event_id, data: Dict):
+        self._api = api
+        self.event_id = event_id
+        self.timestamp = data.get("timestamp", None)
+        self.group_openid = data.get("group_openid", None)
+        self.op_member_openid = data.get("op_member_openid", None)
+
+    def __repr__(self):
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
+
+
+class C2CManageEvent:
+    __slots__ = (
+        "_api",
+        "event_id",
+        "timestamp",
+        "openid",
+    )
+
+    def __init__(self, api: BotAPI, event_id, data: Dict):
+        self._api = api
+        self.event_id = event_id
+        self.timestamp = data.get("timestamp", None)
+        self.openid = data.get("openid", None)
+
+    def __repr__(self):
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})