Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 1 addition & 59 deletions lagrange/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
from lagrange.pb.message.msg_push import MsgPushBody
from lagrange.pb.message.send import SendMsgRsp
from lagrange.pb.service.comm import SendNudge
from lagrange.pb.service.friend import (
GetFriendListRsp,
GetFriendListUin,
PBGetFriendListRequest,
propertys,
)
from lagrange.pb.service.group import (
FetchGroupResponse,
GetGrpMsgRsp,
Expand Down Expand Up @@ -64,7 +58,7 @@
from .message.elems import Audio, Image
from .message.encoder import build_message
from .message.types import Element
from .models import UserInfo, BotFriend
from .models import UserInfo
from .server_push import PushDeliver, bind_services
from .wtlogin.sso import SSOPacket

Expand Down Expand Up @@ -343,58 +337,6 @@ async def get_grp_msg(
return [*filter(lambda msg: msg.rand != -1, rsp)]
return rsp

async def get_friend_list(self):
nextuin_cache: List[GetFriendListUin] = []
rsp: List[BotFriend] = []
frist_send = GetFriendListRsp.decode(
(await self.send_oidb_svc(0xFD4, 1, PBGetFriendListRequest().encode())).data
)
properties: Optional[dict] = None
if frist_send.next:
nextuin_cache.append(frist_send.next)
for raw in frist_send.friend_list:
for j in raw.additional:
if j.type == 1:
properties = propertys(j.layer1.properties)
if properties is not None:
rsp.append(
BotFriend(
raw.uin,
raw.uid,
properties.get(20002),
properties.get(103),
properties.get(102),
properties.get(27394),
)
)

while nextuin_cache:
next = GetFriendListRsp.decode(
(
await self.send_oidb_svc(
0xFD4, 1, PBGetFriendListRequest().encode()
)
).data
)
for raw in next.friend_list:
for j in raw.additional:
properties = propertys(j.layer1.properties)
if properties is not None:
rsp.append(
BotFriend(
raw.uin,
raw.uid,
properties.get(20002),
properties.get(103),
properties.get(102),
properties.get(27394),
)
)
if next.next:
nextuin_cache.append(next)

return rsp

async def recall_grp_msg(self, grp_id: int, seq: int):
payload = await self.send_uni_packet(
"trpc.msg.msg_svc.MsgService.SsoGroupRecallMsg",
Expand Down
11 changes: 0 additions & 11 deletions lagrange/client/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from dataclasses import dataclass
from datetime import datetime
from enum import IntEnum
from typing import Optional
from lagrange.pb.service.group import GetInfoRspBody


Expand Down Expand Up @@ -66,13 +65,3 @@ def from_pb(cls, pb: GetInfoRspBody) -> "UserInfo":
else:
pass
return rsp


@dataclass
class BotFriend:
uin: int
uid: Optional[str] = None
nickname: Optional[str] = None
remarks: Optional[str] = None
personal_sign: Optional[str] = None
qid: Optional[str] = None
76 changes: 0 additions & 76 deletions lagrange/pb/service/friend.py

This file was deleted.