From 998f7d01a5b52a7864336deebd3fbe6396ccaca5 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <andrew.zuo@wustl.edu>
Date: Thu, 23 Nov 2023 15:28:29 +0800
Subject: [PATCH] merge callback after join group

---
 pkg/callbackstruct/group.go | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go
index 32f1207a3..b17df0ec8 100644
--- a/pkg/callbackstruct/group.go
+++ b/pkg/callbackstruct/group.go
@@ -115,45 +115,45 @@ type CallbackAfterJoinGroupResp struct {
 
 type CallbackBeforeSetGroupInfoReq 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 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 {