From 9434c746208fe13b55e759484dfa792e5c424aa3 Mon Sep 17 00:00:00 2001
From: Sam <lau.sam745033858@gmail.com>
Date: Tue, 16 Mar 2021 20:34:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?Update=20new=20fields=20-=20Recompiled=20al?=
 =?UTF-8?q?l=20pb=20file=20(=E8=A2=AB=E9=80=BC=E7=9A=84)=20group=5Finfo.go?=
 =?UTF-8?q?:=20-=20GroupInfo=20added=20GroupLevel=20and=20GroupCreateTime?=
 =?UTF-8?q?=20field=20-=20GroupSearchInfo=20added=20Memo=20field?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/group_info.go | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/client/group_info.go b/client/group_info.go
index 8109e99e..de7345ba 100644
--- a/client/group_info.go
+++ b/client/group_info.go
@@ -27,6 +27,16 @@ type (
 		MemberCount    uint16
 		MaxMemberCount uint16
 		Members        []*GroupMemberInfo
+		Uin             int64
+		Code            int64
+		Name            string
+		Memo            string
+		OwnerUin        int64
+		GroupCreateTime uint32
+		GroupLevel      uint32
+		MemberCount     uint16
+		MaxMemberCount  uint16
+		Members         []*GroupMemberInfo
 		// 最后一条信息的SEQ,只有通过 GetGroupInfo 函数获取的 GroupInfo 才会有
 		LastMsgSeq int64
 
@@ -53,6 +63,7 @@ type (
 	GroupSearchInfo struct {
 		Code int64  // 群号
 		Name string // 群名
+		Memo string // 简介
 	}
 )
 
@@ -211,6 +222,7 @@ func decodeGroupSearchResponse(_ *QQClient, _ *incomingPacketInfo, payload []byt
 			ret = append(ret, GroupSearchInfo{
 				Code: int64(g.GetCode()),
 				Name: g.GetName(),
+				Memo: g.GetBrief(),
 			})
 		}
 		return ret, nil
@@ -246,6 +258,18 @@ func decodeGroupInfoResponse(c *QQClient, _ *incomingPacketInfo, payload []byte)
 		Members:        []*GroupMemberInfo{},
 		LastMsgSeq:     int64(info.GroupInfo.GetGroupCurMsgSeq()),
 		client:         c,
+		Uin:             int64(*info.GroupInfo.GroupUin),
+		Code:            int64(*info.GroupCode),
+		Name:            string(info.GroupInfo.GroupName),
+		Memo:            string(info.GroupInfo.GroupMemo),
+		GroupCreateTime: *info.GroupInfo.GroupCreateTime,
+		GroupLevel:      *info.GroupInfo.GroupLevel,
+		OwnerUin:        int64(*info.GroupInfo.GroupOwner),
+		MemberCount:     uint16(*info.GroupInfo.GroupMemberNum),
+		MaxMemberCount:  uint16(*info.GroupInfo.GroupMemberMaxNum),
+		Members:         []*GroupMemberInfo{},
+		LastMsgSeq:      int64(info.GroupInfo.GetGroupCurMsgSeq()),
+		client:          c,
 	}, nil
 }
 
@@ -417,3 +441,4 @@ func (m *GroupMemberInfo) CardChangable() bool {
 	}
 	return m.Permission != Owner
 }
+

From 8a5cb302c3ee9cd24aa9173a5874011f7dcd2fee Mon Sep 17 00:00:00 2001
From: Sam <lau.sam745033858@gmail.com>
Date: Tue, 16 Mar 2021 20:42:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/group_info.go | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/client/group_info.go b/client/group_info.go
index de7345ba..68b0e739 100644
--- a/client/group_info.go
+++ b/client/group_info.go
@@ -19,14 +19,6 @@ import (
 
 type (
 	GroupInfo struct {
-		Uin            int64
-		Code           int64
-		Name           string
-		Memo           string
-		OwnerUin       int64
-		MemberCount    uint16
-		MaxMemberCount uint16
-		Members        []*GroupMemberInfo
 		Uin             int64
 		Code            int64
 		Name            string
@@ -248,16 +240,6 @@ func decodeGroupInfoResponse(c *QQClient, _ *incomingPacketInfo, payload []byte)
 		return nil, errors.New("group info not found")
 	}
 	return &GroupInfo{
-		Uin:            int64(*info.GroupInfo.GroupUin),
-		Code:           int64(*info.GroupCode),
-		Name:           string(info.GroupInfo.GroupName),
-		Memo:           string(info.GroupInfo.GroupMemo),
-		OwnerUin:       int64(*info.GroupInfo.GroupOwner),
-		MemberCount:    uint16(*info.GroupInfo.GroupMemberNum),
-		MaxMemberCount: uint16(*info.GroupInfo.GroupMemberMaxNum),
-		Members:        []*GroupMemberInfo{},
-		LastMsgSeq:     int64(info.GroupInfo.GetGroupCurMsgSeq()),
-		client:         c,
 		Uin:             int64(*info.GroupInfo.GroupUin),
 		Code:            int64(*info.GroupCode),
 		Name:            string(info.GroupInfo.GroupName),

From a0454193f7acd9dffd1d042529d980c6a413e791 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Sat, 20 Mar 2021 13:25:19 +0000
Subject: [PATCH 3/3] ci(chore): Fix stylings

---
 client/group_info.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/group_info.go b/client/group_info.go
index 68b0e739..504ea274 100644
--- a/client/group_info.go
+++ b/client/group_info.go
@@ -423,4 +423,3 @@ func (m *GroupMemberInfo) CardChangable() bool {
 	}
 	return m.Permission != Owner
 }
-