|
17 | 17 | from lagrange.pb.message.msg_push import MsgPushBody |
18 | 18 | from lagrange.pb.message.send import SendMsgRsp |
19 | 19 | from lagrange.pb.service.comm import SendNudge |
20 | | -from lagrange.pb.service.friend import ( |
21 | | - GetFriendListRsp, |
22 | | - GetFriendListUin, |
23 | | - PBGetFriendListRequest, |
24 | | - propertys, |
25 | | -) |
26 | 20 | from lagrange.pb.service.group import ( |
27 | 21 | FetchGroupResponse, |
28 | 22 | GetGrpMsgRsp, |
|
64 | 58 | from .message.elems import Audio, Image |
65 | 59 | from .message.encoder import build_message |
66 | 60 | from .message.types import Element |
67 | | -from .models import UserInfo, BotFriend |
| 61 | +from .models import UserInfo |
68 | 62 | from .server_push import PushDeliver, bind_services |
69 | 63 | from .wtlogin.sso import SSOPacket |
70 | 64 |
|
@@ -343,58 +337,6 @@ async def get_grp_msg( |
343 | 337 | return [*filter(lambda msg: msg.rand != -1, rsp)] |
344 | 338 | return rsp |
345 | 339 |
|
346 | | - async def get_friend_list(self): |
347 | | - nextuin_cache: List[GetFriendListUin] = [] |
348 | | - rsp: List[BotFriend] = [] |
349 | | - frist_send = GetFriendListRsp.decode( |
350 | | - (await self.send_oidb_svc(0xFD4, 1, PBGetFriendListRequest().encode())).data |
351 | | - ) |
352 | | - properties: Optional[dict] = None |
353 | | - if frist_send.next: |
354 | | - nextuin_cache.append(frist_send.next) |
355 | | - for raw in frist_send.friend_list: |
356 | | - for j in raw.additional: |
357 | | - if j.type == 1: |
358 | | - properties = propertys(j.layer1.properties) |
359 | | - if properties is not None: |
360 | | - rsp.append( |
361 | | - BotFriend( |
362 | | - raw.uin, |
363 | | - raw.uid, |
364 | | - properties.get(20002), |
365 | | - properties.get(103), |
366 | | - properties.get(102), |
367 | | - properties.get(27394), |
368 | | - ) |
369 | | - ) |
370 | | - |
371 | | - while nextuin_cache: |
372 | | - next = GetFriendListRsp.decode( |
373 | | - ( |
374 | | - await self.send_oidb_svc( |
375 | | - 0xFD4, 1, PBGetFriendListRequest().encode() |
376 | | - ) |
377 | | - ).data |
378 | | - ) |
379 | | - for raw in next.friend_list: |
380 | | - for j in raw.additional: |
381 | | - properties = propertys(j.layer1.properties) |
382 | | - if properties is not None: |
383 | | - rsp.append( |
384 | | - BotFriend( |
385 | | - raw.uin, |
386 | | - raw.uid, |
387 | | - properties.get(20002), |
388 | | - properties.get(103), |
389 | | - properties.get(102), |
390 | | - properties.get(27394), |
391 | | - ) |
392 | | - ) |
393 | | - if next.next: |
394 | | - nextuin_cache.append(next) |
395 | | - |
396 | | - return rsp |
397 | | - |
398 | 340 | async def recall_grp_msg(self, grp_id: int, seq: int): |
399 | 341 | payload = await self.send_uni_packet( |
400 | 342 | "trpc.msg.msg_svc.MsgService.SsoGroupRecallMsg", |
|
0 commit comments