OneBotConnecter 0.3.19__tar.gz → 0.4.0__tar.gz

{onebotconnecter-0.3.19/src/OneBotConnecter.egg-info → onebotconnecter-0.4.0}/PKG-INFO

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

{onebotconnecter-0.3.19 → onebotconnecter-0.4.0}/pyproject.toml

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

{onebotconnecter-0.3.19 → onebotconnecter-0.4.0}/src/OneBotConnecter/MessageType.py

@@ -262,21 +262,45 @@ class PrivateCardMessage(Message):
         return [self.to_dict()]
     
 # 合并转发信息
-class PrivateCardMessage(Message):
-
-    data: 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": self.user_id,
+            "nickname": self.nickname,
+            "data": {
+                "content": [msg.to_dict() for msg in data]
+            }
+        }]
+        self.user_id = user_id
+        self.nickname = nickname
 
-    def __init__(self, data: Message):
-        self.data = data
-    
     def to_dict(self):
         msg = {
-            "type": "json",
+            "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,
             "data": {
-                "content": self.data.returnData()
+                "content": [msg.to_dict() for msg in data]
             }
         }
-        return msg
+        self.data.append(node)
 
     def returnData(self):
         return [self.to_dict()]

{onebotconnecter-0.3.19 → onebotconnecter-0.4.0/src/OneBotConnecter.egg-info}/PKG-INFO

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