shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-05 03:23:50 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #140 from Ink-33/master

Browse Source 
export (*QQClient).GetMemberInfo
This commit is contained in:
Mrs4s 2021-03-27 15:07:34 +08:00 committed by GitHub
commit ede433b4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/c2c_processor.go
View File

@ -149,7 +149,7 @@ func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message, _ *incomingP
} }
} else { } else {
if group != nil && group.FindMember(pMsg.Head.GetAuthUin()) == nil { if group != nil && group.FindMember(pMsg.Head.GetAuthUin()) == nil {
mem, err := c.getMemberInfo(group.Code, pMsg.Head.GetAuthUin()) mem, err := c.GetMemberInfo(group.Code, pMsg.Head.GetAuthUin())
if err != nil { if err != nil {
c.Debug("error to fetch new member info: %v", err) c.Debug("error to fetch new member info: %v", err)
return return

16
client/client.go
View File

@ -624,6 +624,14 @@ func (c *QQClient) GetGroupMembers(group *GroupInfo) ([]*GroupMemberInfo, error)
} }
} }
func (c *QQClient) GetMemberInfo(groupCode, memberUin int64) (*GroupMemberInfo, error) {
info, err := c.sendAndWait(c.buildGroupMemberInfoRequestPacket(groupCode, memberUin))
if err != nil {
return nil, err
}
return info.(*GroupMemberInfo), nil
}
func (c *QQClient) FindFriend(uin int64) *FriendInfo { func (c *QQClient) FindFriend(uin int64) *FriendInfo {
for _, t := range c.FriendList { for _, t := range c.FriendList {
f := t f := t
@ -711,14 +719,6 @@ func (c *QQClient) getCSRFToken() int {
return 2147483647 & accu return 2147483647 & accu
} }
func (c *QQClient) getMemberInfo(groupCode, memberUin int64) (*GroupMemberInfo, error) {
info, err := c.sendAndWait(c.buildGroupMemberInfoRequestPacket(groupCode, memberUin))
if err != nil {
return nil, err
}
return info.(*GroupMemberInfo), nil
}
func (c *QQClient) editMemberCard(groupCode, memberUin int64, card string) { func (c *QQClient) editMemberCard(groupCode, memberUin int64, card string) {
_, _ = c.sendAndWait(c.buildEditGroupTagPacket(groupCode, memberUin, card)) _, _ = c.sendAndWait(c.buildEditGroupTagPacket(groupCode, memberUin, card))
} }

2
client/group_msg.go
View File

@ -466,7 +466,7 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage {
if mem = group.FindMemberWithoutLock(m.Head.GetFromUin()); mem != nil { if mem = group.FindMemberWithoutLock(m.Head.GetFromUin()); mem != nil {
return return
} }
info, _ := c.getMemberInfo(group.Code, m.Head.GetFromUin()) info, _ := c.GetMemberInfo(group.Code, m.Head.GetFromUin())
if info == nil { if info == nil {
return return
} }