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

This commit is contained in:
withchao
2023-07-12 13:39:54 +08:00
3 changed files with 7 additions and 4 deletions
+3 -1
View File
@@ -604,10 +604,11 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string
// 获取报错,或者获取不到了,物理删除并且返回seq delMongoMsgsPhysical(delStruct.delDocIDList), 结束递归
break
}
index++
//&& msgDocModel.Msg[0].Msg.SendTime > lastMsgDestructTime.UnixMilli()
if len(msgDocModel.Msg) > 0 {
for _, msg := range msgDocModel.Msg {
if msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
if msg != nil && msg.Msg != nil && msg.Msg.SendTime+destructTime*1000 <= time.Now().UnixMilli() {
if msg.Msg.SendTime > lastMsgDestructTime.UnixMilli() && !utils.Contain(userID, msg.DelList...) {
seqs = append(seqs, msg.Msg.Seq)
}
@@ -619,6 +620,7 @@ func (db *commonMsgDatabase) UserMsgsDestruct(ctx context.Context, userID string
}
}
}
log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversationID, "userID", userID, "seqs", seqs)
if len(seqs) > 0 {
latestSeq := seqs[len(seqs)-1]