OneBotConnecter 0.4.1__tar.gz → 0.4.3__tar.gz

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

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

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

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

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

@@ -265,40 +265,36 @@ class PrivateCardMessage(Message):
 class ForwardMessage(Message):
 
     data: list[Message]
+    user_id: str
+    nickname: str
+    isGroup: bool
 
-    def __init__(self, data: list[Message] | Message, user_id: str, nickname: str = "某人"):
+    def __init__(self, data: list[Message] | Message, user_id: str = None, nickname: str = "某人", isGroup = True):
         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
+        self.isGroup = isGroup
 
     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,
-            "data": {
-                "content": [msg.to_dict() for msg in data]
+        if self.isGroup:
+            msg = {
+                "type": "node",
+                "data": {
+                    "uin": self.user_id,
+                    "name": self.nickname,
+                    "content": [msg.to_dict() for msg in self.data]
+                }
             }
-        }
-        self.data.append(node)
+        else:
+            msg = {
+                "type": "node",
+                "data": {
+                    "content": [msg.to_dict() for msg in self.data]
+                }
+            }
+        return msg
 
     def returnData(self):
         return [self.to_dict()]
@@ -345,7 +341,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.3}/src/OneBotConnecter/OneBot.py

@@ -5,7 +5,7 @@ except:
     print("File [logger.py] missing")
     raise Exception("File [logger.py] missing")
 try:
-    from OneBotConnecter.MessageType import Message, ReplyMessage, AtMessage, MessageChain
+    from OneBotConnecter.MessageType import Message, ReplyMessage, AtMessage, MessageChain, ForwardMessage
 except:
     print("File [OneBotMessageType.py] missing")
     raise Exception("File [OneBotMessageType.py] missing")
@@ -265,6 +265,23 @@ class OneBot:
         self.testMode = testMode
     # =====------API------===== #
     # ------消息----- #
+    #
+    async def send_forward_msg(self, data: ForwardMessage, user_id: int = None, group_id: int = None):
+        if data.isGroup and group_id != None:
+            params = {
+                "group_id": group_id,
+                "message": data.to_dict()
+            }
+            callback = await self._sendToServer("send_group_msg", params)
+        elif not data.isGroup and user_id != None:
+            params = {
+                "user_id": user_id,
+                "message": data.to_dict()
+            }
+            callback = await self._sendToServer("send_private_msg", params)
+        else: raise TypeError("Error input in send_forward_msg function.")
+        return callback
+
     #发送私聊消息
     async def send_private_msg(self, user_id: int, message: Message):
         params = {

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

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