From afb0ed6368ad6f8ef67f8f71d9e3415384f3564f Mon Sep 17 00:00:00 2001
From: Mrs4s <1844812067@qq.com>
Date: Sat, 26 Sep 2020 18:18:30 +0800
Subject: [PATCH] update lock.

---
 client/client.go   | 32 +++++++-------------------------
 client/decoders.go |  8 +++++---
 client/entities.go | 40 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/client/client.go b/client/client.go
index 5dc97da6..97aa8874 100644
--- a/client/client.go
+++ b/client/client.go
@@ -829,24 +829,6 @@ func (c *QQClient) SolveFriendRequest(req *NewFriendRequest, accept bool) {
 	_ = c.send(pkt)
 }
 
-func (g *GroupInfo) SelfPermission() MemberPermission {
-	return g.FindMember(g.client.Uin).Permission
-}
-
-func (g *GroupInfo) AdministratorOrOwner() bool {
-	return g.SelfPermission() == Administrator || g.SelfPermission() == Owner
-}
-
-func (g *GroupInfo) FindMember(uin int64) *GroupMemberInfo {
-	for _, m := range g.Members {
-		f := m
-		if f.Uin == uin {
-			return f
-		}
-	}
-	return nil
-}
-
 func (c *QQClient) getCookies() string {
 	return fmt.Sprintf("uin=o%d; skey=%s;", c.Uin, c.sigInfo.sKey)
 }
@@ -914,14 +896,14 @@ func (c *QQClient) kickGroupMember(groupCode, memberUin int64, msg string) {
 }
 
 func (g *GroupInfo) removeMember(uin int64) {
-	g.memLock.Lock()
-	defer g.memLock.Unlock()
-	for i, m := range g.Members {
-		if m.Uin == uin {
-			g.Members = append(g.Members[:i], g.Members[i+1:]...)
-			break
+	g.Update(func(info *GroupInfo) {
+		for i, m := range info.Members {
+			if m.Uin == uin {
+				info.Members = append(info.Members[:i], info.Members[i+1:]...)
+				break
+			}
 		}
-	}
+	})
 }
 
 func (c *QQClient) connect() error {
diff --git a/client/decoders.go b/client/decoders.go
index 963af379..37d19731 100644
--- a/client/decoders.go
+++ b/client/decoders.go
@@ -29,8 +29,8 @@ import (
 )
 
 var (
-	groupJoinLock  = new(sync.Mutex)
-	groupLeaveLock = new(sync.Mutex)
+	groupJoinLock  sync.Mutex
+	groupLeaveLock sync.Mutex
 )
 
 // wtlogin.login
@@ -228,7 +228,9 @@ func decodeMessageSvcPacket(c *QQClient, _ uint16, payload []byte) (interface{},
 							Permission: Member,
 							Group:      group,
 						}
-						group.Members = append(group.Members, mem)
+						group.Update(func(info *GroupInfo) {
+							info.Members = append(info.Members, mem)
+						})
 						c.dispatchNewMemberEvent(&MemberJoinGroupEvent{
 							Group:  group,
 							Member: mem,
diff --git a/client/entities.go b/client/entities.go
index b4333066..ddbad763 100644
--- a/client/entities.go
+++ b/client/entities.go
@@ -70,8 +70,8 @@ type (
 		MaxMemberCount uint16
 		Members        []*GroupMemberInfo
 
-		client  *QQClient
-		memLock sync.Mutex
+		client *QQClient
+		lock   sync.RWMutex
 	}
 
 	GroupMemberInfo struct {
@@ -285,6 +285,42 @@ func (g *GroupInfo) Quit() {
 	}
 }
 
+func (g *GroupInfo) SelfPermission() MemberPermission {
+	return g.FindMember(g.client.Uin).Permission
+}
+
+func (g *GroupInfo) AdministratorOrOwner() bool {
+	return g.SelfPermission() == Administrator || g.SelfPermission() == Owner
+}
+
+func (g *GroupInfo) FindMember(uin int64) *GroupMemberInfo {
+	r := g.Read(func(info *GroupInfo) interface{} {
+		for _, m := range info.Members {
+			f := m
+			if f.Uin == uin {
+				return f
+			}
+		}
+		return nil
+	})
+	if r == nil {
+		return nil
+	}
+	return r.(*GroupMemberInfo)
+}
+
+func (g *GroupInfo) Update(f func(*GroupInfo)) {
+	g.lock.Lock()
+	defer g.lock.Unlock()
+	f(g)
+}
+
+func (g *GroupInfo) Read(f func(*GroupInfo) interface{}) interface{} {
+	g.lock.RLock()
+	defer g.lock.RUnlock()
+	return f(g)
+}
+
 func (m *GroupMemberInfo) DisplayName() string {
 	if m.CardName == "" {
 		return m.Nickname