Merge branch 'broken' of https://github.com/LagrangeDev/lagrange-python into broken

Author: wyapx

lagrange/client/server_push/msg.py

@@ -129,7 +129,7 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                 pkg.response_head.to_uin,
                 pb.info.to_uid,
                 pb.info.verify,
-                pb.info.source,
+                pb.info.source or pb.info.source_new,
             )
         elif sub_typ == 138:  # friend recall
             pb = PBFriendRecall.decode(pkg.message.buf2)

lagrange/info/app.py

@@ -5,7 +5,7 @@
 from .serialize import JsonSerializer
 
 
-_T = TypeVar('_T', bound=dict[str, Union[int, str]])
+_T = TypeVar("_T", bound=dict[str, Union[int, str]])
 _trans_map = {
     "SsoVersion": "pt_os_version",
     "WtLoginSdk": "wtlogin_sdk",
@@ -21,8 +21,8 @@ def _translate_appinfo(s: _T) -> _T:
             out[_trans_map[k]] = v
         else:
             k = re.sub(
-                r'([A-Z])([^A-Z]+)',
-                '_\0',
+                r"([A-Z])([^A-Z]+)",
+                r"_\1\2",
                 k
             ).lstrip("_").lower()
             out[k] = v

lagrange/pb/status/friend.py

@@ -17,6 +17,7 @@ class PBFriendRecall(ProtoStruct):
 class FriendRequestInfo(ProtoStruct):
     to_uid: str = proto_field(1)
     from_uid: str = proto_field(2)
+    source_new :str = proto_field(5)
     verify: str = proto_field(10)  # 验证消息：我是...
     source: str = proto_field(11)