From 69fff628b35638a3f9be433304b2cd15f489a281 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <andrew.zuo@wustl.edu>
Date: Thu, 23 Nov 2023 15:59:31 +0800
Subject: [PATCH] fix callbackbeforesetgroupinfo

---
 internal/rpc/group/callback.go | 10 ++++-----
 pkg/callbackstruct/group.go    | 40 +++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go
index 9dad3194e..3b33a96d7 100644
--- a/internal/rpc/group/callback.go
+++ b/internal/rpc/group/callback.go
@@ -246,17 +246,17 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq)
 	}
 
 	if req.GroupInfoForSet.Ex != nil {
-		callbackReq.Ex = &req.GroupInfoForSet.Ex.Value
+		callbackReq.Ex = req.GroupInfoForSet.Ex.Value
 	}
-	log.ZDebug(ctx, "debug!!!!!!", callbackReq.Ex)
+	log.ZDebug(ctx, "debug CallbackBeforeSetGroupInfo", callbackReq.Ex)
 	if req.GroupInfoForSet.NeedVerification != nil {
-		callbackReq.NeedVerification = &req.GroupInfoForSet.NeedVerification.Value
+		callbackReq.NeedVerification = req.GroupInfoForSet.NeedVerification.Value
 	}
 	if req.GroupInfoForSet.LookMemberInfo != nil {
-		callbackReq.LookMemberInfo = &req.GroupInfoForSet.LookMemberInfo.Value
+		callbackReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo.Value
 	}
 	if req.GroupInfoForSet.ApplyMemberFriend != nil {
-		callbackReq.ApplyMemberFriend = &req.GroupInfoForSet.ApplyMemberFriend.Value
+		callbackReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend.Value
 	}
 	resp := &callbackstruct.CallbackBeforeSetGroupInfoResp{}
 
diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go
index b17df0ec8..6db92eebe 100644
--- a/pkg/callbackstruct/group.go
+++ b/pkg/callbackstruct/group.go
@@ -130,30 +130,30 @@ type CallbackBeforeSetGroupInfoReq struct {
 
 type CallbackBeforeSetGroupInfoResp struct {
 	CommonCallbackResp
-	GroupID           string ` json:"groupID"`
-	GroupName         string `json:"groupName"`
-	Notification      string `json:"notification"`
-	Introduction      string `json:"introduction"`
-	FaceURL           string `json:"faceURL"`
-	Ex                string `json:"ex"`
-	NeedVerification  int32  `json:"needVerification"`
-	LookMemberInfo    int32  `json:"lookMemberInfo"`
-	ApplyMemberFriend int32  `json:"applyMemberFriend"`
+	GroupID           string  ` json:"groupID"`
+	GroupName         string  `json:"groupName"`
+	Notification      string  `json:"notification"`
+	Introduction      string  `json:"introduction"`
+	FaceURL           string  `json:"faceURL"`
+	Ex                *string `json:"ex"`
+	NeedVerification  *int32  `json:"needVerification"`
+	LookMemberInfo    *int32  `json:"lookMemberInfo"`
+	ApplyMemberFriend *int32  `json:"applyMemberFriend"`
 }
 
 type CallbackAfterSetGroupInfoReq struct {
 	CallbackCommand   `json:"callbackCommand"`
-	OperationID       string `json:"operationID"`
-	GroupID           string `json:"groupID"`
-	GroupName         string `json:"groupName"`
-	Notification      string `json:"notification"`
-	Introduction      string `json:"introduction"`
-	FaceURL           string `json:"faceURL"`
-	Ex                string `json:"ex"`
-	NeedVerification  int32  `json:"needVerification"`
-	LookMemberInfo    int32  `json:"lookMemberInfo"`
-	ApplyMemberFriend int32  `json:"applyMemberFriend"`
-	EventTime         int64  `json:"eventTime"`
+	OperationID       string  `json:"operationID"`
+	GroupID           string  `json:"groupID"`
+	GroupName         string  `json:"groupName"`
+	Notification      string  `json:"notification"`
+	Introduction      string  `json:"introduction"`
+	FaceURL           string  `json:"faceURL"`
+	Ex                *string `json:"ex"`
+	NeedVerification  *int32  `json:"needVerification"`
+	LookMemberInfo    *int32  `json:"lookMemberInfo"`
+	ApplyMemberFriend *int32  `json:"applyMemberFriend"`
+	EventTime         int64   `json:"eventTime"`
 }
 
 type CallbackAfterSetGroupInfoResp struct {