Merge remote-tracking branch 'origin/ver3' into ver3

internal/msggateway/client.go

@@ -212,6 +212,7 @@ func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error
 	} else {
 		msg.Msgs = m
 	}
+	log.ZDebug(ctx, "PushMessage", "msg", msg)
 	data, err := proto.Marshal(&msg)
 	if err != nil {
 		return err

internal/rpc/conversation/conversaion.go

@@ -210,6 +210,9 @@ func (c *conversationServer) SetConversations(ctx context.Context, req *pbConver
 	if req.Conversation.IsPinned != nil {
 		m["is_pinned"] = req.Conversation.IsPinned.Value
 	}
+	if req.Conversation.GroupAtType != nil {
+		m["group_at_type"] = req.Conversation.GroupAtType.Value
+	}
 	if req.Conversation.IsPrivateChat != nil {
 		var conversations []*tableRelation.ConversationModel
 		for _, ownerUserID := range req.UserIDs {

internal/rpc/msg/send.go

@@ -2,12 +2,15 @@ package msg
 
 import (
 	"context"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	promePkg "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
 	pbMsg "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
@@ -46,6 +49,9 @@ func (m *msgServer) sendMsgSuperGroupChat(ctx context.Context, req *pbMsg.SendMs
 	if err != nil {
 		return nil, err
 	}
+	if req.MsgData.ContentType == constant.AtText {
+		go m.setConversationAtInfo(ctx, req.MsgData)
+	}
 	if err = callbackAfterSendGroupMsg(ctx, req); err != nil {
 		log.ZWarn(ctx, "CallbackAfterSendGroupMsg", err)
 	}
@@ -56,6 +62,47 @@ func (m *msgServer) sendMsgSuperGroupChat(ctx context.Context, req *pbMsg.SendMs
 	resp.ClientMsgID = req.MsgData.ClientMsgID
 	return resp, nil
 }
+func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgData) {
+	log.ZDebug(nctx, "setConversationAtInfo", "msg", msg)
+	ctx := mcontext.NewCtx("@@@" + mcontext.GetOperationID(nctx))
+	var atUserID []string
+	conversation := &pbConversation.ConversationReq{
+		ConversationID:   utils.GetConversationIDByMsg(msg),
+		ConversationType: msg.SessionType,
+		GroupID:          msg.GroupID,
+	}
+	tagAll := utils.IsContain(constant.AtAllString, msg.AtUserIDList)
+	if tagAll {
+		memberUserIDList, err := m.Group.GetGroupMemberIDs(ctx, msg.GroupID)
+		if err != nil {
+			log.ZWarn(ctx, "GetGroupMemberIDs", err)
+			return
+		}
+		atUserID = utils.DifferenceString([]string{constant.AtAllString}, msg.AtUserIDList)
+		if len(atUserID) == 0 { //just @everyone
+			conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAll}
+		} else { //@Everyone and @other people
+			conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAllAtMe}
+			err := m.Conversation.SetConversations(ctx, atUserID, conversation)
+			if err != nil {
+				log.ZWarn(ctx, "SetConversations", err, "userID", atUserID, "conversation", conversation)
+			}
+			memberUserIDList = utils.DifferenceString(atUserID, memberUserIDList)
+		}
+		conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtAll}
+		err = m.Conversation.SetConversations(ctx, memberUserIDList, conversation)
+		if err != nil {
+			log.ZWarn(ctx, "SetConversations", err, "userID", memberUserIDList, "conversation", conversation)
+		}
+	} else {
+		conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.AtMe}
+		err := m.Conversation.SetConversations(ctx, msg.AtUserIDList, conversation)
+		if err != nil {
+			log.ZWarn(ctx, "SetConversations", err, msg.AtUserIDList, conversation)
+		}
+	}
+
+}
 
 func (m *msgServer) sendMsgNotification(ctx context.Context, req *pbMsg.SendMsgReq) (resp *pbMsg.SendMsgResp, err error) {
 	promePkg.Inc(promePkg.SingleChatMsgRecvSuccessCounter)

pkg/common/mw/rpc_client_interceptor.go

@@ -31,10 +31,10 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac
 	log.ZDebug(ctx, "get rpc ctx success", "conn target", cc.Target())
 	err = invoker(ctx, method, req, resp, cc, opts...)
 	if err == nil {
-		// log.ZInfo(ctx, "rpc client resp", "funcName", method, "resp", rpcString(resp))
+		log.ZInfo(ctx, "rpc client resp", "funcName", method, "resp", rpcString(resp))
 		return nil
 	}
-	// log.ZError(ctx, "rpc resp error", err)
+	log.ZError(ctx, "rpc resp error", err)
 	rpcErr, ok := err.(interface{ GRPCStatus() *status.Status })
 	if !ok {
 		return errs.ErrInternalServer.Wrap(err.Error())

pkg/rpcclient/conversation.go

@@ -63,6 +63,10 @@ func (c *ConversationRpcClient) SetConversationMaxSeq(ctx context.Context, owner
 	_, err := c.Client.SetConversationMaxSeq(ctx, &pbConversation.SetConversationMaxSeqReq{OwnerUserID: ownerUserIDs, ConversationID: conversationID, MaxSeq: maxSeq})
 	return err
 }
+func (c *ConversationRpcClient) SetConversations(ctx context.Context, userIDs []string, conversation *pbConversation.ConversationReq) error {
+	_, err := c.Client.SetConversations(ctx, &pbConversation.SetConversationsReq{UserIDs: userIDs, Conversation: conversation})
+	return err
+}
 
 func (c *ConversationRpcClient) GetConversationIDs(ctx context.Context, ownerUserID string) ([]string, error) {
 	resp, err := c.Client.GetConversationIDs(ctx, &pbConversation.GetConversationIDsReq{UserID: ownerUserID})