Импорт

backend/src/Modules/Messaging/Infrastructure/Persistence/MessageQueryService.cs

@@ -32,6 +32,18 @@ public sealed class MessageQueryService : IMessageQueryService
 
     public async Task<List<MessageInfo>> GetOrphanedMessagesAsync(HashSet<Guid> activeChatIds, CancellationToken cancellationToken)
     {
+        if (activeChatIds == null || activeChatIds.Count == 0)
+        {
+            var allMessages = await _messages.Find(_ => true).ToListAsync(cancellationToken);
+            return allMessages.Select(m => new MessageInfo(
+                m.Id,
+                m.ChatId,
+                m.State.HasFlag(MessageState.IsDeleted),
+                m is MediaMessage mm && mm.Media.Any() ? mm.Media.First().Url : null,
+                m is MediaMessage mm2 && mm2.Media.Any() ? mm2.Media.Select(media => new Contracts.Messaging.Application.Abstractions.MediaInfo(media.Url)).ToList() : null
+            )).ToList();
+        }
+
         var builder = Builders<Message>.Filter;
         var inFilter = builder.In(m => m.ChatId, activeChatIds);
         var filter = builder.Not(inFilter);

backend/src/Modules/Messaging/Infrastructure/Persistence/MessageRepository.cs

@@ -62,18 +62,22 @@ public sealed class MessageRepository : IMessageRepository
             .FirstOrDefaultAsync(cancellationToken);
     }
 
-    public async Task<List<Message>> GetChatMessagesCursorAsync(Guid chatId, DateTime? cursor, int limit, CancellationToken cancellationToken)
+    public async Task<List<Message>> GetChatMessagesCursorAsync(Guid chatId, DateTime? cursor, long? sequenceId, int limit, CancellationToken cancellationToken)
     {
         var builder = Builders<Message>.Filter;
         var filter = builder.Eq(m => m.ChatId, chatId);
 
-        if (cursor.HasValue)
+        if (sequenceId.HasValue)
+        {
+            filter &= builder.Lt(m => m.SequenceId, sequenceId.Value);
+        }
+        else if (cursor.HasValue)
         {
             filter &= builder.Lt(m => m.CreatedAt, cursor.Value);
         }
 
         return await _messages.Find(filter)
-            .SortByDescending(m => m.CreatedAt)
+            .SortByDescending(m => m.SequenceId)
             .Limit(limit)
             .ToListAsync(cancellationToken);
     }