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

Show group notification editor

Browse Source
This commit is contained in:
skiffer-git 2022-07-13 11:09:29 +08:00
parent fb4cef7ccb
commit 2d110deb09
6 changed files with 344 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/open_im_api/main.go
View File

@ -145,10 +145,10 @@ func main() {
chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg) chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
} }
//Manager //Manager
managementGroup := r.Group("/manager") //managementGroup := r.Group("/manager")
{ //{
managementGroup.POST("/delete_user", manage.DeleteUser) //1 // managementGroup.POST("/delete_user", manage.DeleteUser) //1
} //}
//Conversation //Conversation
conversationGroup := r.Group("/conversation") conversationGroup := r.Group("/conversation")
{ //1 { //1

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

@ -243,13 +243,18 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v) owner, err2 := imdb.GetGroupOwnerInfoByGroupID(v)
group, err := imdb.GetGroupInfoByGroupID(v) group, err := imdb.GetGroupInfoByGroupID(v)
if num > 0 && owner != nil && err2 == nil && group != nil && err == nil { if num > 0 && owner != nil && err2 == nil && group != nil && err == nil {
if group.Status == constant.GroupStatusDismissed {
log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group)
continue
}
utils.CopyStructFields(&groupNode, group) utils.CopyStructFields(&groupNode, group)
groupNode.CreateTime = uint32(group.CreateTime.Unix()) groupNode.CreateTime = uint32(group.CreateTime.Unix())
groupNode.MemberCount = uint32(num) groupNode.NotificationUpdateTime = uint32(group.NotificationUpdateTime.Unix())
groupNode.MemberCount = num
groupNode.OwnerUserID = owner.UserID groupNode.OwnerUserID = owner.UserID
resp.GroupList = append(resp.GroupList, &groupNode) resp.GroupList = append(resp.GroupList, &groupNode)
} else { } else {
log.NewError(req.OperationID, "check nil ", num, owner, err, group) log.NewError(req.OperationID, "check nil ", num, owner, err, group, err2)
continue continue
} }
log.NewDebug(req.OperationID, "joinedGroup ", groupNode) log.NewDebug(req.OperationID, "joinedGroup ", groupNode)
@ -1129,6 +1134,10 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
//only administrators can set group information //only administrators can set group information
var groupInfo db.Group var groupInfo db.Group
utils.CopyStructFields(&groupInfo, req.GroupInfoForSet) utils.CopyStructFields(&groupInfo, req.GroupInfoForSet)
if req.GroupInfoForSet.Notification != "" {
groupInfo.NotificationUserID = req.OpUserID
groupInfo.NotificationUpdateTime = time.Now()
}
err = imdb.SetGroupInfo(groupInfo) err = imdb.SetGroupInfo(groupInfo)
if err != nil { if err != nil {
log.NewError(req.OperationID, "SetGroupInfo failed ", err.Error(), groupInfo) log.NewError(req.OperationID, "SetGroupInfo failed ", err.Error(), groupInfo)

2
pkg/common/db/model_struct.go
View File

@ -90,6 +90,8 @@ type Group struct {
NeedVerification int32 `gorm:"column:need_verification"` NeedVerification int32 `gorm:"column:need_verification"`
LookMemberInfo int32 `gorm:"column:look_member_info" json:"lookMemberInfo"` LookMemberInfo int32 `gorm:"column:look_member_info" json:"lookMemberInfo"`
ApplyMemberFriend int32 `gorm:"column:apply_member_friend" json:"applyMemberFriend"` ApplyMemberFriend int32 `gorm:"column:apply_member_friend" json:"applyMemberFriend"`
NotificationUpdateTime time.Time `gorm:"column:notification_update_time"`
NotificationUserID string `gorm:"column:notification_user_id;size:64"`
} }
//message GroupMemberFullInfo { //message GroupMemberFullInfo {

1
pkg/common/utils/utils.go
View File

@ -98,6 +98,7 @@ func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *db.Group) error {
return utils.Wrap(err, "") return utils.Wrap(err, "")
} }
dst.CreateTime = uint32(src.CreateTime.Unix()) dst.CreateTime = uint32(src.CreateTime.Unix())
dst.NotificationUpdateTime = uint32(src.NotificationUpdateTime.Unix())
return nil return nil
} }

568
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pkg/proto/sdk_ws/ws.proto
View File

@ -23,6 +23,8 @@ message GroupInfo{
int32 needVerification = 13; int32 needVerification = 13;
int32 lookMemberInfo =14; int32 lookMemberInfo =14;
int32 applyMemberFriend = 15; int32 applyMemberFriend = 15;
uint32 notificationUpdateTime = 16;
string notificationUserID = 17;
} }
message GroupInfoForSet{ message GroupInfoForSet{