diff --git a/internal/api/group.go b/internal/api/group.go index 0adb9f331..01ffddee6 100644 --- a/internal/api/group.go +++ b/internal/api/group.go @@ -17,7 +17,10 @@ package api import ( "github.com/gin-gonic/gin" "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/wrapperspb" "github.com/openimsdk/tools/a2r" + "github.com/openimsdk/tools/apiresp" + "github.com/openimsdk/tools/errs" ) type GroupApi struct { @@ -40,6 +43,258 @@ func (o *GroupApi) SetGroupInfoEx(c *gin.Context) { a2r.Call(c, group.GroupClient.SetGroupInfoEx, o.Client) } +// SetSendMessageSetting 设置群成员发消息权限：allowSendMsg 0=全员可发，1=仅群主/管理员可发（委托 SetGroupInfoEx）。 +func (o *GroupApi) SetSendMessageSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + AllowSendMsg int32 `json:"allowSendMsg"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + if req.AllowSendMsg != 0 && req.AllowSendMsg != 1 { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("allowSendMsg must be 0 or 1")) + return + } + resp, err := o.Client.SetGroupInfoEx(c.Request.Context(), &group.SetGroupInfoExReq{ + GroupID: req.GroupID, + AllowSendMsg: wrapperspb.Int32(req.AllowSendMsg), + }) + if err != nil { + apiresp.GinError(c, err) + return + } + apiresp.GinSuccess(c, resp) +} + +// GetSendMessageSetting 返回当前群的 allowSendMsg：0=全员可发，1=仅群主/管理员可发（与 get_groups_info 中字段一致）。 +func (o *GroupApi) GetSendMessageSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + resp, err := o.Client.GetGroupsInfo(c.Request.Context(), &group.GetGroupsInfoReq{ + GroupIDs: []string{req.GroupID}, + }) + if err != nil { + apiresp.GinError(c, err) + return + } + if len(resp.GroupInfos) == 0 { + apiresp.GinError(c, errs.ErrRecordNotFound.WrapMsg("group not found", "groupID", req.GroupID)) + return + } + gi := resp.GroupInfos[0] + apiresp.GinSuccess(c, struct { + GroupID string `json:"groupID"` + AllowSendMsg int32 `json:"allowSendMsg"` + }{ + GroupID: gi.GroupID, + AllowSendMsg: gi.GetAllowSendMsg(), + }) +} + +// SetInviteSetting 设置群成员邀请他人入群权限：allowAddMember 0=全员可邀请/拉人，1=仅群主/管理员（委托 SetGroupInfoEx；邀请走 InviteUserToGroup 时 RPC 已校验）。 +func (o *GroupApi) SetInviteSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + AllowAddMember int32 `json:"allowAddMember"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + if req.AllowAddMember != 0 && req.AllowAddMember != 1 { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("allowAddMember must be 0 or 1")) + return + } + resp, err := o.Client.SetGroupInfoEx(c.Request.Context(), &group.SetGroupInfoExReq{ + GroupID: req.GroupID, + AllowAddMember: wrapperspb.Int32(req.AllowAddMember), + }) + if err != nil { + apiresp.GinError(c, err) + return + } + apiresp.GinSuccess(c, resp) +} + +// GetInviteSetting 返回当前群的 allowAddMember（与 get_groups_info 中字段一致）。 +func (o *GroupApi) GetInviteSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + resp, err := o.Client.GetGroupsInfo(c.Request.Context(), &group.GetGroupsInfoReq{ + GroupIDs: []string{req.GroupID}, + }) + if err != nil { + apiresp.GinError(c, err) + return + } + if len(resp.GroupInfos) == 0 { + apiresp.GinError(c, errs.ErrRecordNotFound.WrapMsg("group not found", "groupID", req.GroupID)) + return + } + gi := resp.GroupInfos[0] + apiresp.GinSuccess(c, struct { + GroupID string `json:"groupID"` + AllowAddMember int32 `json:"allowAddMember"` + }{ + GroupID: gi.GroupID, + AllowAddMember: gi.GetAllowAddMember(), + }) +} + +// SetPinSetting 设置群成员置顶消息权限：allowPinMsg 0=全员可置顶，1=仅群主/管理员（委托 SetGroupInfoEx；置顶/取消置顶走 pin_group_message / unpin_group_message 时 RPC 已校验）。 +func (o *GroupApi) SetPinSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + AllowPinMsg int32 `json:"allowPinMsg"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + if req.AllowPinMsg != 0 && req.AllowPinMsg != 1 { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("allowPinMsg must be 0 or 1")) + return + } + resp, err := o.Client.SetGroupInfoEx(c.Request.Context(), &group.SetGroupInfoExReq{ + GroupID: req.GroupID, + AllowPinMsg: wrapperspb.Int32(req.AllowPinMsg), + }) + if err != nil { + apiresp.GinError(c, err) + return + } + apiresp.GinSuccess(c, resp) +} + +// GetPinSetting 返回当前群的 allowPinMsg（与 get_groups_info 中字段一致）。 +func (o *GroupApi) GetPinSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + resp, err := o.Client.GetGroupsInfo(c.Request.Context(), &group.GetGroupsInfoReq{ + GroupIDs: []string{req.GroupID}, + }) + if err != nil { + apiresp.GinError(c, err) + return + } + if len(resp.GroupInfos) == 0 { + apiresp.GinError(c, errs.ErrRecordNotFound.WrapMsg("group not found", "groupID", req.GroupID)) + return + } + gi := resp.GroupInfos[0] + apiresp.GinSuccess(c, struct { + GroupID string `json:"groupID"` + AllowPinMsg int32 `json:"allowPinMsg"` + }{ + GroupID: gi.GroupID, + AllowPinMsg: gi.GetAllowPinMsg(), + }) +} + +// SetEditSetting 设置群成员编辑群资料权限：allowEditGroupInfo 0=全员可编辑，1=仅群主/管理员（委托 SetGroupInfoEx；改群资料走 set_group_info / set_group_info_ex 时 RPC 已校验）。 +func (o *GroupApi) SetEditSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + AllowEditGroupInfo int32 `json:"allowEditGroupInfo"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + if req.AllowEditGroupInfo != 0 && req.AllowEditGroupInfo != 1 { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("allowEditGroupInfo must be 0 or 1")) + return + } + resp, err := o.Client.SetGroupInfoEx(c.Request.Context(), &group.SetGroupInfoExReq{ + GroupID: req.GroupID, + AllowEditGroupInfo: wrapperspb.Int32(req.AllowEditGroupInfo), + }) + if err != nil { + apiresp.GinError(c, err) + return + } + apiresp.GinSuccess(c, resp) +} + +// GetEditSetting 返回当前群的 allowEditGroupInfo（与 get_groups_info 中字段一致）。 +func (o *GroupApi) GetEditSetting(c *gin.Context) { + var req struct { + GroupID string `json:"groupID"` + } + if err := c.ShouldBindJSON(&req); err != nil { + apiresp.GinError(c, errs.ErrArgs.WrapMsg(err.Error())) + return + } + if req.GroupID == "" { + apiresp.GinError(c, errs.ErrArgs.WrapMsg("groupID is empty")) + return + } + resp, err := o.Client.GetGroupsInfo(c.Request.Context(), &group.GetGroupsInfoReq{ + GroupIDs: []string{req.GroupID}, + }) + if err != nil { + apiresp.GinError(c, err) + return + } + if len(resp.GroupInfos) == 0 { + apiresp.GinError(c, errs.ErrRecordNotFound.WrapMsg("group not found", "groupID", req.GroupID)) + return + } + gi := resp.GroupInfos[0] + apiresp.GinSuccess(c, struct { + GroupID string `json:"groupID"` + AllowEditGroupInfo int32 `json:"allowEditGroupInfo"` + }{ + GroupID: gi.GroupID, + AllowEditGroupInfo: gi.GetAllowEditGroupInfo(), + }) +} + func (o *GroupApi) JoinGroup(c *gin.Context) { a2r.Call(c, group.GroupClient.JoinGroup, o.Client) } diff --git a/internal/api/router.go b/internal/api/router.go index fdcef7b04..c681b8208 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -223,7 +223,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, co friendRouterGroup.POST("/add_oneway_friend", f.AddOnewayFriend) friendRouterGroup.POST("/set_mute", f.SetMute) friendRouterGroup.POST("/get_mute", f.GetMute) - // 好友会话置顶 / 取消置顶（同步写入 friend.is_pinned 与 conversation.isPinned） friendRouterGroup.POST("/pin", f.PinFriend) friendRouterGroup.POST("/unpin", f.UnpinFriend) } @@ -234,6 +233,14 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, co groupRouterGroup.POST("/create_group", g.CreateGroup) groupRouterGroup.POST("/set_group_info", g.SetGroupInfo) groupRouterGroup.POST("/set_group_info_ex", g.SetGroupInfoEx) + groupRouterGroup.POST("/set_send_message_setting", g.SetSendMessageSetting) + groupRouterGroup.POST("/get_send_message_setting", g.GetSendMessageSetting) + groupRouterGroup.POST("/set_invite_setting", g.SetInviteSetting) + groupRouterGroup.POST("/get_invite_setting", g.GetInviteSetting) + groupRouterGroup.POST("/set_pin_setting", g.SetPinSetting) + groupRouterGroup.POST("/get_pin_setting", g.GetPinSetting) + groupRouterGroup.POST("/set_edit_setting", g.SetEditSetting) + groupRouterGroup.POST("/get_edit_setting", g.GetEditSetting) groupRouterGroup.POST("/join_group", g.JoinGroup) groupRouterGroup.POST("/quit_group", g.QuitGroup) groupRouterGroup.POST("/group_application_response", g.ApplicationGroupResponse) @@ -269,7 +276,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, co groupRouterGroup.POST("/get_group_pinned_messages", g.GetGroupPinnedMessages) groupRouterGroup.POST("/set_mute", g.SetGroupMute) groupRouterGroup.POST("/get_mute", g.GetGroupMute) - // 群会话置顶 / 取消置顶（同步写入 conversation.isPinned） groupRouterGroup.POST("/pin", g.PinGroup) groupRouterGroup.POST("/unpin", g.UnpinGroup) } diff --git a/pkg/common/convert/group.go b/pkg/common/convert/group.go index 5e41599c6..de889775c 100644 --- a/pkg/common/convert/group.go +++ b/pkg/common/convert/group.go @@ -41,6 +41,10 @@ func Db2PbGroupInfo(m *model.Group, ownerUserID string, memberCount uint32) *sdk ApplyMemberFriend: m.ApplyMemberFriend, NotificationUpdateTime: m.NotificationUpdateTime.UnixMilli(), NotificationUserID: m.NotificationUserID, + AllowSendMsg: m.AllowSendMsg, + AllowPinMsg: m.AllowPinMsg, + AllowAddMember: m.AllowAddMember, + AllowEditGroupInfo: m.AllowEditGroupInfo, } }