Skip to content

Commit 3958aad

Browse files
authored
Revert "feat: support get_friend_list (#18)" (#20)
This reverts commit 3d5dc24.
1 parent 3d5dc24 commit 3958aad

File tree

3 files changed

+1
-146
lines changed

3 files changed

+1
-146
lines changed

lagrange/client/client.py

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717
from lagrange.pb.message.msg_push import MsgPushBody
1818
from lagrange.pb.message.send import SendMsgRsp
1919
from lagrange.pb.service.comm import SendNudge
20-
from lagrange.pb.service.friend import (
21-
GetFriendListRsp,
22-
GetFriendListUin,
23-
PBGetFriendListRequest,
24-
propertys,
25-
)
2620
from lagrange.pb.service.group import (
2721
FetchGroupResponse,
2822
GetGrpMsgRsp,
@@ -64,7 +58,7 @@
6458
from .message.elems import Audio, Image
6559
from .message.encoder import build_message
6660
from .message.types import Element
67-
from .models import UserInfo, BotFriend
61+
from .models import UserInfo
6862
from .server_push import PushDeliver, bind_services
6963
from .wtlogin.sso import SSOPacket
7064

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

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-
398340
async def recall_grp_msg(self, grp_id: int, seq: int):
399341
payload = await self.send_uni_packet(
400342
"trpc.msg.msg_svc.MsgService.SsoGroupRecallMsg",

lagrange/client/models.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from dataclasses import dataclass
33
from datetime import datetime
44
from enum import IntEnum
5-
from typing import Optional
65
from lagrange.pb.service.group import GetInfoRspBody
76

87

@@ -66,13 +65,3 @@ def from_pb(cls, pb: GetInfoRspBody) -> "UserInfo":
6665
else:
6766
pass
6867
return rsp
69-
70-
71-
@dataclass
72-
class BotFriend:
73-
uin: int
74-
uid: Optional[str] = None
75-
nickname: Optional[str] = None
76-
remarks: Optional[str] = None
77-
personal_sign: Optional[str] = None
78-
qid: Optional[str] = None

lagrange/pb/service/friend.py

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)