OneBotConnecter 0.4.1__tar.gz → 0.4.2__tar.gz

{onebotconnecter-0.4.1/src/OneBotConnecter.egg-info → onebotconnecter-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OneBotConnecter
-Version: 0.4.1
+Version: 0.4.2
 Summary: 基于websocket(服务器正向)连接的onebot11通用python接口
 Author-email: Sugar51243 <1733682365@qq.com>
 License: MIT License

{onebotconnecter-0.4.1 → onebotconnecter-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OneBotConnecter"
-version = "0.4.01"
+version = "0.4.02"
 authors = [
   { name="Sugar51243", email="1733682365@qq.com" },
 ]

{onebotconnecter-0.4.1 → onebotconnecter-0.4.2}/src/OneBotConnecter/MessageType.py

@@ -265,40 +265,26 @@ class PrivateCardMessage(Message):
 class ForwardMessage(Message):
 
     data: list[Message]
+    user_id: str
+    nickname: str
 
     def __init__(self, data: list[Message] | Message, user_id: str, nickname: str = "某人"):
         if not isinstance(data, list):
             data = [data]
-        self.data = [{
-            "type": "node",
-            "user_id": user_id,
-            "nickname": nickname,
-            "data": {
-                "content": [msg.to_dict() for msg in data]
-            }
-        }]
+        self.data = data
         self.user_id = user_id
         self.nickname = nickname
 
     def to_dict(self):
         msg = {
-            "type": "forward",
-            "messages": self.data
-        }
-        return msg
-    
-    def addNode(self,  data: list[Message] | Message, user_id: str, nickname: str = "某人"):
-        if not isinstance(data, list):
-            data = [data]
-        node = {
             "type": "node",
-            "user_id": user_id,
-            "nickname": nickname,
+            "user_id": self.user_id,
+            "nickname": self.nickname,
             "data": {
-                "content": [msg.to_dict() for msg in data]
+                "content": [msg.to_dict() for msg in self.data]
             }
         }
-        self.data.append(node)
+        return msg
 
     def returnData(self):
         return [self.to_dict()]
@@ -345,7 +331,7 @@ class MessageChain(Message):
         self.data.extend(message.returnData())
     
     def to_dict(self):
-        return {}
+        return self.data
 
     def returnData(self):
         return self.data

{onebotconnecter-0.4.1 → onebotconnecter-0.4.2/src/OneBotConnecter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OneBotConnecter
-Version: 0.4.1
+Version: 0.4.2
 Summary: 基于websocket(服务器正向)连接的onebot11通用python接口
 Author-email: Sugar51243 <1733682365@qq.com>
 License: MIT License