fix: msg pull change and fcm redis flag fix.

internal/api/msg.go

@@ -53,7 +53,7 @@ func (MessageApi) SetOptions(options map[string]bool, value bool) {
 	utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, value)
 }
 
-func (m MessageApi) newUserSendMsgReq(c *gin.Context, params *apistruct.SendMsg) *msg.SendMsgReq {
+func (m MessageApi) newUserSendMsgReq(_ *gin.Context, params *apistruct.SendMsg) *msg.SendMsgReq {
 	var newContent string
 	options := make(map[string]bool, 5)
 	switch params.ContentType {

pkg/common/db/cache/msg.go

@@ -51,7 +51,7 @@ const (
 	getuiTaskID      = "GETUI_TASK_ID"
 	signalCache      = "SIGNAL_CACHE:"
 	signalListCache  = "SIGNAL_LIST_CACHE:"
-	fcmToken         = "FCM_TOKEN:"
+	FCM_TOKEN        = "FCM_TOKEN:"
 
 	messageCache            = "MESSAGE_CACHE:"
 	messageDelUserList      = "MESSAGE_DEL_USER_LIST:"
@@ -650,15 +650,15 @@ func (c *msgCache) GetSendMsgStatus(ctx context.Context, id string) (int32, erro
 }
 
 func (c *msgCache) SetFcmToken(ctx context.Context, account string, platformID int, fcmToken string, expireTime int64) (err error) {
-	return errs.Wrap(c.rdb.Set(ctx, fcmToken+account+":"+strconv.Itoa(platformID), fcmToken, time.Duration(expireTime)*time.Second).Err())
+	return errs.Wrap(c.rdb.Set(ctx, FCM_TOKEN+account+":"+strconv.Itoa(platformID), fcmToken, time.Duration(expireTime)*time.Second).Err())
 }
 
 func (c *msgCache) GetFcmToken(ctx context.Context, account string, platformID int) (string, error) {
-	return utils.Wrap2(c.rdb.Get(ctx, fcmToken+account+":"+strconv.Itoa(platformID)).Result())
+	return utils.Wrap2(c.rdb.Get(ctx, FCM_TOKEN+account+":"+strconv.Itoa(platformID)).Result())
 }
 
 func (c *msgCache) DelFcmToken(ctx context.Context, account string, platformID int) error {
-	return errs.Wrap(c.rdb.Del(ctx, fcmToken+account+":"+strconv.Itoa(platformID)).Err())
+	return errs.Wrap(c.rdb.Del(ctx, FCM_TOKEN+account+":"+strconv.Itoa(platformID)).Err())
 }
 
 func (c *msgCache) IncrUserBadgeUnreadCountSum(ctx context.Context, userID string) (int, error) {

pkg/common/db/controller/msg.go

@@ -441,6 +441,25 @@ func (db *commonMsgDatabase) getMsgBySeqsRange(ctx context.Context, userID strin
 	return seqMsgs, nil
 }
 
+// GetMsgBySeqsRange In the context of group chat, we have the following parameters:
+//
+// "maxSeq" of a conversation: It represents the maximum value of messages in the group conversation.
+// "minSeq" of a conversation (default: 1): It represents the minimum value of messages in the group conversation.
+//
+// For a user's perspective regarding the group conversation, we have the following parameters:
+//
+// "userMaxSeq": It represents the user's upper limit for message retrieval in the group. If not set (default: 0),
+// it means the upper limit is the same as the conversation's "maxSeq".
+// "userMinSeq": It represents the user's starting point for message retrieval in the group. If not set (default: 0),
+// it means the starting point is the same as the conversation's "minSeq".
+//
+// The scenarios for these parameters are as follows:
+//
+// For users who have been kicked out of the group, "userMaxSeq" can be set as the maximum value they had before
+// being kicked out. This limits their ability to retrieve messages up to a certain point.
+// For new users joining the group, if they don't need to receive old messages,
+// "userMinSeq" can be set as the same value as the conversation's "maxSeq" at the moment they join the group.
+// This ensures that their message retrieval starts from the point they joined.
 func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID string, conversationID string, begin, end, num, userMaxSeq int64) (int64, int64, []*sdkws.MsgData, error) {
 	userMinSeq, err := db.cache.GetConversationUserMinSeq(ctx, conversationID, userID)
 	if err != nil && errs.Unwrap(err) != redis.Nil {
@@ -453,6 +472,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	if userMinSeq > minSeq {
 		minSeq = userMinSeq
 	}
+	//"minSeq" represents the startSeq value that the user can retrieve.
 	if minSeq > end {
 		log.ZInfo(ctx, "minSeq > end", "minSeq", minSeq, "end", end)
 		return 0, 0, nil, nil
@@ -467,23 +487,41 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 			maxSeq = userMaxSeq
 		}
 	}
+	//"maxSeq" represents the endSeq value that the user can retrieve.
+
 	if begin < minSeq {
 		begin = minSeq
 	}
 	if end > maxSeq {
 		end = maxSeq
 	}
+	//"begin" and "end" represent the actual startSeq and endSeq values that the user can retrieve.
 	if end < begin {
 		return 0, 0, nil, errs.ErrArgs.Wrap("seq end < begin")
 	}
 	var seqs []int64
-	for i := end; i > end-num; i-- {
+	if end-begin+1 <= num {
-		if i >= begin {
+		for i := begin; i <= end; i++ {
-			seqs = append([]int64{i}, seqs...)
+			seqs = append(seqs, i)
+		}
 	} else {
-			break
+		for i := end - num + 1; i <= end; i++ {
+			seqs = append(seqs, i)
 		}
 	}
+
+	//167 178 10
+	//if end-num <  {
+	//
+	//}
+	//var seqs []int64
+	//for i := end; i > end-num; i-- {
+	//	if i >= begin {
+	//		seqs = append([]int64{i}, seqs...)
+	//	} else {
+	//		break
+	//	}
+	//}
 	if len(seqs) == 0 {
 		return 0, 0, nil, nil
 	}
@@ -551,7 +589,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 			return 0, 0, nil, err
 		}
 		prome.Add(prome.MsgPullFromMongoSuccessCounter, len(mongoMsgs))
-		successMsgs = append(successMsgs, mongoMsgs...)
+		successMsgs = append(mongoMsgs, successMsgs...)
 	}
 
 	return minSeq, maxSeq, successMsgs, nil