blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-27 14:02:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

add groupName Condition

Browse Source
This commit is contained in:
Monet Lee 2024-09-19 14:45:25 +08:00
parent c39d9d3e7b
commit 717a409aaa
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/rpc/group/db_map.go
View File

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

6
internal/rpc/group/group.go
View File

@ -1104,11 +1104,15 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
return nil, err return nil, err
} }
updatedData := UpdateGroupInfoExMap(ctx, req) updatedData, err := UpdateGroupInfoExMap(ctx, req)
if len(updatedData) == 0 { 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 { if err := g.db.UpdateGroup(ctx, group.GroupID, updatedData); err != nil {
return nil, err return nil, err
} }