hyper-bot 0.80.2__tar.gz → 0.80.5__tar.gz

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.80.2
+Version: 0.80.5
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyper_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.80.2
+Version: 0.80.5
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyperot/Adapters/OneBot.py

@@ -105,6 +105,26 @@ class Actions:
         packet.send_to(self.connection)
         return common.Ret.fetch(packet.echo, SendForwardRsp)
 
+    async def get_forward_msg(self, sid: str) -> common.Ret[common.Message]:
+        packet = common.Packet(
+            "get_forward_msg",
+            id=sid,
+        )
+        packet.send_to(self.connection)
+        ret = common.Ret.fetch(packet.echo, events.gen_message)
+        for i in ret.data:
+            if isinstance(i, segments.Node):
+                i.content = gen_message({"message": i.content})
+
+        return ret
+
+    async def forward_solve(self, message: common.Message) -> common.Message:
+        for i in message:
+            if isinstance(i, segments.Forward):
+                data = await self.get_forward_msg(i.id)
+                return data.data
+        raise ValueError("Incorrect message type")
+
     async def send_group_forward_msg(self, group_id: int, message: common.Message) -> common.Ret[SendGrpForwardRsp]:
         packet = common.Packet(
             "send_group_forward_msg",
@@ -114,7 +134,8 @@ class Actions:
         packet.send_to(self.connection)
         return common.Ret.fetch(packet.echo, SendForwardRsp)
 
-    async def set_group_add_request(self, flag: str, sub_type: str, approve: bool, reason: str = "Not Mentioned") -> None:
+    async def set_group_add_request(self, flag: str, sub_type: str, approve: bool,
+                                    reason: str = "Not Mentioned") -> None:
         common.Packet(
             "set_group_add_request",
             flag=flag,
@@ -179,6 +200,14 @@ class Actions:
         packet.send_to(self.connection)
         return common.Ret.fetch(packet.echo, GetMsgRsp)
 
+    async def send_callback(self, group_id: int, bot_id: int, data: dict) -> None:
+        common.Packet(
+            "send_group_bot_callback",
+            group_id=group_id,
+            bot_id=bot_id,
+            **data
+        ).send_to(self.connection)
+
 
 async def tester(
         message_data: Union[Event, HyperNotify], actions: Actions

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyperot/__init__.py

@@ -7,7 +7,7 @@ import importlib
 import sys
 import os
 
-HYPER_BOT_VERSION = "0.80.2"
+HYPER_BOT_VERSION = "0.80.5"
 
 listener: "Listener"
 

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyperot/events.py

@@ -36,6 +36,7 @@ class EventManager:
         return wrapper
 
     def new(self, data: dict) -> "Event":
+        logger.trace(str(data))
         try:
             return self.event_lis[data["post_type"]][data[f"{data['post_type']}_type"]](data)
         except KeyError:

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyperot/segments.py

@@ -4,6 +4,7 @@ import typing
 import uuid
 
 from .utils.errors import *
+from .utils.hypetyping import Union
 from . import configurator
 
 config = configurator.BotConfig.get("hyper-bot")
@@ -47,6 +48,9 @@ class Text(SegmentBase, st="text", su="<text>"):
     text: str
 
 
+class StreamTest(SegmentBase, st="stream", su="[Stream] <text>"):
+    text: str
+
 class Image(MediaSeg, st="image", su="[Image]"):
     file: str
     url: str
@@ -99,7 +103,9 @@ class Forward(SegmentBase, st="forward", su="[Forward]"):
 
 
 class Node(SegmentBase, st="node", su="[Node]"):
-    id: str
+    user_id: str
+    nickname: str
+    content: Union[dict, "common.Message"]
 
 
 class CustomNode:

{hyper_bot-0.80.2 → hyper_bot-0.80.5}/hyperot/utils/apiresponse.py

@@ -185,7 +185,8 @@ class GetMsgRsp(BaseResponse):
 
     @classmethod
     def build(
-            cls, time: int, message_type: Literal["private", "group"], message_id: int, real_id: int, sender: dict, message: dict
+            cls, time: int, message_type: Literal["private", "group"], message_id: int, real_id: int, sender: dict,
+            message: dict
     ):
         return cls(
             {
@@ -197,5 +198,3 @@ class GetMsgRsp(BaseResponse):
                 "message": message
             }
         )
-
-