fix: update setGroupInfoEx func name and field. (#2634)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* update

* fix: update setGroupInfoEx func name and field.

* refactor: update groupinfoEx field.

* refactor: update database name in mongodb.yml

* add groupName Condition

config/webhooks.yml

@@ -130,10 +130,10 @@ beforeSetGroupInfo:
   enable: false
   timeout: 5
   failedContinue: true
-afterSetGroupInfoEX:
+afterSetGroupInfoEx:
   enable: false
   timeout: 5
-beforeSetGroupInfoEX:
+beforeSetGroupInfoEx:
   enable: false
   timeout: 5
   failedContinue: true

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.21
+	github.com/openimsdk/protocol v0.0.72-alpha.24
 	github.com/openimsdk/tools v0.0.50-alpha.12
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -322,8 +322,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.21 h1:MRSFDHVRsFymglbv2FSGPtiKo4RXZDTBwQTWNWiUf/U=
-github.com/openimsdk/protocol v0.0.72-alpha.21/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.24 h1:1Dl8TEZVXhdmve+ewoLkJa2wbFBIHqPgjvr9u/J66JM=
+github.com/openimsdk/protocol v0.0.72-alpha.24/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.12 h1:rV3BxgqN+F79vZvdoQ+97Eob8ScsRVEM8D+Wrcl23uo=
 github.com/openimsdk/tools v0.0.50-alpha.12/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

internal/api/group.go

@@ -35,8 +35,8 @@ func (o *GroupApi) SetGroupInfo(c *gin.Context) {
 	a2r.Call(group.GroupClient.SetGroupInfo, o.Client, c)
 }
 
-func (o *GroupApi) SetGroupInfoEX(c *gin.Context) {
-	a2r.Call(group.GroupClient.SetGroupInfoEX, o.Client, c)
+func (o *GroupApi) SetGroupInfoEx(c *gin.Context) {
+	a2r.Call(group.GroupClient.SetGroupInfoEx, o.Client, c)
 }
 
 func (o *GroupApi) JoinGroup(c *gin.Context) {

internal/api/router.go

@@ -130,7 +130,7 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
 	{
 		groupRouterGroup.POST("/create_group", g.CreateGroup)
 		groupRouterGroup.POST("/set_group_info", g.SetGroupInfo)
-		groupRouterGroup.POST("/set_group_info_ex", g.SetGroupInfoEX)
+		groupRouterGroup.POST("/set_group_info_ex", g.SetGroupInfoEx)
 		groupRouterGroup.POST("/join_group", g.JoinGroup)
 		groupRouterGroup.POST("/quit_group", g.QuitGroup)
 		groupRouterGroup.POST("/group_application_response", g.ApplicationGroupResponse)

internal/rpc/group/callback.go

@@ -359,73 +359,73 @@ func (s *groupServer) webhookAfterSetGroupInfo(ctx context.Context, after *confi
 	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterSetGroupInfoResp{}, after)
 }
 
-func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *config.BeforeConfig, req *group.SetGroupInfoEXReq) error {
+func (s *groupServer) webhookBeforeSetGroupInfoEx(ctx context.Context, before *config.BeforeConfig, req *group.SetGroupInfoExReq) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
-		cbReq := &callbackstruct.CallbackBeforeSetGroupInfoEXReq{
-			CallbackCommand: callbackstruct.CallbackBeforeSetGroupInfoCommand,
-			GroupID:         req.GroupInfoForSet.GroupID,
-			GroupName:       req.GroupInfoForSet.GroupName,
-			Notification:    req.GroupInfoForSet.Notification,
-			Introduction:    req.GroupInfoForSet.Introduction,
-			FaceURL:         req.GroupInfoForSet.FaceURL,
+		cbReq := &callbackstruct.CallbackBeforeSetGroupInfoExReq{
+			CallbackCommand: callbackstruct.CallbackBeforeSetGroupInfoExCommand,
+			GroupID:         req.GroupID,
+			GroupName:       req.GroupName,
+			Notification:    req.Notification,
+			Introduction:    req.Introduction,
+			FaceURL:         req.FaceURL,
 		}
 
-		if req.GroupInfoForSet.Ex != nil {
-			cbReq.Ex = req.GroupInfoForSet.Ex
+		if req.Ex != nil {
+			cbReq.Ex = req.Ex
 		}
 		log.ZDebug(ctx, "debug CallbackBeforeSetGroupInfoEX", "ex", cbReq.Ex)
 
-		if req.GroupInfoForSet.NeedVerification != nil {
-			cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
+		if req.NeedVerification != nil {
+			cbReq.NeedVerification = req.NeedVerification
 		}
-		if req.GroupInfoForSet.LookMemberInfo != nil {
-			cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
+		if req.LookMemberInfo != nil {
+			cbReq.LookMemberInfo = req.LookMemberInfo
 		}
-		if req.GroupInfoForSet.ApplyMemberFriend != nil {
-			cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
+		if req.ApplyMemberFriend != nil {
+			cbReq.ApplyMemberFriend = req.ApplyMemberFriend
 		}
 
-		resp := &callbackstruct.CallbackBeforeSetGroupInfoEXResp{}
+		resp := &callbackstruct.CallbackBeforeSetGroupInfoExResp{}
 
 		if err := s.webhookClient.SyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, resp, before); err != nil {
 			return err
 		}
 
-		datautil.NotNilReplace(&req.GroupInfoForSet.GroupID, &resp.GroupID)
-		datautil.NotNilReplace(&req.GroupInfoForSet.GroupName, &resp.GroupName)
-		datautil.NotNilReplace(&req.GroupInfoForSet.FaceURL, &resp.FaceURL)
-		datautil.NotNilReplace(&req.GroupInfoForSet.Introduction, &resp.Introduction)
-		datautil.NotNilReplace(&req.GroupInfoForSet.Ex, &resp.Ex)
-		datautil.NotNilReplace(&req.GroupInfoForSet.NeedVerification, &resp.NeedVerification)
-		datautil.NotNilReplace(&req.GroupInfoForSet.LookMemberInfo, &resp.LookMemberInfo)
-		datautil.NotNilReplace(&req.GroupInfoForSet.ApplyMemberFriend, &resp.ApplyMemberFriend)
+		datautil.NotNilReplace(&req.GroupID, &resp.GroupID)
+		datautil.NotNilReplace(&req.GroupName, &resp.GroupName)
+		datautil.NotNilReplace(&req.FaceURL, &resp.FaceURL)
+		datautil.NotNilReplace(&req.Introduction, &resp.Introduction)
+		datautil.NotNilReplace(&req.Ex, &resp.Ex)
+		datautil.NotNilReplace(&req.NeedVerification, &resp.NeedVerification)
+		datautil.NotNilReplace(&req.LookMemberInfo, &resp.LookMemberInfo)
+		datautil.NotNilReplace(&req.ApplyMemberFriend, &resp.ApplyMemberFriend)
 
 		return nil
 	})
 }
 
-func (s *groupServer) webhookAfterSetGroupInfoEX(ctx context.Context, after *config.AfterConfig, req *group.SetGroupInfoEXReq) {
-	cbReq := &callbackstruct.CallbackAfterSetGroupInfoEXReq{
-		CallbackCommand: callbackstruct.CallbackAfterSetGroupInfoCommand,
-		GroupID:         req.GroupInfoForSet.GroupID,
-		GroupName:       req.GroupInfoForSet.GroupName,
-		Notification:    req.GroupInfoForSet.Notification,
-		Introduction:    req.GroupInfoForSet.Introduction,
-		FaceURL:         req.GroupInfoForSet.FaceURL,
+func (s *groupServer) webhookAfterSetGroupInfoEx(ctx context.Context, after *config.AfterConfig, req *group.SetGroupInfoExReq) {
+	cbReq := &callbackstruct.CallbackAfterSetGroupInfoExReq{
+		CallbackCommand: callbackstruct.CallbackAfterSetGroupInfoExCommand,
+		GroupID:         req.GroupID,
+		GroupName:       req.GroupName,
+		Notification:    req.Notification,
+		Introduction:    req.Introduction,
+		FaceURL:         req.FaceURL,
 	}
 
-	if req.GroupInfoForSet.Ex != nil {
-		cbReq.Ex = req.GroupInfoForSet.Ex
+	if req.Ex != nil {
+		cbReq.Ex = req.Ex
 	}
-	if req.GroupInfoForSet.NeedVerification != nil {
-		cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
+	if req.NeedVerification != nil {
+		cbReq.NeedVerification = req.NeedVerification
 	}
-	if req.GroupInfoForSet.LookMemberInfo != nil {
-		cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
+	if req.LookMemberInfo != nil {
+		cbReq.LookMemberInfo = req.LookMemberInfo
 	}
-	if req.GroupInfoForSet.ApplyMemberFriend != nil {
-		cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
+	if req.ApplyMemberFriend != nil {
+		cbReq.ApplyMemberFriend = req.ApplyMemberFriend
 	}
 
-	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterSetGroupInfoEXResp{}, after)
+	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterSetGroupInfoExResp{}, after)
 }

internal/rpc/group/db_map.go

@@ -20,6 +20,7 @@ import (
 
 	pbgroup "github.com/openimsdk/protocol/group"
 	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/mcontext"
 )
 
@@ -54,11 +55,11 @@ func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[s
 	return m
 }
 
-func UpdateGroupInfoEXMap(ctx context.Context, group *sdkws.GroupInfoForSetEX) map[string]any {
+func UpdateGroupInfoExMap(ctx context.Context, group *pbgroup.SetGroupInfoExReq) (map[string]any, error) {
 	m := make(map[string]any)
 
-	if group.GroupName != "" {
-		m["group_name"] = group.GroupName
+	if group.GroupName != nil && group.GroupName.Value != "" {
+		return nil, errs.ErrArgs.WrapMsg("group name is empty")
 	}
 	if group.Notification != nil {
 		m["notification"] = group.Notification.Value
@@ -84,7 +85,7 @@ func UpdateGroupInfoEXMap(ctx context.Context, group *sdkws.GroupInfoForSetEX) m
 		m["ex"] = group.Ex.Value
 	}
 
-	return m
+	return m, nil
 }
 
 func UpdateGroupStatusMap(status int) map[string]any {

internal/rpc/group/group.go

@@ -1058,13 +1058,13 @@ func (g *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
 	return &pbgroup.SetGroupInfoResp{}, nil
 }
 
-func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupInfoEXReq) (*pbgroup.SetGroupInfoEXResp, error) {
+func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupInfoExReq) (*pbgroup.SetGroupInfoExResp, error) {
 	var opMember *model.GroupMember
 
 	if !authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID) {
 		var err error
 
-		opMember, err = g.db.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
+		opMember, err = g.db.TakeGroupMember(ctx, req.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
 		}
@@ -1078,11 +1078,11 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		}
 	}
 
-	if err := g.webhookBeforeSetGroupInfoEX(ctx, &g.config.WebhooksConfig.BeforeSetGroupInfoEX, req); err != nil && err != servererrs.ErrCallbackContinue {
+	if err := g.webhookBeforeSetGroupInfoEx(ctx, &g.config.WebhooksConfig.BeforeSetGroupInfoEx, req); err != nil && err != servererrs.ErrCallbackContinue {
 		return nil, err
 	}
 
-	group, err := g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
+	group, err := g.db.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1104,16 +1104,20 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	updatedData := UpdateGroupInfoEXMap(ctx, req.GroupInfoForSet)
+	updatedData, err := UpdateGroupInfoExMap(ctx, req)
 	if len(updatedData) == 0 {
-		return &pbgroup.SetGroupInfoEXResp{}, nil
+		return &pbgroup.SetGroupInfoExResp{}, nil
+	}
+
+	if err != nil {
+		return nil, err
 	}
 
 	if err := g.db.UpdateGroup(ctx, group.GroupID, updatedData); err != nil {
 		return nil, err
 	}
 
-	group, err = g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
+	group, err = g.db.TakeGroup(ctx, req.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1129,18 +1133,18 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 	}
 
 	num := len(updatedData)
-	if req.GroupInfoForSet.Notification != nil {
+	if req.Notification != nil {
 		num--
 
-		if req.GroupInfoForSet.Notification.Value != "" {
+		if req.Notification.Value != "" {
 			func() {
 				conversation := &pbconversation.ConversationReq{
-					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
+					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupID),
 					ConversationType: constant.ReadGroupChatType,
-					GroupID:          req.GroupInfoForSet.GroupID,
+					GroupID:          req.GroupID,
 				}
 
-				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
+				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupID})
 				if err != nil {
 					log.ZWarn(ctx, "GetGroupMemberIDs is failed.", err)
 					return
@@ -1157,7 +1161,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		}
 	}
 
-	if req.GroupInfoForSet.GroupName != "" {
+	if req.GroupName != nil {
 		num--
 		g.notification.GroupInfoSetNameNotification(ctx, &sdkws.GroupInfoSetNameTips{Group: tips.Group, OpUser: tips.OpUser})
 	}
@@ -1166,9 +1170,9 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		g.notification.GroupInfoSetNotification(ctx, tips)
 	}
 
-	g.webhookAfterSetGroupInfoEX(ctx, &g.config.WebhooksConfig.AfterSetGroupInfoEX, req)
+	g.webhookAfterSetGroupInfoEx(ctx, &g.config.WebhooksConfig.AfterSetGroupInfoEx, req)
 
-	return &pbgroup.SetGroupInfoEXResp{}, nil
+	return &pbgroup.SetGroupInfoExResp{}, nil
 }
 
 func (g *groupServer) TransferGroupOwner(ctx context.Context, req *pbgroup.TransferGroupOwnerReq) (*pbgroup.TransferGroupOwnerResp, error) {

pkg/callbackstruct/constant.go

@@ -18,9 +18,9 @@ const (
 	CallbackBeforeInviteJoinGroupCommand    = "callbackBeforeInviteJoinGroupCommand"
 	CallbackAfterJoinGroupCommand           = "callbackAfterJoinGroupCommand"
 	CallbackAfterSetGroupInfoCommand        = "callbackAfterSetGroupInfoCommand"
-	CallbackAfterSetGroupInfoEXCommand      = "callbackAfterSetGroupInfoEXCommand"
+	CallbackAfterSetGroupInfoExCommand      = "callbackAfterSetGroupInfoExCommand"
 	CallbackBeforeSetGroupInfoCommand       = "callbackBeforeSetGroupInfoCommand"
-	CallbackBeforeSetGroupInfoEXCommand     = "callbackBeforeSetGroupInfoEXCommand"
+	CallbackBeforeSetGroupInfoExCommand     = "callbackBeforeSetGroupInfoExCommand"
 	CallbackAfterRevokeMsgCommand           = "callbackBeforeAfterMsgCommand"
 	CallbackBeforeAddBlackCommand           = "callbackBeforeAddBlackCommand"
 	CallbackAfterAddFriendCommand           = "callbackAfterAddFriendCommand"

pkg/callbackstruct/group.go

@@ -244,11 +244,11 @@ type CallbackAfterSetGroupInfoResp struct {
 	CommonCallbackResp
 }
 
-type CallbackBeforeSetGroupInfoEXReq struct {
+type CallbackBeforeSetGroupInfoExReq struct {
 	CallbackCommand   `json:"callbackCommand"`
 	OperationID       string                  `json:"operationID"`
 	GroupID           string                  `json:"groupID"`
-	GroupName         string                  `json:"groupName"`
+	GroupName         *wrapperspb.StringValue `json:"groupName"`
 	Notification      *wrapperspb.StringValue `json:"notification"`
 	Introduction      *wrapperspb.StringValue `json:"introduction"`
 	FaceURL           *wrapperspb.StringValue `json:"faceURL"`
@@ -258,10 +258,10 @@ type CallbackBeforeSetGroupInfoEXReq struct {
 	ApplyMemberFriend *wrapperspb.Int32Value  `json:"applyMemberFriend"`
 }
 
-type CallbackBeforeSetGroupInfoEXResp struct {
+type CallbackBeforeSetGroupInfoExResp struct {
 	CommonCallbackResp
 	GroupID           string                  `json:"groupID"`
-	GroupName         string                  `json:"groupName"`
+	GroupName         *wrapperspb.StringValue `json:"groupName"`
 	Notification      *wrapperspb.StringValue `json:"notification"`
 	Introduction      *wrapperspb.StringValue `json:"introduction"`
 	FaceURL           *wrapperspb.StringValue `json:"faceURL"`
@@ -271,11 +271,11 @@ type CallbackBeforeSetGroupInfoEXResp struct {
 	ApplyMemberFriend *wrapperspb.Int32Value  `json:"applyMemberFriend"`
 }
 
-type CallbackAfterSetGroupInfoEXReq struct {
+type CallbackAfterSetGroupInfoExReq struct {
 	CallbackCommand   `json:"callbackCommand"`
 	OperationID       string                  `json:"operationID"`
 	GroupID           string                  `json:"groupID"`
-	GroupName         string                  `json:"groupName"`
+	GroupName         *wrapperspb.StringValue `json:"groupName"`
 	Notification      *wrapperspb.StringValue `json:"notification"`
 	Introduction      *wrapperspb.StringValue `json:"introduction"`
 	FaceURL           *wrapperspb.StringValue `json:"faceURL"`
@@ -285,6 +285,6 @@ type CallbackAfterSetGroupInfoEXReq struct {
 	ApplyMemberFriend *wrapperspb.Int32Value  `json:"applyMemberFriend"`
 }
 
-type CallbackAfterSetGroupInfoEXResp struct {
+type CallbackAfterSetGroupInfoExResp struct {
 	CommonCallbackResp
 }

pkg/common/config/config.go

@@ -428,8 +428,8 @@ type Webhooks struct {
 	BeforeInviteUserToGroup  BeforeConfig `mapstructure:"beforeInviteUserToGroup"`
 	AfterSetGroupInfo        AfterConfig  `mapstructure:"afterSetGroupInfo"`
 	BeforeSetGroupInfo       BeforeConfig `mapstructure:"beforeSetGroupInfo"`
-	AfterSetGroupInfoEX      AfterConfig  `mapstructure:"afterSetGroupInfoEX"`
-	BeforeSetGroupInfoEX     BeforeConfig `mapstructure:"beforeSetGroupInfoEX"`
+	AfterSetGroupInfoEx      AfterConfig  `mapstructure:"afterSetGroupInfoEx"`
+	BeforeSetGroupInfoEx     BeforeConfig `mapstructure:"beforeSetGroupInfoEx"`
 	AfterRevokeMsg           AfterConfig  `mapstructure:"afterRevokeMsg"`
 	BeforeAddBlack           BeforeConfig `mapstructure:"beforeAddBlack"`
 	AfterAddFriend           AfterConfig  `mapstructure:"afterAddFriend"`