From cefeec9823a11ef669cd9cbe9fa47a50fc84bd38 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 13 Jun 2023 11:05:02 +0800
Subject: [PATCH 1/3] msg

---
 internal/rpc/msg/as_read.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go
index 54e372fa2..c643f464f 100644
--- a/internal/rpc/msg/as_read.go
+++ b/internal/rpc/msg/as_read.go
@@ -55,10 +55,16 @@ func (m *msgServer) MarkMsgsAsRead(ctx context.Context, req *msg.MarkMsgsAsReadR
 	if err != nil {
 		return
 	}
-	err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, hasReadSeq)
-	if err != nil {
+	currentHasReadSeq, err := m.MsgDatabase.GetHasReadSeq(ctx, req.UserID, req.ConversationID)
+	if err != nil && errors.Unwrap(err) != redis.Nil {
 		return
 	}
+	if hasReadSeq > currentHasReadSeq {
+		err = m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, hasReadSeq)
+		if err != nil {
+			return
+		}
+	}
 	if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, conversations[0].ConversationType, req.UserID, m.conversationAndGetRecvID(conversations[0], req.UserID), req.Seqs, hasReadSeq); err != nil {
 		return
 	}

From 1055a11b030fa68ecdd2521421259c13385337f6 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 13 Jun 2023 14:55:58 +0800
Subject: [PATCH 2/3] eng 2 chn

---
 pkg/common/constant/constant.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
index 697694e87..fe9fcd1f3 100644
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@@ -240,15 +240,15 @@ const (
 )
 
 var ContentType2PushContent = map[int64]string{
-	Picture:   "[图片]",
-	Voice:     "[语音]",
-	Video:     "[视频]",
-	File:      "[文件]",
-	Text:      "你收到了一条文本消息",
-	AtText:    "[有人@你]",
-	GroupMsg:  "你收到一条群聊消息",
-	Common:    "你收到一条新消息",
-	SignalMsg: "音视频通话邀请",
+	Picture:   "[PICTURE]",
+	Voice:     "[VOICE]",
+	Video:     "[VIDEO]",
+	File:      "[File]",
+	Text:      "[TEXT]",
+	AtText:    "[@TEXT]",
+	GroupMsg:  "[GROUPMSG]]",
+	Common:    "[NEWMSG]",
+	SignalMsg: "[SIGNALINVITE]",
 }
 
 const (

From dd3f29be68d249be8eb7c3c4e0785fe53dcc44d9 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 13 Jun 2023 20:52:20 +0800
Subject: [PATCH 3/3] remove memberList

---
 internal/rpc/msg/verify.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go
index 8fcb82ca8..6e0b2153c 100644
--- a/internal/rpc/msg/verify.go
+++ b/internal/rpc/msg/verify.go
@@ -78,15 +78,15 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
 		}
 		if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
 			return nil
-		} else {
-			memberIDs, err := m.GroupLocalCache.GetGroupMemberIDs(ctx, data.MsgData.GroupID)
-			if err != nil {
-				return err
-			}
-			if !utils.IsContain(data.MsgData.SendID, memberIDs) {
-				return errs.ErrNotInGroupYet.Wrap()
-			}
 		}
+		// memberIDs, err := m.GroupLocalCache.GetGroupMemberIDs(ctx, data.MsgData.GroupID)
+		// if err != nil {
+		// 	return err
+		// }
+		// if !utils.IsContain(data.MsgData.SendID, memberIDs) {
+		// 	return errs.ErrNotInGroupYet.Wrap()
+		// }
+
 		groupMemberInfo, err := m.Group.GetGroupMemberCache(ctx, data.MsgData.GroupID, data.MsgData.SendID)
 		if err != nil {
 			return err