refactor & feat: 优化http双重not问题、增加可取阅事件数据结构的能力 (#110)

* refactor: 优化上次更新中，http的双重not问题
feat: 新增用户可直接通过print或log获取dict类型的事件结构

* fix: 修复DirectMessage中reply参数错误

Co-authored-by: 小念同学 <[email protected]>

Author: GLGDLY

botpy/audio.py

@@ -20,3 +20,6 @@ def __init__(self, api: BotAPI, event_id, data: audio.AudioAction):
         self.audio_url = data.get("audio_url", None)
         self.text = data.get("text", 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('_')})

botpy/channel.py

@@ -33,3 +33,6 @@ def __init__(self, api: BotAPI, event_id, data: channel.ChannelPayload):
         self.application_id = data.get("application_id", None)
         self.permissions = data.get("permissions", 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('_')})

botpy/forum.py

@@ -8,23 +8,35 @@ class _Text:
     def __init__(self, data):
         self.text = data.get("text", None)
 
+    def __repr__(self):
+        return str(self.__dict__)
+
 
 class _Image:
     def __init__(self, data):
         self.plat_image = self._PlatImage(data.get("plat_image", {}))
 
+    def __repr__(self):
+        return str(self.__dict__)
+
     class _PlatImage:
         def __init__(self, data):
             self.url = data.get("url", None)
             self.width = data.get("width", None)
             self.height = data.get("height", None)
             self.image_id = data.get("image_id", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
 
 class _Video:
     def __init__(self, data):
         self.plat_video = self._PlatVideo(data.get("plat_video", {}))
 
+    def __repr__(self):
+        return str(self.__dict__)
+
     class _PlatVideo:
         def __init__(self, data):
             self.url = data.get("url", None)
@@ -33,23 +45,31 @@ def __init__(self, data):
             self.video_id = data.get("video_id", None)
             self.cover = data.get("cover", {})
 
+        def __repr__(self):
+            return str(self.__dict__)
+
         class _Cover:
             def __init__(self, data):
                 self.url = data.get("url", None)
                 self.width = data.get("width", None)
                 self.height = data.get("height", None)
 
+            def __repr__(self):
+                return str(self.__dict__)
+
 
 class _Url:
     def __init__(self, data):
         self.url = data.get("url", None)
         self.desc = data.get("desc", None)
 
+    def __repr__(self):
+        return str(self.__dict__)
+
 
 class Thread:
     __slots__ = (
         "_api",
-        "_ctx",
         "thread_info",
         "channel_id",
         "guild_id",
@@ -65,36 +85,57 @@ def __init__(self, api: BotAPI, event_id, data: forum.Thread):
         self.thread_info = self._ThreadInfo(data.get("thread_info", {}))
         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 _ThreadInfo:
         def __init__(self, data):
             self.title = self._Title(loads(data.get("title", {})))
             self.content = self._Content(loads(data.get("content", {})))
             self.thread_id = data.get("thread_id", None)
             self.date_time = data.get("date_time", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
         class _Title:
             def __init__(self, data):
                 self.paragraphs = [self._Paragraphs(items) for items in data.get("paragraphs", {})]
 
+            def __repr__(self):
+                return str(self.__dict__)
+
             class _Paragraphs:
                 def __init__(self, data):
                     self.elems = [self._Elems(items) for items in data.get("elems", {})]
                     self.props = data.get("props", None)
 
+                def __repr__(self):
+                    return str(self.__dict__)
+
                 class _Elems:
                     def __init__(self, data):
                         self.type = data.get("type", None)
                         self.text = _Text(data.get("text", {}))
 
+                    def __repr__(self):
+                        return str(self.__dict__)
+
         class _Content:
             def __init__(self, data):
                 self.paragraphs = [self._Paragraphs(items) for items in data.get("paragraphs", {})]
 
+            def __repr__(self):
+                return str(self.__dict__)
+
             class _Paragraphs:
                 def __init__(self, data):
                     self.elems = [self._Elems(items) for items in data.get("elems", {})]
                     self.props = data.get("props", None)
 
+                def __repr__(self):
+                    return str(self.__dict__)
+
                 class _Elems:
                     def __init__(self, data):
                         self.type = data.get("type", None)
@@ -106,3 +147,6 @@ def __init__(self, data):
                             self.video = _Video(data.get("video", {}))
                         elif self.type == 4:
                             self.url = _Url(data.get("url", {}))
+
+                    def __repr__(self):
+                        return str(self.__dict__)

botpy/guild.py

@@ -31,3 +31,6 @@ def __init__(self, api: BotAPI, event_id, data: guild.GuildPayload):
         self.description = data.get("description", None)
         self.joined_at = data.get("joined_at", 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('_')})

botpy/http.py

@@ -112,7 +112,7 @@ async def request(self, route: Route, **kwargs: Any):
                 kwargs["data"] = FormData()
                 for k, v in kwargs.pop("json").items():
                     if v:
-                        if not not isinstance(v, dict):
+                        if isinstance(v, dict):
                             if k == 'message_reference':
                                 _log.error(
                                     f"[botpy] 接口参数传入异常, 请求连接: {route.url}, "

botpy/interaction.py

@@ -12,3 +12,6 @@ def __init__(self, api: BotAPI, event_id, data: interaction.InteractionPayload):
         self.type = data.get("type", None)
         self.application_id = data.get("application_id", 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('_')})

botpy/message.py

@@ -38,23 +38,35 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessagePayload):
         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 _User:
         def __init__(self, data):
             self.id = data.get("id", None)
             self.username = data.get("username", None)
             self.bot = data.get("bot", None)
             self.avatar = data.get("avatar", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     class _Member:
         def __init__(self, data):
             self.nick = data.get("nick", None)
             self.roles = data.get("roles", None)
             self.joined_at = data.get("joined_at", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     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)
@@ -65,6 +77,9 @@ def __init__(self, data):
             self.size = data.get("size", None)
             self.url = data.get("url", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     async def reply(self, **kwargs):
         return await self._api.post_message(channel_id=self.channel_id, msg_id=self.id, **kwargs)
 
@@ -104,22 +119,34 @@ def __init__(self, api: BotAPI, event_id, data: gateway.DirectMessagePayload):
         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 _User:
         def __init__(self, data):
             self.id = data.get("id", None)
             self.username = data.get("username", None)
             self.avatar = data.get("avatar", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     class _Member:
         def __init__(self, data):
             self.joined_at = data.get("joined_at", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     class _MessageRef:
         def __init__(self, data):
             self.message_id = data.get("message_id", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     async def reply(self, **kwargs):
-        return await self._api.post_message(channel_id=self.channel_id, msg_id=self.id, **kwargs)
+        return await self._api.post_dms(guild_id=self.guild_id, msg_id=self.id, **kwargs)
 
 
 class MessageAudit:
@@ -139,3 +166,6 @@ def __init__(self, api: BotAPI, event_id, data: gateway.MessageAuditPayload):
         self.message_id = data.get("message_id", None)
         self.guild_id = data.get("guild_id", 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('_')})

botpy/reaction.py

@@ -23,12 +23,21 @@ def __init__(self, api: BotAPI, event_id, data: reaction.Reaction):
         self.target = self._Target(data.get("target", {}))
         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 _Emoji:
         def __init__(self, data):
             self.id = data.get("id", None)
             self.type = data.get("type", None)
 
+        def __repr__(self):
+            return str(self.__dict__)
+
     class _Target:
         def __init__(self, data):
             self.id = data.get("id", None)
             self.type = data.get("type", None)   # 0: 消息 1: 帖子 2: 评论 3: 回复
+
+        def __repr__(self):
+            return str(self.__dict__)

botpy/user.py

@@ -15,6 +15,9 @@ def __init__(self, api: BotAPI, event_id, data: user.GuildMemberPayload):
         self.event_id = event_id
         self.guild_id = data.get("guild_id", None)
 
+    def __repr__(self):
+        return str({items: str(getattr(self, items)) for items in self.__slots__ if not items.startswith('_')})
+
     class _User:
         def __init__(self, data):
             self.id = data.get("id", None)
@@ -23,3 +26,6 @@ def __init__(self, data):
             self.bot = data.get("bot", None)
             self.union_openid = data.get("union_openid", None)
             self.union_user_account = data.get("union_user_account", None)
+
+        def __repr__(self):
+            return str(self.__dict__)