Merge remote-tracking branch 'origin/broken' into broken

Author: wyapx

lagrange/client/client.py

@@ -9,6 +9,8 @@
     Union,
     overload,
     Literal,
+    TYPE_CHECKING,
+    cast,
 )
 from collections.abc import Coroutine
 
@@ -491,31 +493,30 @@ async def set_grp_request(self, grp_id: int, grp_req_seq: int, ev_type: int, act
             raise AssertionError(rsp.ret_code, rsp.err_msg)
 
     @overload
-    async def get_user_info(self, uid: str) -> UserInfo: ...
-
-    @overload
-    async def get_user_info(self, uid: list[str]) -> list[UserInfo]: ...
-
-    @overload
-    async def get_user_info(self, uin: int) -> UserInfo:
+    async def get_user_info(self, uid_or_uin: Union[str, int], /) -> UserInfo:
         ...
 
     @overload
-    async def get_user_info(self, uin: list[int]) -> list[UserInfo]:
+    async def get_user_info(self, uid_or_uin: Union[list[str], list[int]], /) -> list[UserInfo]:
         ...
 
     async def get_user_info(
-            self,
-            uid: Union[str, list[str]] = None,
-            uin: Union[int, list[int]] = None,
+        self,
+        uid_or_uin: Union[str, int, list[str], list[int]],
+        /
     ) -> Union[UserInfo, list[UserInfo]]:
-        userid = uid or uin
-        assert userid, "empty uid or uin"
-        if not isinstance(userid, list):
-            userid = [userid]
+        if isinstance(uid_or_uin, list):
+            assert uid_or_uin, "empty uid or uin"
+            userid = uid_or_uin
+        else:
+            userid = [uid_or_uin]
         if isinstance(userid[0], int):
+            if TYPE_CHECKING:
+                userid = cast(list[int], userid)
             req, sc = PBGetInfoFromUinReq(uin=userid).encode(), 2
         elif isinstance(userid[0], str):
+            if TYPE_CHECKING:
+                userid = cast(list[str], userid)
             req, sc = PBGetInfoFromUidReq(uid=userid).encode(), 8
         else:
             raise TypeError(userid[0])

lagrange/client/events/group.py

@@ -81,7 +81,7 @@ class GroupMemberJoinRequest(GroupEvent):
 
 @dataclass
 class GroupMemberJoined(GroupEvent):
-    uin: int
+    # uin: int //it cant get
     uid: str
     join_type: int
 
@@ -152,4 +152,35 @@ class GroupInvite(GroupEvent):
 @dataclass
 class GroupMemberJoinedByInvite(GroupEvent):
     invitor_uin: int
-    uin: int
+    uin: int
+
+
+@dataclass
+class GroupSelfJoined(GroupEvent):
+    grp_id: int
+    op_uid: str
+
+
+@dataclass
+class GroupSelfRequireReject(GroupEvent):
+    grp_id: int
+    message: str
+
+
+@dataclass
+class GroupBotAdded(GroupEvent):
+    bot_uid: str
+
+
+@dataclass
+class BotGrayTip(GroupEvent):
+    content: str
+
+
+@dataclass
+class GroupBotJoined(GroupEvent):
+    opqq_uin: int
+    nick_name: str
+    robot_name: str
+    robot_schema: str
+    user_schema: str

lagrange/client/message/decoder.py

@@ -12,7 +12,7 @@
 from .types import Element
 from lagrange.utils.binary.reader import Reader
 from lagrange.utils.binary.protobuf import proto_encode
-from lagrange.pb.message.rich_text.elems import GroupFileExtra, FileExtra
+from lagrange.pb.message.rich_text.elems import GroupFileExtra, FileExtra, PBKeyboard
 from lagrange.pb.highway.comm import MsgInfo
 
 if TYPE_CHECKING:
@@ -163,6 +163,12 @@ async def parse_msg_new(
                         f8=common.pb_elem[8],
                     )
                 )
+            if common.service_type == 45:
+                md_c: bytes = common.pb_elem[1]
+                msg_chain.append(elems.Markdown(content=md_c.decode()))
+            if common.service_type == 46:
+                kb = PBKeyboard.decode(proto_encode(common.pb_elem)).keyboard
+                msg_chain.append(elems.Keyboard(content=kb.content, bot_appid=kb.bot_appid))
             if common.bus_type in [10, 20]:  # 10: friend, 20: group
                 extra = MsgInfo.decode(proto_encode(raw.common_elem.pb_elem))
                 index = extra.body[0].index

lagrange/client/message/elems.py

@@ -20,6 +20,7 @@ def type(self) -> str:
 @dataclass
 class CompatibleText(BaseElem):
     """仅用于兼容性变更，不应作为判断条件"""
+
     @property
     def text(self) -> str:
         return self.display
@@ -28,6 +29,7 @@ def text(self) -> str:
     def text(self, text: str):
         """ignore"""
 
+
 @dataclass
 class MediaInfo:
     name: str
@@ -215,9 +217,15 @@ def display(self) -> str:
         return f"[file:{self.file_name}]"
 
     @classmethod
-    def _paste_build(cls, file_size: int, file_name: str,
-                     file_md5: bytes, file_id: Optional[str] = None,
-                     file_uuid: Optional[str] = None, file_hash: Optional[str] = None) -> "File":
+    def _paste_build(
+        cls,
+        file_size: int,
+        file_name: str,
+        file_md5: bytes,
+        file_id: Optional[str] = None,
+        file_uuid: Optional[str] = None,
+        file_hash: Optional[str] = None,
+    ) -> "File":
         return cls(
             file_size=file_size,
             file_name=file_name,
@@ -244,8 +252,66 @@ class GreyTips(BaseElem):
     建议搭配Text使用
     冷却3分钟左右？
     """
+
     text: str
 
     @property
     def display(self) -> str:
         return f"<GreyTips: {self.text}>"
+
+
+@dataclass
+class Markdown(BaseElem):
+    content: str
+
+    @property
+    def display(self) -> str:
+        return f"[markdown:{self.content}]"
+
+
+class Permission:
+    type: int
+    specify_role_ids: Optional[list[str]]
+    specify_user_ids: Optional[list[str]]
+
+
+class RenderData:
+    label: Optional[str]
+    visited_label: Optional[str]
+    style: int
+
+
+class Action:
+    type: Optional[int]
+    permission: Optional[Permission]
+    data: str
+    reply: bool
+    enter: bool
+    anchor: Optional[int]
+    unsupport_tips: Optional[str]
+    click_limit: Optional[int]  # deprecated
+    at_bot_show_channel_list: bool  # deprecated
+
+
+class Button:
+    id: Optional[str]
+    render_data: Optional[RenderData]
+    action: Optional[Action]
+
+
+class InlineKeyboardRow:
+    buttons: Optional[list[Button]]
+
+
+class InlineKeyboard:
+    rows: list[InlineKeyboardRow]
+
+
+@dataclass
+class Keyboard(BaseElem):
+    content: Optional[list[InlineKeyboard]]
+    bot_appid: int
+
+    @property
+    def display(self) -> str:
+        return f"[keyboard:{self.bot_appid}]"

lagrange/client/message/types.py

@@ -17,7 +17,9 @@
         GreyTips,
         Video,
         Service,
-        File
+        File,
+        Markdown,
+        Keyboard,
     )
 
 # T = TypeVar(
@@ -49,5 +51,7 @@
     "GreyTips",
     "Video",
     "Service",
-    "File"
+    "File",
+    "Markdown",
+    "Keyboard",
 ]