From 475e64fc5b89d347a47ebd3a4a09c316c6674756 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 29 Mar 2022 16:32:25 +0800 Subject: [PATCH 1/7] mute group --- internal/rpc/group/group.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index eefbcac9c..a279603ad 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -969,7 +969,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGroupMemberReq) (*pbGroup.MuteGroupMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.UserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.GroupID, req.UserID) return &pbGroup.MuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } @@ -987,7 +987,7 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.CancelMuteGroupMemberReq) (*pbGroup.CancelMuteGroupMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.UserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.OpUserID, req.GroupID) return &pbGroup.CancelMuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } From d53da0e4220b7a01a4a0b021d22cc00fc5e6c188 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 29 Mar 2022 16:56:33 +0800 Subject: [PATCH 2/7] group add --- pkg/common/db/mysql_model/im_mysql_model/group_member_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index a8fe5ed56..f22070218 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -31,7 +31,7 @@ func InsertIntoGroupMember(toInsertInfo db.GroupMember) error { toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers } if toInsertInfo.MuteEndTime.Unix() == 0 { - toInsertInfo.MuteEndTime = time.Unix(0, 0) + toInsertInfo.MuteEndTime = time.Unix(1, 0) } err = dbConn.Table("group_members").Create(toInsertInfo).Error if err != nil { From 85cf7f26cee49cbf058ef6d36716a485f85e70ab Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 29 Mar 2022 17:03:06 +0800 Subject: [PATCH 3/7] mute group --- cmd/Open-IM-SDK-Core | 2 +- internal/rpc/group/group.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index a6b33ab9d..754a21f0b 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit a6b33ab9d277ef82e1e0e12c4affb49b53758735 +Subproject commit 754a21f0b1a86292127dd77999cfb42f18a713af diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index a279603ad..d62e24366 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -974,7 +974,8 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou return &pbGroup.MuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } groupMemberInfo := db.GroupMember{GroupID: req.GroupID, UserID: req.UserID} - groupMemberInfo.MuteEndTime = time.Unix(int64(time.Now().Second())+int64(req.MutedSeconds), 0) + + groupMemberInfo.MuteEndTime = time.Unix(int64(time.Now().Second())+int64(req.MutedSeconds), time.Now().UnixNano()) err := imdb.UpdateGroupMemberInfo(groupMemberInfo) if err != nil { log.Error(req.OperationID, "UpdateGroupMemberInfo failed ", err.Error(), groupMemberInfo) From bc260fffde073a7875328707318fe631a4071a0f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 29 Mar 2022 17:15:51 +0800 Subject: [PATCH 4/7] group add --- pkg/common/db/mysql_model/im_mysql_model/group_member_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index 70ed81c6e..8c16bd3ff 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -31,7 +31,7 @@ func InsertIntoGroupMember(toInsertInfo db.GroupMember) error { toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers } if toInsertInfo.MuteEndTime.Unix() == 0 { - toInsertInfo.MuteEndTime = time.Unix(1, 0) + toInsertInfo.MuteEndTime = time.Unix(1, 1) } err = dbConn.Table("group_members").Create(toInsertInfo).Error if err != nil { From e8517e954d0e979edcf6d4723d3d876cfe36ffdc Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 29 Mar 2022 17:20:37 +0800 Subject: [PATCH 5/7] group add --- .../db/mysql_model/im_mysql_model/group_member_model.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index 8c16bd3ff..b0ffbd4ee 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -30,9 +30,7 @@ func InsertIntoGroupMember(toInsertInfo db.GroupMember) error { if toInsertInfo.RoleLevel == 0 { toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers } - if toInsertInfo.MuteEndTime.Unix() == 0 { - toInsertInfo.MuteEndTime = time.Unix(1, 1) - } + toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0) err = dbConn.Table("group_members").Create(toInsertInfo).Error if err != nil { return err From de55c14a1632ce56846f5c59940b3bd4afd68ad9 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 29 Mar 2022 17:24:46 +0800 Subject: [PATCH 6/7] mute group --- cmd/Open-IM-SDK-Core | 2 +- internal/rpc/group/group.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 754a21f0b..119b4a428 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 754a21f0b1a86292127dd77999cfb42f18a713af +Subproject commit 119b4a428510aabc71f52b30867b8d5f64ddeaa2 diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index d62e24366..0b7500369 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -273,8 +273,11 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro } for _, v := range memberList { + log.Debug(req.OperationID, v) var node open_im_sdk.GroupMemberFullInfo cp.GroupMemberDBCopyOpenIM(&node, &v) + log.Debug(req.OperationID, "db value:", v) + log.Debug(req.OperationID, "cp value: ", node) resp.MemberList = append(resp.MemberList, &node) } log.NewInfo(req.OperationID, "GetGroupAllMember rpc return ", resp.String()) From 373e6b6c8e682e15c00f21ec728e5997613e3859 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 29 Mar 2022 17:29:05 +0800 Subject: [PATCH 7/7] mute group --- pkg/common/utils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go index 514063755..64f044a8e 100644 --- a/pkg/common/utils/utils.go +++ b/pkg/common/utils/utils.go @@ -118,7 +118,7 @@ func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.Group dst.AppMangerLevel = 1 } dst.JoinTime = int32(src.JoinTime.Unix()) - dst.MuteEndTime = uint32(src.JoinTime.Unix()) + dst.MuteEndTime = uint32(src.MuteEndTime.Unix()) if dst.MuteEndTime < uint32(time.Now().Unix()) { dst.MuteEndTime = 0 }