diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index c99094c83..71d47edc0 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -175,8 +175,10 @@ func main() { conversationGroup.POST("/get_all_conversations", conversation.GetAllConversations) conversationGroup.POST("/get_conversation", conversation.GetConversation) conversationGroup.POST("/get_conversations", conversation.GetConversations) + //deprecated conversationGroup.POST("/set_conversation", conversation.SetConversation) conversationGroup.POST("/batch_set_conversation", conversation.BatchSetConversations) + //deprecated conversationGroup.POST("/set_recv_msg_opt", conversation.SetRecvMsgOpt) conversationGroup.POST("/modify_conversation_field", conversation.ModifyConversationField) } diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index b73ffbc8b..5b7324908 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -19,7 +19,6 @@ import ( pbRtc "Open_IM/pkg/proto/rtc" "Open_IM/pkg/utils" "context" - "encoding/json" "strings" promePkg "Open_IM/pkg/common/prometheus" @@ -180,16 +179,6 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) { } pushToUserIDList = userIDList } - if pushMsg.MsgData.ContentType == constant.SuperGroupUpdateNotification { - m := make(map[string]bool) - _ = json.Unmarshal(pushMsg.MsgData.Content, &m) - if value, ok := m["kicked"]; ok { - if value { - pushToUserIDList = append(pushToUserIDList, pushMsg.MsgData.SendID) - } - } - - } grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), pushMsg.OperationID) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b8cebac15..7411588fe 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -278,7 +278,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR } go func() { for _, v := range okUserIDList { - chat.SuperGroupNotification(req.OperationID, v, v, false) + chat.SuperGroupNotification(req.OperationID, v, v) } }() } @@ -556,7 +556,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite } } for _, v := range req.InvitedUserIDList { - chat.SuperGroupNotification(req.OperationID, v, v, false) + chat.SuperGroupNotification(req.OperationID, v, v) } } @@ -788,7 +788,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou } go func() { for _, v := range req.KickedUserIDList { - chat.SuperGroupNotification(req.OperationID, v, v, true) + chat.SuperGroupNotification(req.OperationID, v, v) } }() @@ -1224,7 +1224,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupID); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, err.Error()) } - chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID, false) + chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID) } log.NewInfo(req.OperationID, "rpc QuitGroup return ", pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{}}) return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{}}, nil diff --git a/internal/rpc/msg/super_group_notification.go b/internal/rpc/msg/super_group_notification.go index aae7c3a22..76044c8e9 100644 --- a/internal/rpc/msg/super_group_notification.go +++ b/internal/rpc/msg/super_group_notification.go @@ -9,9 +9,7 @@ import ( //"github.com/golang/protobuf/proto" ) -func SuperGroupNotification(operationID, sendID, recvID string, isKicked bool) { - m := make(map[string]bool) - m["kicked"] = isKicked +func SuperGroupNotification(operationID, sendID, recvID string) { n := &NotificationMsg{ SendID: sendID, RecvID: recvID, @@ -20,7 +18,6 @@ func SuperGroupNotification(operationID, sendID, recvID string, isKicked bool) { SessionType: constant.SingleChatType, OperationID: operationID, } - n.Content = utils.StructToJsonBytes(m) log.NewInfo(operationID, utils.GetSelfFuncName(), string(n.Content)) Notification(n)