feat: 新增消息按钮结果回调、修改频道md消息接口

Author: liaoyanglay

botpy/api.py

@@ -22,6 +22,7 @@
     forum,
 )
 
+
 class BotAPI:
     """
     机器人相关的API接口类
@@ -198,7 +199,7 @@ async def get_delete_member(
         guild_id: str,
         user_id: str,
         add_blacklist: bool = False,
-        delete_history_msg_days: int = 0
+        delete_history_msg_days: int = 0,
     ) -> str:
         """
         删除频道成员
@@ -246,7 +247,7 @@ async def get_guild_members(self, guild_id: str, after: str = "0", limit: int =
             guild_id=guild_id,
         )
         return await self._http.request(route, params=params)
-    
+
     async def get_guild_role_members(
         self, guild_id: str, role_id: str, start_index: str = "0", limit: int = 1
     ) -> Dict[str, Union[List[user.Member], str]]:
@@ -270,7 +271,7 @@ async def get_guild_role_members(
             "GET",
             "/guilds/{guild_id}/roles/{role_id}/members",
             guild_id=guild_id,
-            role_id=role_id
+            role_id=role_id,
         )
         return await self._http.request(route, params=params)
 
@@ -584,6 +585,58 @@ async def post_keyboard_message(
         )
         return await self._http.request(route, json=payload)
 
+    async def on_interaction_result(self, interaction_id: str, code: int):
+        """
+        `on_interaction_result` 消息按钮回调结果
+
+        Args:
+          interaction_id (str): 消息按钮回调事件的 ID。
+          code (int): 回调结果 0 成功，1 操作失败，2 操作频繁，3 重复操作，4 没有权限，5 仅管理员操作
+
+        Returns:
+          无
+        """
+        payload = {"code": code}
+        route = Route(
+            "PUT",
+            "/interactions/{id}",
+            id=interaction_id,
+        )
+        return await self._http.request(route, json=payload)
+
+    async def patch_guild_message(
+        self,
+        channel_id: str,
+        patch_msg_id: str,
+        msg_id: str = None,
+        event_id: str = None,
+        markdown: message.MarkdownPayload = None,
+        keyboard: message.KeyboardPayload = message.KeyboardPayload(content={}),
+    ) -> message.Message:
+        """
+        修改频道markdown消息，需要先申请权限。
+
+        Args:
+          channel_id (str): 您要将消息发送到的频道的 ID。
+          patch_msg_id (str): 需要修改的消息id。
+          msg_id (str): 您要回复的消息的 ID。您可以从 AT_CREATE_MESSAGE 事件中获取此 ID。
+          event_id (str): 您要回复的消息的事件 ID。
+          markdown (message.MarkdownPayload): markdown 消息的构建参数。
+          keyboard (message.KeyboardPayload): keyboard 消息的构建参数
+
+        Returns:
+          message.Message: 一个消息字典对象。
+        """
+        payload = locals()
+        payload.pop("self", None)
+        route = Route(
+            "PATCH",
+            "/channels/{channel_id}/messages/{patch_msg_id}",
+            channel_id=channel_id,
+            patch_msg_id=patch_msg_id,
+        )
+        return await self._http.request(route, json=payload)
+
     # 私信消息
     async def create_dms(self, guild_id: str, user_id: str) -> message.DmsPayload:
         """
@@ -766,7 +819,7 @@ async def mute_all(self, guild_id: str, mute_end_timestamp: str = None, mute_sec
         """
         payload = {
             "mute_end_timestamp": mute_end_timestamp,
-            "mute_seconds": mute_seconds
+            "mute_seconds": mute_seconds,
         }
         route = Route("PATCH", "/guilds/{guild_id}/mute", guild_id=guild_id)
         return await self._http.request(route, json=payload)
@@ -808,7 +861,7 @@ async def mute_member(
         """
         payload = {
             "mute_end_timestamp": mute_end_timestamp,
-            "mute_seconds": mute_seconds
+            "mute_seconds": mute_seconds,
         }
         route = Route("PATCH", "/guilds/{guild_id}/members/{user_id}/mute", guild_id=guild_id, user_id=user_id)
         return await self._http.request(route, json=payload)
@@ -831,7 +884,7 @@ async def mute_multi_member(
         payload = {
             "mute_end_timestamp": mute_end_timestamp,
             "mute_seconds": mute_seconds,
-            "user_ids": user_ids
+            "user_ids": user_ids,
         }
         route = Route("PATCH", "/guilds/{guild_id}/mute", guild_id=guild_id)
         return await self._http.request(route, json=payload)
@@ -1312,7 +1365,7 @@ async def delete_thread(self, channel_id: str, thread_id: str) -> str:
             "DELETE", "/channels/{channel_id}/threads/{thread_id}", channel_id=channel_id, thread_id=thread_id
         )
         return await self._http.request(route)
-    
+
     async def post_group_message(
         self,
         group_openid: str,
@@ -1444,5 +1497,3 @@ async def post_c2c_file(
         payload.pop("self", None)
         route = Route("POST", "/v2/users/{openid}/files", openid=openid)
         return await self._http.request(route, json=payload)
-    
-

botpy/client.py

@@ -218,8 +218,11 @@ def _loop_exception_handler(_loop, context):
                 coroutine = self._connection.multi_run(session_interval)
                 if self.ret_coro:
                     return coroutine
-                else:
+                elif coroutine:
                     await coroutine
+                else:
+                    await self.close()
+                    _log.info("[botpy] 服务意外停止!")
             except KeyboardInterrupt:
                 _log.info("[botpy] 服务强行停止!")
                 # cancel all tasks lingering

botpy/gateway.py

@@ -131,7 +131,7 @@ async def ws_connect(self):
                     elif msg.type == WSMsgType.CLOSED or msg.type == WSMsgType.CLOSE:
                         await self.on_closed(ws_conn.close_code, msg.extra)
                     if ws_conn.closed:
-                        _log.debug("[botpy] ws关闭, 停止接收消息!")
+                        _log.info("[botpy] ws关闭, 停止接收消息!")
                         break
 
     async def ws_identify(self):

botpy/interaction.py

@@ -1,20 +1,56 @@
 from .api import BotAPI
-from .types import interaction, gateway
+from .types import interaction
 
 
 class Interaction:
-    __slots__ = ("_api", "_ctx", "id", "application_id", "type", "event_id", "data", "guild_id", "channel_id")
+    __slots__ = (
+        "_api",
+        "_ctx",
+        "id",
+        "application_id",
+        "type",
+        "chat_type",
+        "event_id",
+        "data",
+        "guild_id",
+        "channel_id",
+        "group_open_id",
+        "timestamp",
+        "version",
+    )
 
     def __init__(self, api: BotAPI, event_id, data: interaction.InteractionPayload):
         self._api = api
 
         self.id = data.get("id", None)
         self.type = data.get("type", None)
+        self.chat_type = data.get("chat_type", None)
         self.application_id = data.get("application_id", None)
         self.event_id = event_id
-        self.data = data.get("data", None)
+        self.data = self._Data(data.get("data", {}))
         self.guild_id = data.get("guild_id", None)
         self.channel_id = data.get("channel_id", None)
+        self.group_open_id = data.get("group_open_id", None)
+        self.timestamp = data.get("timestamp", None)
+        self.version = data.get("version", None)
 
     def __repr__(self):
-        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith('_')})
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
+
+    class _Data:
+        def __init__(self, data):
+            self.type = data.get("type", None)
+            self.resolved = Interaction._Resolved(data.get("resolved", None))
+
+        def __repr__(self):
+            return str(self.__dict__)
+
+    class _Resolved:
+        def __init__(self, data):
+            self.button_id = data.get("button_id", None)
+            self.button_data = data.get("button_data", None)
+            self.message_id = data.get("message_id", None)
+            self.user_id = data.get("user_id", None)
+
+        def __repr__(self):
+            return str(self.__dict__)

botpy/message.py

@@ -17,7 +17,7 @@ class Message:
         "seq",
         "seq_in_channel",
         "timestamp",
-        "event_id"
+        "event_id",
     )
 
     def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
@@ -39,7 +39,7 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
         self.event_id = event_id
 
     def __repr__(self):
-        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith('_')})
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
 
     class _User:
         def __init__(self, data):
@@ -100,7 +100,7 @@ class DirectMessage:
         "seq_in_channel",
         "src_guild_id",
         "timestamp",
-        "event_id"
+        "event_id",
     )
 
     def __init__(self, api: BotAPI, event_id, data: gateway.DirectMessagePayload):
@@ -122,7 +122,7 @@ def __init__(self, api: BotAPI, event_id, data: gateway.DirectMessagePayload):
         self.event_id = event_id
 
     def __repr__(self):
-        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith('_')})
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
 
     class _User:
         def __init__(self, data):
@@ -171,7 +171,8 @@ class MessageAudit:
         "message_id",
         "channel_id",
         "guild_id",
-        "event_id")
+        "event_id",
+    )
 
     def __init__(self, api: BotAPI, event_id, data: gateway.MessageAuditPayload):
         self._api = api
@@ -183,8 +184,9 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessageAuditPayload):
         self.event_id = event_id
 
     def __repr__(self):
-        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith('_')})
-    
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
+
+
 class BaseMessage:
     __slots__ = (
         "_api",
@@ -195,7 +197,7 @@ class BaseMessage:
         "attachments",
         "msg_seq",
         "timestamp",
-        "event_id"
+        "event_id",
     )
 
     def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
@@ -208,17 +210,17 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
         self.msg_seq = data.get("msg_seq", None)  # 全局消息序号
         self.timestamp = data.get("timestamp", None)
         self.event_id = event_id
-    
+
     def __repr__(self):
         return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith("_")})
-    
+
     class _MessageRef:
         def __init__(self, data):
             self.message_id = data.get("message_id", None)
 
         def __repr__(self):
             return str(self.__dict__)
-    
+
     class _Attachments:
         def __init__(self, data):
             self.content_type = data.get("content_type", None)
@@ -231,11 +233,12 @@ def __init__(self, data):
 
         def __repr__(self):
             return str(self.__dict__)
-        
+
+
 class GroupMessage(BaseMessage):
     __slots__ = (
         "author",
-        "group_openid"
+        "group_openid",
     )
 
     def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
@@ -246,7 +249,7 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
     def __repr__(self):
         slots = self.__slots__ + super().__slots__
         return str({items: str(getattr(self, items)) for items in slots if not items.startswith("_")})
-    
+
     class _User:
         def __init__(self, data):
             self.member_openid = data.get("member_openid", None)
@@ -278,5 +281,3 @@ def __repr__(self):
 
     async def reply(self, **kwargs):
         return await self._api.post_c2c_message(openid=self.author.user_openid, msg_id=self.id, **kwargs)
-
-    

botpy/robot.py

@@ -1,10 +1,14 @@
-from botpy.types import robot
+import asyncio
 import time
+
 import aiohttp
+
 from .logging import get_logger
+from botpy.types import robot
 
 _log = get_logger()
 
+
 class Robot:
     def __init__(self, data: robot.Robot):
         self._update(data)
@@ -39,17 +43,23 @@ async def check_token(self):
     async def update_access_token(self):
         session = aiohttp.ClientSession()
         data = None
-        async with session.post(
-            url="https://bots.qq.com/app/getAppAccessToken",
-            timeout=(aiohttp.ClientTimeout(total=5)),
-            json={
-                "appId": self.app_id,
-                "clientSecret": self.secret,
-            },
-        ) as response:
-            data = await response.json()
-        await session.close()
-        _log.info(f"{data}")
+        # TODO 增加超时重试
+        try:
+            async with session.post(
+                url="https://bots.qq.com/app/getAppAccessToken",
+                timeout=(aiohttp.ClientTimeout(total=20)),
+                json={
+                    "appId": self.app_id,
+                    "clientSecret": self.secret,
+                },
+            ) as response:
+                data = await response.json()
+        except asyncio.TimeoutError as e:
+            _log.info("[botpy] access_token TimeoutError:" + str(e))
+            raise
+        finally:
+            await session.close()
+        _log.info("[botpy] access_token expires_in " + data["expires_in"])
         self.access_token = data["access_token"]
         self.expires_in = int(data["expires_in"]) + int(time.time())