Убрал аватары и имена внутри чата личных чатов

backend/src/Contracts/Auth/Application/Abstractions/IJwtTokenProvider.cs

@@ -4,6 +4,7 @@ public interface IJwtTokenProvider
 {
     string GenerateAccessToken(Guid userId, string username);
     string GenerateRefreshToken();
+    DateTime GetRefreshTokenExpiry();
     string Generate(Guid userId, string username, string displayName, string? avatar);
     string Generate(Domain.UserContract user);
 }

backend/src/Contracts/Auth/Application/Auth/DTOs/AuthErrors.cs

@@ -7,5 +7,7 @@ public static class AuthErrors
     public static Error IdentityInvalidCredentials => new("Auth.InvalidCredentials", "Invalid credentials");
     public static Error IdentityRegistrationDisabled => new("Auth.RegistrationDisabled", "Registration is disabled");
     public static Error IdentityUsernameNotUnique => new("Auth.UsernameNotUnique", "Username is already taken");
+    public static Error IdentityRegistrationFailed => new("Auth.RegistrationFailed", "Failed to register user");
+    public static Error RefreshTokenExpired => new("Auth.RefreshTokenExpired", "Refresh token has expired. Please login again.");
     public static Error UserNotFound => new("Auth.UserNotFound", "User not found");
 }

backend/src/Contracts/Auth/Domain/UserContract.cs

@@ -19,4 +19,12 @@ public class UserContract
     public bool IsExternal { get; set; }
     public string? Domain { get; set; }
     public DateTime? LastSeen { get; set; }
+    public string? RefreshToken { get; set; }
+    public DateTime? RefreshTokenExpiry { get; set; }
+
+    public void SetRefreshToken(string? refreshToken, DateTime? expiry = null)
+    {
+        RefreshToken = refreshToken;
+        RefreshTokenExpiry = expiry;
+    }
 }

backend/src/Contracts/Conversations/Domain/Chat.cs

@@ -36,17 +36,21 @@ public sealed class Chat : AggregateRoot<Guid>
     public string? Avatar { get; private set; }
     public DateTime CreatedAt { get; private set; }
     public long LastMessageSequenceId { get; private set; }
+    public bool IsImporting { get; private set; }
+    public Guid? ImportJobId { get; private set; }
 
     private readonly List<ChatMember> _members = new();
     public IReadOnlyCollection<ChatMember> Members => _members.AsReadOnly();
 
-    private Chat(Guid id, ChatType type, string? name, string? avatar, string? description = null) : base(id)
+    private Chat(Guid id, ChatType type, string? name, string? avatar, string? description = null, bool isImporting = false, Guid? importJobId = null) : base(id)
     {
         Type = type;
         Name = name;
         Avatar = avatar;
         Description = description;
         CreatedAt = DateTime.UtcNow;
+        IsImporting = isImporting;
+        ImportJobId = importJobId;
     }
 
     public static Chat CreatePersonal()
@@ -63,13 +67,18 @@ public sealed class Chat : AggregateRoot<Guid>
         return chat;
     }
 
-    public static Chat Create(string? name, ChatType type, string? avatar = null, string? description = null)
+    public static Chat Create(string? name, ChatType type, string? avatar = null, string? description = null, bool isImporting = false, Guid? importJobId = null)
     {
-        var chat = new Chat(Guid.NewGuid(), type, name, avatar, description);
+        var chat = new Chat(Guid.NewGuid(), type, name, avatar, description, isImporting, importJobId);
         chat.RaiseDomainEvent(new ChatCreatedDomainEvent(chat));
         return chat;
     }
 
+    public void CompleteImport()
+    {
+        IsImporting = false;
+    }
+
     public void AddMember(Guid userId, string role = "member")
     {
         if (_members.Any(m => m.UserId == userId))

backend/src/Contracts/Conversations/Domain/ChatConstants.cs

@@ -0,0 +1,8 @@
+namespace Knot.Contracts.Conversations.Domain;
+
+public static class ChatConstants
+{
+    public const int DefaultMessageQueryLimit = 50;
+    public const int MaxSharedMediaQueryLimit = 1000;
+    public const int MaxGroupNameLength = 100;
+}

backend/src/Contracts/Conversations/Domain/ChatErrors.cs

@@ -0,0 +1,19 @@
+using Knot.Shared.Kernel;
+
+namespace Knot.Contracts.Conversations.Domain;
+
+public static class ChatErrors
+{
+    public static readonly Error ChatNotFound = new Error("Chat.NotFound", "Чат не найден");
+    public static readonly Error OnlyOwnerCanUpdate = new Error("Chat.OnlyOwnerCanUpdate", "Только владелец может редактировать чат");
+    public static readonly Error Unauthorized = new Error("Chat.Unauthorized", "Нет доступа к этому чату");
+    public static readonly Error FoldersDisabled = new Error("Chat.FoldersDisabled", "Папки отключены");
+    public static readonly Error FileEmpty = new Error("Chat.FileEmpty", "Файл пуст");
+    public static Error FileTooLarge(long maxMb) => new Error("Chat.FileTooLarge", $"Файл слишком большой (максимум {maxMb} МБ)");
+    public static readonly Error ChatsNotFound = new Error("Chat.NotFound", "Чат не найден");
+    public static readonly Error ChatsForbidden = new Error("Chat.Forbidden", "Доступ запрещен");
+    public static readonly Error MediaDisabled = new Error("Chat.MediaDisabled", "Медиафайлы отключены");
+    public static readonly Error PollsDisabled = new Error("Chat.PollsDisabled", "Опросы отключены");
+    public static readonly Error NotFound = new Error("Chat.NotFound", "Не найдено");
+    public static readonly Error NotMember = new Error("Chat.NotMember", "Вы не являетесь участником чата");
+}

backend/src/Contracts/Messaging/Application/Abstractions/IMessageNotifier.cs

@@ -3,4 +3,5 @@ namespace Knot.Contracts.Messaging.Application.Abstractions;
 public interface IMessageNotifier 
 { 
     Task NotifyNewMessageAsync(Guid chatId, object messagePayload, CancellationToken cancellationToken); 
+    Task NotifyMessageUpdateAsync(Guid chatId, string updateType, object updatePayload, CancellationToken cancellationToken); 
 }

backend/src/Contracts/Messaging/Application/Abstractions/IMessageRepository.cs

@@ -8,9 +8,12 @@ public interface IMessageRepository
     Task<Message?> GetByIdAsync(Guid id, CancellationToken cancellationToken);
     Task<List<Message>> GetChatMessagesAsync(Guid chatId, int limit, int offset, CancellationToken cancellationToken);
     Task<Message?> GetLatestChatMessageAsync(Guid chatId, CancellationToken cancellationToken);
+    Task<List<Message>> GetPinnedMessagesAsync(Guid chatId, CancellationToken cancellationToken);
     Task<List<Message>> SearchMessagesAsync(string query, Guid? chatId, Guid requestingUserId, CancellationToken cancellationToken);
 
-    Task<List<Message>> GetChatMessagesCursorAsync(Guid chatId, DateTime? cursor, int limit, CancellationToken cancellationToken);
+    Task<List<Message>> GetChatMessagesCursorAsync(Guid chatId, DateTime? cursor, long? sequenceId, int limit, CancellationToken cancellationToken);
+    Task<List<Message>> GetChatMessagesAroundAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken);
+    Task<List<Message>> GetChatMessagesAfterAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken);
     Task<Message?> GetLastStoryMessageAsync(Guid chatId, Guid storyId, CancellationToken cancellationToken);
 
     Task UpdateAsync(Message message, CancellationToken cancellationToken);

backend/src/Contracts/Messaging/Domain/CallMessage.cs

@@ -0,0 +1,33 @@
+using System;
+
+namespace Knot.Contracts.Messaging.Domain;
+
+public class CallMessage : Message
+{
+    public override string Type => "call";
+    public override string? Content { get; protected set; }
+    public string CallType { get; protected set; }
+    public string CallStatus { get; protected set; }
+    public int? Duration { get; protected set; }
+
+    public CallMessage() : base() { }
+
+    public CallMessage(
+        Guid id, 
+        Guid chatId, 
+        Guid senderId, 
+        string callType, 
+        string callStatus, 
+        int? duration,
+        Guid? replyToId, 
+        Guid? forwardedFromId, 
+        DateTime createdAt, 
+        bool isImported = false) 
+        : base(id, chatId, senderId, replyToId, forwardedFromId, createdAt, isImported)
+    {
+        CallType = callType;
+        CallStatus = callStatus;
+        Duration = duration;
+        Content = $"Call {callStatus}";
+    }
+}

backend/src/Contracts/Messaging/Domain/MediaMessage.cs

@@ -21,7 +21,7 @@ public class MediaMessage : Message
     public MediaMessage(Guid id, Guid chatId, Guid senderId, string mediaType, string? caption, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported)
         : this(id, chatId, senderId, Enum.TryParse<MediaType>(mediaType, true, out var mt) ? mt : MediaType.File, caption, replyToId, forwardedFromId, createdAt, isImported) { }
 
-    public void AddMedia(string type, string url, string? filename, long? size) => _media.Add(new Media { Type = type, Url = url, FileId = filename, Size = size });
+    public void AddMedia(string type, string url, string? filename, long? size, string? duration = null) => _media.Add(new Media { Type = type, Url = url, Filename = filename, FileId = filename, Size = size, Duration = duration });
 
     public override void Edit(string newCaption) => base.Edit(newCaption);
 

backend/src/Contracts/Messaging/Domain/Message.cs

@@ -23,6 +23,9 @@ public abstract class Message : AggregateRoot<Guid>
     protected List<DeletedMessage> _deletedFor = new();
     public IReadOnlyCollection<DeletedMessage> DeletedFor => _deletedFor.AsReadOnly();
 
+    protected List<Guid> _readByUsers = new();
+    public IReadOnlyCollection<Guid> ReadByUsers => _readByUsers.AsReadOnly();
+
     protected Message() : base(Guid.Empty) { }
 
     protected Message(Guid id, Guid chatId, Guid senderId, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported)
@@ -53,4 +56,14 @@ public abstract class Message : AggregateRoot<Guid>
         if (!_deletedFor.Exists(x => x.UserId == userId))
             _deletedFor.Add(new DeletedMessage(Id, userId));
     }
+
+    public void MarkAsRead(Guid userId)
+    {
+        if (!_readByUsers.Contains(userId))
+        {
+            _readByUsers.Add(userId);
+        }
+    }
+
+    public bool IsReadBy(Guid userId) => _readByUsers.Contains(userId);
 }

backend/src/Contracts/Messaging/Domain/PollMessage.cs

@@ -7,26 +7,32 @@ public class PollMessage : Message
 {
     public override string Type => "poll";
     public override string? Content { get; protected set; }
-    public List<PollOption> Options { get; } = new();
-    public List<PollVote> Votes { get; } = new();
+    public List<PollOption> Options { get; set; } = new();
+    public List<PollVote> Votes { get; set; } = new();
     public bool IsMultipleChoice { get; set; }
+    public bool IsAnonymous { get; set; }
     public DateTime? ExpiresAt { get; set; }
     public bool IsClosed { get; set; }
 
     public PollMessage() : base() { }
 
-    public PollMessage(Guid id, Guid chatId, Guid senderId, string? question, List<string>? options, bool isAnonymous, bool isMultiple, DateTime? expiresAt, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported)
+    public PollMessage(Guid id, Guid chatId, Guid senderId, string? question, List<PollOption>? options, bool isAnonymous, bool isMultiple, DateTime? expiresAt, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported)
         : base(id, chatId, senderId, replyToId, forwardedFromId, createdAt, isImported)
     {
         Content = question ?? "Poll";
-        if (options != null) 
-        {
-            foreach (var opt in options) 
-            {
-                Options.Add(new PollOption { Text = opt });
-            }
-        }
+        Options = options ?? new List<PollOption>();
+        IsAnonymous = isAnonymous;
         IsMultipleChoice = isMultiple;
         ExpiresAt = expiresAt;
     }
+
+    public static PollMessage Create(Guid id, Guid chatId, Guid senderId, string? question, List<string> options, bool isAnonymous, bool isMultiple, DateTime? expiresAt, Guid? replyToId, Guid? forwardedFromId)
+    {
+        var poll = new PollMessage(id, chatId, senderId, question, null, isAnonymous, isMultiple, expiresAt, replyToId, forwardedFromId, DateTime.UtcNow, false);
+        foreach (var opt in options)
+        {
+            poll.Options.Add(new PollOption { Text = opt });
+        }
+        return poll;
+    }
 }

backend/src/Contracts/Messaging/Domain/PollOption.cs

@@ -2,6 +2,7 @@ namespace Knot.Contracts.Messaging.Domain;
 
 public class PollOption 
 { 
+    public Guid Id { get; set; } = Guid.NewGuid();
     public string Text { get; set; } = string.Empty; 
     public int VoteCount { get; set; } 
 }

backend/src/Contracts/Messaging/Domain/PollVote.cs

@@ -4,7 +4,7 @@ namespace Knot.Contracts.Messaging.Domain;
 
 public class PollVote 
 { 
-    public Guid OptionIndex { get; set; } 
+    public Guid OptionId { get; set; } 
     public Guid UserId { get; set; } 
     public DateTime VotedAt { get; set; } 
 }

backend/src/Host/Program.cs

@@ -41,6 +41,7 @@ using MediatR;
 
 
 JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -48,7 +49,7 @@ var builder = WebApplication.CreateBuilder(args);
 // Маппинг стандартных переменных окружения в иерархию .NET
 var envMappings = new Dictionary<string, string?>
 {
-    ["ConnectionStrings:DefaultConnection"] = builder.Configuration["DATABASE_URL"] ?? "Host=localhost;Database=knot;Username=postgres;Password=postgres",
+    ["ConnectionStrings:DefaultConnection"] = builder.Configuration["DATABASE_URL"] ?? builder.Configuration.GetConnectionString("DefaultConnection") ?? "Host=localhost;Database=knot;Username=postgres;Password=postgres",
     ["ConnectionStrings:MongoConnection"] = builder.Configuration["MONGO_CONNECTION"],
     ["Jwt:Secret"] = builder.Configuration["JWT_SECRET"],
     ["Jwt:Issuer"] = builder.Configuration["JWT_ISSUER"],
@@ -81,6 +82,7 @@ builder.Services.AddStoriesModule(builder.Configuration);
 builder.Services.AddKlipyModule();
 builder.Services.AddAdminModule();
 builder.Services.AddWebRtcModule();
+builder.Services.AddTelegramImportModule();
 builder.Services.AddSharedInfrastructure(builder.Configuration);
 
 // CQRS / MediatR для команд в Host (например, AdminController)
@@ -93,7 +95,10 @@ builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(
     typeof(Knot.Modules.Stories.DependencyInjection).Assembly,
     typeof(Knot.Modules.Klipy.DependencyInjection).Assembly,
     typeof(Knot.Modules.Relations.DependencyInjection).Assembly,
-    typeof(Knot.Modules.WebRtc.DependencyInjection).Assembly
+    typeof(Knot.Modules.WebRtc.DependencyInjection).Assembly,
+    typeof(Knot.Modules.TelegramImport.DependencyInjection).Assembly,
+    typeof(Knot.Modules.Auth.Infrastructure.Persistence.AuthDbContext).Assembly,
+    typeof(Knot.Modules.Profiles.DependencyInjection).Assembly
 ));
 
 // Настройка CORS

backend/src/Host/appsettings.json

@@ -13,7 +13,8 @@
     "Secret": "knot_super_secret_key_1234567890_knot",
     "Issuer": "Knot",
     "Audience": "KnotUsers",
-    "ExpiryInMinutes": 1440
+    "ExpiryInMinutes": 1440,
+    "RefreshExpiryInDays": 30
   },
   "KNOT_MASTER_ENCRYPTION_KEY": "knot_super_secret_key_1234567890_knot"
 }

backend/src/Modules/Admin/Application/Admin/Commands/CleanRun/CleanRunCommand.cs

@@ -8,7 +8,7 @@ using Knot.Contracts.Auth.Infrastructure.Persistence;
 using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
 using Knot.Contracts.Messaging.Application.Abstractions;
-using Knot.Contracts.Storage.Abstractions;
+using Knot.Shared.Kernel.Storage;
 using Knot.Contracts.Stories.Infrastructure.Persistence;
 using Knot.Modules.Admin.Application.Admin.DTOs;
 using MediatR;
@@ -51,7 +51,7 @@ internal sealed class CleanRunCommandHandler : ICommandHandler<CleanRunCommand,
             var orphanMessages = await _messageQueryService.GetOrphanedMessagesAsync(activeChatIds, cancellationToken);
 
             var keptMessages = allMessages
-                .Where(m => !orphanMessages.Any(om => om.Id == m.Id))
+                .Where(m => !orphanMessages.Any(om => om.Id == m.Id) && !m.IsDeleted)
                 .ToList();
 
             var allMinioFiles = (await _fileStorage.ListFilesAsync()).ToList();

backend/src/Modules/Admin/Application/Admin/Queries/CleanDryRun/CleanDryRunQuery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -8,6 +8,7 @@ using Knot.Contracts.Auth.Infrastructure.Persistence;
 using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
 using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Shared.Kernel.Storage;
 using Knot.Contracts.Stories.Infrastructure.Persistence;
 using Knot.Modules.Admin.Application.Admin.DTOs;
 using MediatR;
@@ -23,17 +24,20 @@ internal sealed class CleanDryRunQueryHandler : IQueryHandler<CleanDryRunQuery,
     private readonly IAuthDbContext _authDbContext;
     private readonly IChatsDbContext _chatsDbContext;
     private readonly IStoryCollection _storyCollection;
+    private readonly IFileStorageService _fileStorage;
 
     public CleanDryRunQueryHandler(
         Knot.Contracts.Messaging.Application.Abstractions.IMessageQueryService messageService,
         IAuthDbContext authDbContext,
         IChatsDbContext chatsDbContext,
-        IStoryCollection storyCollection)
+        IStoryCollection storyCollection,
+        IFileStorageService fileStorage)
     {
         _messageService = messageService;
         _authDbContext = authDbContext;
         _chatsDbContext = chatsDbContext;
         _storyCollection = storyCollection;
+        _fileStorage = fileStorage;
     }
 
     public async Task<Result<CleanDryRunResult>> Handle(CleanDryRunQuery request, CancellationToken ct)
@@ -46,25 +50,42 @@ internal sealed class CleanDryRunQueryHandler : IQueryHandler<CleanDryRunQuery,
             var orphanedMediaCount = orphanedMessages.Count(m => m.MediaUrl != null);
             var orphanedMessageCount = orphanedMessages.Count;
 
-            var validIds = new HashSet<string>();
-            foreach (var msg in orphanedMessages.Where(m => m.MediaUrl != null))
-            {
-                var parts = msg.MediaUrl.Split('/');
-                var fileId = parts.LastOrDefault();
-                if (!string.IsNullOrEmpty(fileId))
-                {
-                    validIds.Add(fileId);
-                }
-            }
-
+            var allMessages = await _messageService.GetAllMessagesAsync(ct);
+            var keptMessages = allMessages
+                .Where(m => !orphanedMessages.Any(om => om.Id == m.Id) && !m.IsDeleted)
+                .ToList();
+            var allUsers = await _authDbContext.Users.ToListAsync(ct);
             var stories = await _storyCollection.GetAllAsync(ct);
+
+            var validUrls = new HashSet<string>();
+
+            var activeMessageUrls = keptMessages.Where(m => m.Media != null).SelectMany(m => m.Media!).Select(x => x.Url).Where(u => !string.IsNullOrEmpty(u));
+            var activeChatUrls = _chatsDbContext.Chats.Select(c => c.Avatar).Where(u => !string.IsNullOrEmpty(u));
+            var activeUserUrls = allUsers.Select(u => u.Avatar).Where(u => !string.IsNullOrEmpty(u));
+            var activeStoryUrls = stories.Select(s => s.MediaUrl).Where(u => !string.IsNullOrEmpty(u));
+
+            foreach (var u in activeMessageUrls) validUrls.Add(u!);
+            foreach (var u in activeChatUrls) validUrls.Add(u!);
+            foreach (var u in activeUserUrls) validUrls.Add(u!);
+            foreach (var u in activeStoryUrls) validUrls.Add(u!);
+
+            var validFileIds = validUrls
+                .Where(u => u.Contains("/api/files/"))
+                .Select(u => u.Split('/').Last())
+                .ToHashSet();
+
+            var allMinioFiles = await _fileStorage.ListFilesAsync();
+            long orphanedFileSize = allMinioFiles
+                .Where(f => !validFileIds.Contains(f.FileId))
+                .Sum(f => f.Size);
+
             var expiredStoriesCount = stories.Count(s => s.ExpiresAt.HasValue && s.ExpiresAt.Value < DateTime.UtcNow);
             var expiredStoriesSize = stories.Where(s => s.ExpiresAt.HasValue && s.ExpiresAt.Value < DateTime.UtcNow).Sum(s => s.MediaUrl?.Length ?? 0);
 
             return Result.Success(new CleanDryRunResult(
                 orphanedMessageCount,
                 orphanedMediaCount,
-                0,
+                orphanedFileSize,
                 expiredStoriesCount,
                 expiredStoriesSize
             ));

backend/src/Modules/Admin/Presentation/Endpoints/AdminEndpoints.cs

@@ -131,6 +131,17 @@ public static class AdminEndpoints
             return Results.Ok(result.Value);
         });
 
+        group.MapPost("clean/run", async (ISender sender, CancellationToken ct) =>
+        {
+            var result = await sender.Send(new CleanRunCommand(), ct);
+            if (!result.IsSuccess)
+            {
+                Console.WriteLine($"[Admin] Cleanup Run Error: {result.Error.Description}");
+                return Results.BadRequest(new { error = result.Error.Description });
+            }
+            return Results.Ok(result.Value);
+        });
+
         group.MapGet("timezones", () =>
         {
             // Получаем все системные часовые пояса и формируем удобный для фронтенда формат

backend/src/Modules/Auth/Application/Abstractions/IJwtTokenProvider.cs

@@ -5,5 +5,8 @@ namespace Knot.Modules.Auth.Application.Abstractions;
 public interface IJwtTokenProvider
 {
     string Generate(User user);
+    string Generate(Guid userId, string username, string displayName, string? avatar);
+    string GenerateRefreshToken();
+    DateTime GetRefreshTokenExpiry();
 }
 

backend/src/Modules/Auth/Application/Users/GetMe/GetMe.cs

@@ -1,4 +1,6 @@
-using Knot.Contracts.Auth.Application.Auth.DTOs;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using Knot.Contracts.Auth.Application.Abstractions;
 using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Shared.Kernel;
 
@@ -9,10 +11,12 @@ public sealed record GetMeQuery(Guid UserId) : IQuery<AuthResponseDto>;
 internal sealed class GetMeQueryHandler : IQueryHandler<GetMeQuery, AuthResponseDto>
 {
     private readonly IUserRepository _userRepository;
+    private readonly IJwtTokenProvider _tokenProvider;
 
-    public GetMeQueryHandler(IUserRepository userRepository)
+    public GetMeQueryHandler(IUserRepository userRepository, IJwtTokenProvider tokenProvider)
     {
         _userRepository = userRepository;
+        _tokenProvider = tokenProvider;
     }
 
     public async Task<Result<AuthResponseDto>> Handle(GetMeQuery request, CancellationToken cancellationToken)
@@ -23,9 +27,18 @@ internal sealed class GetMeQueryHandler : IQueryHandler<GetMeQuery, AuthResponse
             return Result.Failure<AuthResponseDto>(AuthErrors.UserNotFound);
         }
 
+        // Check if access token needs to be refreshed (less than 1 hour remaining)
+        string? newAccessToken = null;
+
+        // We can't directly check the current token's expiry here, but we can 
+        // always issue a new token if the user is authenticated
+        // For now, let's issue a new token on every request (simplified approach)
+        // A better approach would be to parse the incoming token and check expiry
+        newAccessToken = _tokenProvider.Generate(user);
+
         var response = new AuthResponseDto
         {
-            AccessToken = string.Empty,
+            AccessToken = newAccessToken,
             RefreshToken = string.Empty,
             UserId = user.Id,
             Username = user.Username,

backend/src/Modules/Auth/Application/Users/Login/LoginUserCommandHandler.cs

@@ -5,9 +5,6 @@ using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Auth.Application.Users.Login;
 
-/// <summary>
-/// ������� ��� ����� ������������. ���������� AuthResponseDto.
-/// </summary>
 public sealed record LoginUserCommand(string Username, string Password) : ICommand<AuthResponseDto>;
 
 public sealed class LoginUserCommandHandler : ICommandHandler<LoginUserCommand, AuthResponseDto>
@@ -31,14 +28,21 @@ public sealed class LoginUserCommandHandler : ICommandHandler<LoginUserCommand,
         }
 
         string token = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+        string refreshToken = _tokenProvider.GenerateRefreshToken();
+        DateTime refreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+
+        // Save refresh token to database
+        user.SetRefreshToken(refreshToken, refreshExpiry);
+        await _userRepository.UpdateAsync(user, cancellationToken);
 
         return Result.Success(new AuthResponseDto
         {
             AccessToken = token,
-            RefreshToken = string.Empty,
+            RefreshToken = refreshToken,
             UserId = user.Id,
             Username = user.Username,
             DisplayName = user.DisplayName
         });
     }
 }
+

backend/src/Modules/Auth/Application/Users/RefreshToken/RefreshTokenCommand.cs

@@ -0,0 +1,7 @@
+using Knot.Contracts.Auth.Application.Auth.DTOs;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Auth.Application.Users.RefreshToken;
+
+public record RefreshTokenCommand(string RefreshToken) : ICommand<AuthResponseDto>;

backend/src/Modules/Auth/Application/Users/RefreshToken/RefreshTokenCommandHandler.cs

@@ -0,0 +1,65 @@
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Application.Auth.DTOs;
+using Knot.Contracts.Auth.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Auth.Application.Users.RefreshToken;
+
+internal sealed class RefreshTokenCommandHandler : ICommandHandler<RefreshTokenCommand, AuthResponseDto>
+{
+    private readonly IUserRepository _userRepository;
+    private readonly IJwtTokenProvider _tokenProvider;
+
+    public RefreshTokenCommandHandler(
+        IUserRepository userRepository,
+        IJwtTokenProvider tokenProvider)
+    {
+        _userRepository = userRepository;
+        _tokenProvider = tokenProvider;
+    }
+
+    public async Task<Result<AuthResponseDto>> Handle(RefreshTokenCommand request, CancellationToken cancellationToken)
+    {
+        if (string.IsNullOrWhiteSpace(request.RefreshToken))
+        {
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.InvalidRefreshToken", "Refresh token is required"));
+        }
+
+        var user = await _userRepository.GetByRefreshTokenAsync(request.RefreshToken, cancellationToken);
+        if (user == null)
+        {
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.InvalidRefreshToken", "Invalid or expired refresh token"));
+        }
+
+        // Check if refresh token has expired
+        if (user.RefreshTokenExpiry.HasValue && user.RefreshTokenExpiry.Value < DateTime.UtcNow)
+        {
+            // Clear expired refresh token
+            user.SetRefreshToken(null, null);
+            await _userRepository.UpdateAsync(user, cancellationToken);
+            
+            return Result.Failure<AuthResponseDto>(
+                new Error("Auth.RefreshTokenExpired", "Refresh token has expired. Please login again."));
+        }
+
+        var newAccessToken = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+
+        var newRefreshToken = _tokenProvider.GenerateRefreshToken();
+        var newRefreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+        user.SetRefreshToken(newRefreshToken, newRefreshExpiry);
+        await _userRepository.UpdateAsync(user, cancellationToken);
+
+        return Result.Success(new AuthResponseDto
+        {
+            AccessToken = newAccessToken,
+            RefreshToken = newRefreshToken,
+            UserId = user.Id,
+            Username = user.Username,
+            DisplayName = user.DisplayName,
+            Avatar = user.Avatar
+        });
+    }
+}

backend/src/Modules/Auth/Application/Users/Register/RegisterUserCommandHandler.cs

@@ -1,5 +1,4 @@
 using BCrypt.Net;
-using BCrypt.Net;
 using Knot.Contracts.Auth.Application.Abstractions;
 using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Contracts.Settings.Application.Abstractions;
@@ -9,9 +8,6 @@ using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Auth.Application.Users.Register;
 
-/// <summary>
-/// ������� ��� ����������� ������ ������������.
-/// </summary>
 public sealed record RegisterUserCommand(
     string Username,
     string Password,
@@ -19,9 +15,6 @@ public sealed record RegisterUserCommand(
     string? Email,
     string? Bio) : ICommand<AuthResponseDto>;
 
-/// <summary>
-/// ���������� ������� �����������.
-/// </summary>
 internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserCommand, AuthResponseDto>
 {
     private readonly IUserRepository _userRepository;
@@ -48,16 +41,13 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserC
             return Result.Failure<AuthResponseDto>(AuthErrors.IdentityRegistrationDisabled);
         }
 
-        // 1. �������� ������������ username
         if (!await _userRepository.IsUsernameUniqueAsync(request.Username, cancellationToken))
         {
             return Result.Failure<AuthResponseDto>(AuthErrors.IdentityUsernameNotUnique);
         }
 
-        // 2. ����������� ������
         string passwordHash = BCrypt.Net.BCrypt.HashPassword(request.Password);
 
-        // 3. �������� ��������
         var user = User.Create(
             request.Username,
             passwordHash,
@@ -65,21 +55,33 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserC
             request.Email,
             request.Bio);
 
-        // 4. ���������� - ���������� ����� � Domain User
-        var repoWithDomainUserAdd = _userRepository as Infrastructure.Persistence.UserRepository;
-        repoWithDomainUserAdd?.Add(user);
+        var repoImpl = _userRepository as Infrastructure.Persistence.UserRepository;
+        repoImpl?.Add(user);
 
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
-        string token = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
+        // Get the saved user as contract
+        var userContract = await _userRepository.GetByUsernameAsync(request.Username, cancellationToken);
+        if (userContract == null)
+        {
+            return Result.Failure<AuthResponseDto>(AuthErrors.IdentityRegistrationFailed);
+        }
+
+        string token = _tokenProvider.Generate(userContract.Id, userContract.Username, userContract.DisplayName, userContract.Avatar);
+        string refreshToken = _tokenProvider.GenerateRefreshToken();
+        DateTime refreshExpiry = _tokenProvider.GetRefreshTokenExpiry();
+
+        userContract.SetRefreshToken(refreshToken, refreshExpiry);
+        await _userRepository.UpdateAsync(userContract, cancellationToken);
 
         return Result.Success(new AuthResponseDto
         {
             AccessToken = token,
-            RefreshToken = string.Empty,
-            UserId = user.Id,
-            Username = user.Username,
-            DisplayName = user.DisplayName
+            RefreshToken = refreshToken,
+            UserId = userContract.Id,
+            Username = userContract.Username,
+            DisplayName = userContract.DisplayName
         });
     }
 }
+

backend/src/Modules/Auth/Domain/User.cs

@@ -26,6 +26,7 @@ public sealed class User : AggregateRoot<Guid>
     public bool IsBanned { get; private set; }
     public string? PhoneNumber { get; private set; }
     public string? RefreshToken { get; private set; }
+    public DateTime? RefreshTokenExpiry { get; private set; }
     public DateTime? BannedUntil { get; private set; }
 
     public void Ban() {
@@ -48,9 +49,10 @@ public sealed class User : AggregateRoot<Guid>
         PhoneNumber = phoneNumber;
     }
 
-    public void SetRefreshToken(string? refreshToken)
+    public void SetRefreshToken(string? refreshToken, DateTime? expiry = null)
     {
         RefreshToken = refreshToken;
+        RefreshTokenExpiry = expiry;
     }
 
     public void SetBannedUntil(DateTime? bannedUntil)
@@ -79,6 +81,8 @@ public sealed class User : AggregateRoot<Guid>
         BannedUntil = contract.BannedUntil;
         SetOnline(contract.IsOnline, contract.LastSeen);
         UserDomain = contract.Domain;
+        RefreshToken = contract.RefreshToken;
+        RefreshTokenExpiry = contract.RefreshTokenExpiry;
     }
 
     private User(Guid id, string username, string passwordHash, string displayName, string? email, string? bio = null)
@@ -181,7 +185,9 @@ public sealed class User : AggregateRoot<Guid>
             IsOnline = IsOnline,
             IsExternal = IsExternal,
             Domain = _domain,
-            LastSeen = LastSeen
+            LastSeen = LastSeen,
+            RefreshToken = RefreshToken,
+            RefreshTokenExpiry = RefreshTokenExpiry
         };
     }
 }

backend/src/Modules/Auth/Infrastructure/Authentication/JwtTokenProvider.cs

@@ -50,6 +50,12 @@ internal sealed class JwtTokenProvider : IJwtTokenProvider
         return Convert.ToBase64String(randomBytes);
     }
 
+    public DateTime GetRefreshTokenExpiry()
+    {
+        var expiryInDays = int.Parse(_configuration["Jwt:RefreshExpiryInDays"] ?? "30");
+        return DateTime.UtcNow.AddDays(expiryInDays);
+    }
+
     public string Generate(Guid userId, string username, string displayName, string? avatar)
     {
         var claims = new Claim[]

backend/src/Modules/Auth/Migrations/20260407181656_AddUserInfoFields.Designer.cs

@@ -0,0 +1,106 @@
+// <auto-generated />
+using System;
+using Knot.Modules.Auth.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    [DbContext(typeof(AuthDbContext))]
+    [Migration("20260407181656_AddUserInfoFields")]
+    partial class AddUserInfoFields
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("identity")
+                .HasAnnotation("ProductVersion", "10.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Knot.Modules.Auth.Domain.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Avatar")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("BannedUntil")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Bio")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("Birthday")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Domain")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("HideStatus")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("HideStoryViews")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBanned")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastSeen")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RefreshToken")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserDomain")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users", "identity");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

backend/src/Modules/Auth/Migrations/20260407181656_AddUserInfoFields.cs

@@ -0,0 +1,37 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddUserInfoFields : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+                DO $$ 
+                BEGIN 
+                    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='identity' AND table_name='Users' AND column_name='BannedUntil') THEN
+                        ALTER TABLE identity.""Users"" ADD ""BannedUntil"" timestamp with time zone;
+                    END IF;
+
+                    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='identity' AND table_name='Users' AND column_name='PhoneNumber') THEN
+                        ALTER TABLE identity.""Users"" ADD ""PhoneNumber"" text;
+                    END IF;
+
+                    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema='identity' AND table_name='Users' AND column_name='RefreshToken') THEN
+                        ALTER TABLE identity.""Users"" ADD ""RefreshToken"" text;
+                    END IF;
+                END $$;");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(name: "BannedUntil", schema: "identity", table: "Users");
+            migrationBuilder.DropColumn(name: "PhoneNumber", schema: "identity", table: "Users");
+            migrationBuilder.DropColumn(name: "RefreshToken", schema: "identity", table: "Users");
+        }
+    }
+}

backend/src/Modules/Auth/Migrations/20270419220000_AddRefreshTokenExpiry.Designer.cs

@@ -0,0 +1,100 @@
+using System;
+using Knot.Modules.Auth.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    /// <inheritdoc />
+    [DbContext(typeof(AuthDbContext))]
+    [Migration("20270419220000_AddRefreshTokenExpiry")]
+    partial class AddRefreshTokenExpiry
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.105")
+                .HasAnnotation("Relational:DefaultSchema", "identity");
+
+            modelBuilder.Entity("Knot.Modules.Auth.Domain.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Avatar")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("BannedUntil")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Bio")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("Birthday")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Domain")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("HideStatus")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("HideStoryViews")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBanned")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastSeen")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RefreshToken")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RefreshTokenExpiry")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users", "identity");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

backend/src/Modules/Auth/Migrations/20270419220000_AddRefreshTokenExpiry.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Knot.Modules.Auth.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRefreshTokenExpiry : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "RefreshTokenExpiry",
+                schema: "identity",
+                table: "Users",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RefreshTokenExpiry",
+                schema: "identity",
+                table: "Users");
+        }
+    }
+}

backend/src/Modules/Auth/Migrations/AuthDbContextModelSnapshot.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Knot.Modules.Auth.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
@@ -23,7 +23,7 @@ namespace Knot.Modules.Auth.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Knot.Contracts.Auth.Domain.User", b =>
+            modelBuilder.Entity("Knot.Modules.Auth.Domain.User", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -32,6 +32,9 @@ namespace Knot.Modules.Auth.Migrations
                     b.Property<string>("Avatar")
                         .HasColumnType("text");
 
+                    b.Property<DateTime?>("BannedUntil")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<string>("Bio")
                         .HasColumnType("text");
 
@@ -57,10 +60,10 @@ namespace Knot.Modules.Auth.Migrations
                     b.Property<bool>("HideStoryViews")
                         .HasColumnType("boolean");
 
-                    b.Property<bool>("IsExternal")
+                    b.Property<bool>("IsBanned")
                         .HasColumnType("boolean");
 
-                    b.Property<bool>("IsBanned")
+                    b.Property<bool>("IsExternal")
                         .HasColumnType("boolean");
 
                     b.Property<bool>("IsOnline")
@@ -73,6 +76,15 @@ namespace Knot.Modules.Auth.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RefreshToken")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserDomain")
+                        .HasColumnType("text");
+
                     b.Property<string>("Username")
                         .IsRequired()
                         .HasMaxLength(50)

backend/src/Modules/Auth/Presentation/Endpoints/AuthEndpoints.cs

@@ -1,12 +1,13 @@
-using Knot.Shared.Kernel;
-using Knot.Modules.Auth.Application.Users.Login;
-using Knot.Modules.Auth.Application.Users.Register;
 using Knot.Modules.Auth.Application.Users.GetMe;
+using Knot.Modules.Auth.Application.Users.Login;
+using Knot.Modules.Auth.Application.Users.RefreshToken;
+using Knot.Modules.Auth.Application.Users.Register;
+using Knot.Shared.Kernel;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace Knot.Modules.Auth.Presentation.Endpoints;
 
@@ -28,6 +29,12 @@ public static class AuthEndpoints
             return result.IsSuccess ? Results.Ok(result.Value) : Results.Unauthorized();
         });
 
+        group.MapPost("refresh", async ([FromBody] RefreshTokenCommand command, ISender sender, CancellationToken ct) =>
+        {
+            var result = await sender.Send(command, ct);
+            return result.IsSuccess ? Results.Ok(result.Value) : Results.Unauthorized();
+        });
+
         group.MapGet("me", async (ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
             var result = await sender.Send(new GetMeQuery(userContext.UserId), ct);

backend/src/Modules/Conversations/Application/Abstractions/IChatsUnitOfWork.cs

@@ -1,11 +0,0 @@
-using Knot.Shared.Kernel;
-
-namespace Knot.Modules.Conversations.Application.Abstractions;
-
-/// <summary>
-/// Unit of Work специфичный для модуля Chats.
-/// </summary>
-public interface IChatsUnitOfWork : IUnitOfWork
-{
-}
-

backend/src/Modules/Conversations/Application/Abstractions/IUserDeleterService.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Knot.Shared.Kernel;
-
-namespace Knot.Modules.Conversations.Application.Abstractions;
-
-public interface IUserDeleterService
-{
-    Task<Result> DeleteUserAsync(Guid userId, CancellationToken cancellationToken);
-}

backend/src/Modules/Conversations/Application/Abstractions/IUserStatusService.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace Knot.Modules.Conversations.Application.Abstractions;
-
-public interface IUserStatusService
-{
-    bool IsUserOnline(string userId);
-}

backend/src/Modules/Conversations/Application/Chats/Avatar/Avatar.cs

@@ -4,8 +4,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Knot.Shared.Kernel;
 using Knot.Shared.Kernel.Storage;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using MediatR;
 using System.Linq;
 using SixLabors.ImageSharp;

backend/src/Modules/Conversations/Application/Chats/Clear/ClearChat.cs

@@ -2,8 +2,8 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using MediatR;
 using System.Linq;
 

backend/src/Modules/Conversations/Application/Chats/Create/CreateChatCommandHandler.cs

@@ -1,7 +1,7 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Application.Chats.Create;
 

backend/src/Modules/Conversations/Application/Chats/GetChatById/GetChatById.cs

@@ -5,9 +5,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -63,6 +63,9 @@ internal sealed class GetChatByIdQueryHandler : IQueryHandler<GetChatByIdQuery,
             }
         }
 
+        var pinnedMessages = await _messageRepository.GetPinnedMessagesAsync(chat.Id, cancellationToken);
+        foreach (var pm in pinnedMessages) userIdsToFetch.Add(pm.SenderId);
+
         var usersInfo = await _userProvider.GetUsersInfoAsync(userIdsToFetch, cancellationToken);
 
         var members = new List<ChatMemberDto>();
@@ -88,55 +91,19 @@ internal sealed class GetChatByIdQueryHandler : IQueryHandler<GetChatByIdQuery,
         var messagesList = new List<ChatMessageDto>();
         if (latestMessage != null)
         {
-            usersInfo.TryGetValue(latestMessage.SenderId, out var senderObj);
-
-            var reactionsWithUser = new List<ReactionDto>();
-            foreach (var reaction in latestReactions)
-            {
-                usersInfo.TryGetValue(reaction.UserId, out var reactionUser);
-                reactionsWithUser.Add(new ReactionDto(
-                    reaction.Id,
-                    reaction.Emoji,
-                    reaction.UserId,
-                    reactionUser != null
-                        ? new MessageSenderDto(reactionUser.Id, reactionUser.Username, reactionUser.DisplayName, reactionUser.Avatar)
-                        : new MessageSenderDto(reaction.UserId, "unknown", "Unknown", null)
-                ));
+            messagesList.Add(MessageMapper.MapToDto(
+                latestMessage,
+                usersInfo,
+                latestReactions,
+                chat.Members.Where(m => m.LastReadSequenceId >= latestMessage.SequenceId && m.UserId != latestMessage.SenderId).Select(m => m.UserId)));
         }
 
-            var readByList = chat.Members
-                .Where(m => m.LastReadSequenceId >= latestMessage.SequenceId && m.UserId != latestMessage.SenderId)
-                .Select(m => new ReadByDto(m.UserId))
-                .ToList();
-
-            var textMessage = latestMessage as TextMessage;
-            var mediaMessage = latestMessage as MediaMessage;
-            var storyMessage = latestMessage as StoryMessage;
-
-            messagesList.Add(new ChatMessageDto(
-                latestMessage.Id,
-                latestMessage.ChatId,
-                latestMessage.SenderId,
-                latestMessage.Content,
-                latestMessage.Type,
-                latestMessage.ReplyToId,
-                textMessage?.Quote,
-                storyMessage?.StoryId,
-                storyMessage?.StoryMediaUrl,
-                storyMessage?.StoryMediaType,
-                latestMessage.IsEdited,
-                latestMessage.IsDeleted,
-                latestMessage.CreatedAt,
-                latestMessage.SequenceId,
-                mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList() ?? new List<MediaDto>(),
-                senderObj != null ? new MessageSenderDto(
-                    senderObj.Id,
-                    senderObj.Username,
-                    senderObj.DisplayName,
-                    senderObj.Avatar
-                ) : new MessageSenderDto(latestMessage.SenderId, "unknown", "Unknown", null),
-                reactionsWithUser,
-                readByList
+        var pinnedDtoList = new List<PinnedMessageDto>();
+        foreach (var pm in pinnedMessages)
+        {
+            pinnedDtoList.Add(new PinnedMessageDto(
+                pm.Id,
+                MessageMapper.MapToDto(pm, usersInfo, new List<MessageReaction>(), new List<Guid>())
             ));
         }
 
@@ -152,6 +119,7 @@ internal sealed class GetChatByIdQueryHandler : IQueryHandler<GetChatByIdQuery,
             chat.CreatedAt,
             members,
             messagesList,
+            pinnedDtoList,
             unreadCount
         );
 

backend/src/Modules/Conversations/Application/Chats/GetChats/GetChats.cs

@@ -5,9 +5,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -59,6 +59,9 @@ internal sealed class GetChatsQueryHandler : IQueryHandler<GetChatsQuery, List<C
                 }
             }
 
+            var pinnedMessages = await _messageRepository.GetPinnedMessagesAsync(chat.Id, cancellationToken);
+            foreach (var pm in pinnedMessages) userIdsToFetch.Add(pm.SenderId);
+
             var usersInfo = await _userProvider.GetUsersInfoAsync(userIdsToFetch, cancellationToken);
 
             var members = new List<ChatMemberDto>();
@@ -85,50 +88,19 @@ internal sealed class GetChatsQueryHandler : IQueryHandler<GetChatsQuery, List<C
 
             if (latestMessage != null)
             {
-                usersInfo.TryGetValue(latestMessage.SenderId, out var senderObj);
-
-                var reactionsWithUser = new List<ReactionDto>();
-                foreach (var reaction in latestReactions)
-                {
-                    usersInfo.TryGetValue(reaction.UserId, out var reactionUser);
-                    reactionsWithUser.Add(new ReactionDto(
-                        reaction.Id,
-                        reaction.Emoji,
-                        reaction.UserId,
-                        reactionUser != null
-                            ? new MessageSenderDto(reactionUser.Id, reactionUser.Username, reactionUser.DisplayName, reactionUser.Avatar)
-                            : new MessageSenderDto(reaction.UserId, "unknown", "Unknown", null)
-                    ));
+                messagesList.Add(MessageMapper.MapToDto(
+                    latestMessage,
+                    usersInfo,
+                    latestReactions,
+                    chat.Members.Where(m => m.LastReadSequenceId >= latestMessage.SequenceId && m.UserId != latestMessage.SenderId).Select(m => m.UserId)));
             }
 
-                var textMessage = latestMessage as TextMessage;
-                var mediaMessage = latestMessage as MediaMessage;
-                var storyMessage = latestMessage as StoryMessage;
-
-                messagesList.Add(new ChatMessageDto(
-                    latestMessage.Id,
-                    latestMessage.ChatId,
-                    latestMessage.SenderId,
-                    latestMessage.Content,
-                    latestMessage.Type,
-                    latestMessage.ReplyToId,
-                    textMessage?.Quote,
-                    storyMessage?.StoryId,
-                    storyMessage?.StoryMediaUrl,
-                    storyMessage?.StoryMediaType,
-                    latestMessage.IsEdited,
-                    latestMessage.IsDeleted,
-                    latestMessage.CreatedAt,
-                    latestMessage.SequenceId,
-                    mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList() ?? new List<MediaDto>(),
-                    senderObj != null ? new MessageSenderDto(
-                        senderObj.Id,
-                        senderObj.Username,
-                        senderObj.DisplayName,
-                        senderObj.Avatar
-                    ) : new MessageSenderDto(latestMessage.SenderId, "unknown", "Unknown", null),
-                    reactionsWithUser,
-                    chat.Members.Where(m => m.LastReadSequenceId >= latestMessage.SequenceId && m.UserId != latestMessage.SenderId).Select(m => new ReadByDto(m.UserId)).ToList()
+            var pinnedDtoList = new List<PinnedMessageDto>();
+            foreach (var pm in pinnedMessages)
+            {
+                pinnedDtoList.Add(new PinnedMessageDto(
+                    pm.Id,
+                    MessageMapper.MapToDto(pm, usersInfo, new List<MessageReaction>(), new List<Guid>())
                 ));
             }
 
@@ -144,7 +116,10 @@ internal sealed class GetChatsQueryHandler : IQueryHandler<GetChatsQuery, List<C
                 chat.CreatedAt,
                 members,
                 messagesList,
-                unreadCount
+                pinnedDtoList,
+                unreadCount,
+                chat.IsImporting,
+                chat.ImportJobId
             ));
         }
 

backend/src/Modules/Conversations/Application/Chats/GetOrCreateFavorites/GetOrCreateFavoritesCommandHandler.cs

@@ -1,6 +1,6 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Application.Chats.GetOrCreateFavorites;
 

backend/src/Modules/Conversations/Application/Chats/LeaveOrDelete/LeaveOrDeleteChat.cs

@@ -1,12 +1,15 @@
-
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Shared.Kernel.Storage;
 using MediatR;
-using System.Linq;
+using Microsoft.AspNetCore.SignalR;
 
 namespace Knot.Modules.Conversations.Application.Chats.LeaveOrDelete;
 
@@ -15,12 +18,24 @@ public record LeaveOrDeleteChatCommand(Guid ChatId, Guid UserId) : ICommand<Succ
 internal sealed class LeaveOrDeleteChatCommandHandler : ICommandHandler<LeaveOrDeleteChatCommand, SuccessResponse>
 {
     private readonly IChatRepository _chatRepository;
+    private readonly IMessageRepository _messageRepository;
+    private readonly IFileStorageService _fileStorage;
     private readonly IChatsUnitOfWork _uow;
+    private readonly IHubContext<ChatHub> _hubContext;
 
-    public LeaveOrDeleteChatCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork uow)
+    public LeaveOrDeleteChatCommandHandler(
+        IChatRepository chatRepository,
+
+        IMessageRepository messageRepository,
+        IFileStorageService fileStorage,
+        IChatsUnitOfWork uow,
+        IHubContext<ChatHub> hubContext)
     {
         _chatRepository = chatRepository;
+        _messageRepository = messageRepository;
+        _fileStorage = fileStorage;
         _uow = uow;
+        _hubContext = hubContext;
     }
 
     public async Task<Result<SuccessResponse>> Handle(LeaveOrDeleteChatCommand request, CancellationToken cancellationToken)
@@ -36,19 +51,73 @@ internal sealed class LeaveOrDeleteChatCommandHandler : ICommandHandler<LeaveOrD
             return Result.Failure<SuccessResponse>(ChatErrors.Unauthorized);
         }
 
-        if (chat.Type == ChatType.Group)
+        // If it's a private chat or the last member leaving a group, delete everything
+        bool shouldDeleteEverything = chat.Type != ChatType.Group || chat.Members.Count <= 1;
+
+        if (chat.Type == ChatType.Group && !shouldDeleteEverything)
         {
             chat.RemoveMember(request.UserId);
             _chatRepository.Update(chat);
         }
         else
         {
+            // DELETE ALL MESSAGES AND FILES FIRST
+            await DeleteChatMediaAndMessagesAsync(chat.Id, cancellationToken);
             _chatRepository.Remove(chat);
+
+            // Notify all remaining members that the chat was deleted
+
+            foreach (var member in chat.Members)
+            {
+                await _hubContext.Clients.User(member.UserId.ToString())
+                    .SendAsync("chat_deleted", chat.Id.ToString(), cancellationToken);
+            }
         }
 
         await _uow.SaveChangesAsync(cancellationToken);
 
         return Result.Success(new SuccessResponse(true));
     }
-}
 
+    private async Task DeleteChatMediaAndMessagesAsync(Guid chatId, CancellationToken ct)
+    {
+        try
+
+        {
+            // Get all messages directly from Mongo (not paged)
+            var messages = await _messageRepository.GetChatMessagesAsync(chatId, int.MaxValue, 0, ct);
+            foreach (var msg in messages)
+            {
+                if (msg is Knot.Contracts.Messaging.Domain.MediaMessage mediaMsg)
+                {
+                    foreach (var media in mediaMsg.Media)
+                    {
+                        if (!string.IsNullOrEmpty(media.Url))
+                        {
+                            var fileId = ExtractFileId(media.Url);
+                            if (!string.IsNullOrEmpty(fileId))
+                            {
+                                await _fileStorage.DeleteFileAsync(fileId);
+                            }
+                        }
+                    }
+                }
+            }
+            await _messageRepository.DeleteChatMessagesAsync(chatId, ct);
+        }
+        catch (Exception ex)
+        {
+            // Log if possible, but don't fail chat deletion
+            Console.WriteLine($"[Cleanup] Error deleting chat media: {ex.Message}");
+        }
+    }
+
+    private string? ExtractFileId(string url)
+    {
+        var lastSlash = url.LastIndexOf('/');
+        if (lastSlash == -1) return null;
+        var id = url[(lastSlash + 1)..];
+        if (id.Contains('?')) id = id[..id.IndexOf('?')];
+        return id;
+    }
+}

backend/src/Modules/Conversations/Application/Chats/Members/Members.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using MediatR;
 using System.Linq;
 

backend/src/Modules/Conversations/Application/Chats/TogglePin/TogglePin.cs

@@ -2,8 +2,8 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
 using MediatR;
 using System.Linq;

backend/src/Modules/Conversations/Application/Chats/Update/UpdateChat.cs

@@ -2,8 +2,8 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using MediatR;
 using System.Linq;
 

backend/src/Modules/Conversations/Application/DTOs/ChatDto.cs

@@ -12,6 +12,9 @@ public record ChatDto(
     DateTime CreatedAt,
     List<ChatMemberDto> Members,
     List<ChatMessageDto> Messages,
-    int UnreadCount
+    List<PinnedMessageDto> PinnedMessages,
+    int UnreadCount,
+    bool IsImporting = false,
+    Guid? ImportJobId = null
 );
 

backend/src/Modules/Conversations/Application/DTOs/ChatMemberDto.cs

@@ -1,4 +1,4 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using System;
 
 namespace Knot.Modules.Conversations.Application.DTOs;

backend/src/Modules/Conversations/Application/DTOs/ChatMessageDto.cs

@@ -21,6 +21,17 @@ public record ChatMessageDto(
     List<MediaDto> Media,
     MessageSenderDto Sender,
     List<ReactionDto> Reactions,
-    List<ReadByDto> ReadBy
+    List<ReadByDto> ReadBy,
+    string? CallType = null,
+    string? CallStatus = null,
+    int? Duration = null,
+    List<PollOptionDto>? PollOptions = null,
+    bool? PollIsMultipleChoice = null,
+    bool? PollIsAnonymous = null,
+    bool? PollIsClosed = null,
+    List<Guid>? UserVotedOptionIds = null
 );
 
+public record PollOptionDto(Guid Id, string Text, int VoteCount, List<MessageSenderDto>? Voters = null, List<Guid>? VoterIds = null);
+
+

backend/src/Modules/Conversations/Application/DTOs/CreateChatRequest.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 
 namespace Knot.Modules.Conversations.Application.DTOs;
 

backend/src/Modules/Conversations/Application/DTOs/MediaDto.cs

@@ -7,6 +7,6 @@ public record MediaDto(
     string Type,
     string? Url,
     string? Filename,
-    long? Size
+    long? Size,
+    string? Duration = null
 );
-

backend/src/Modules/Conversations/Application/DTOs/MessageDetailDto.cs

@@ -24,7 +24,16 @@ public record MessageDetailDto(
     List<MediaDto> Media,
     MessageSenderDto? Sender,
     List<ReadByDto> ReadBy,
-    List<MessageReactionDto> Reactions
+    List<MessageReactionDto> Reactions,
+    string? CallType = null,
+    string? CallStatus = null,
+    int? Duration = null,
+    List<PollOptionDto>? PollOptions = null,
+    bool? PollIsMultipleChoice = null,
+    bool? PollIsAnonymous = null,
+    bool? PollIsClosed = null,
+    List<Guid>? UserVotedOptionIds = null,
+    bool IsDeletedForUser = false
 );
 
 public record ReplyToMessageDto(

backend/src/Modules/Conversations/Application/DTOs/MessageMapper.cs

@@ -0,0 +1,84 @@
+using Knot.Shared.Kernel;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Modules.Conversations.Application.DTOs;
+
+namespace Knot.Modules.Conversations.Application.DTOs;
+
+public static class MessageMapper
+{
+    public static ChatMessageDto MapToDto(
+        Message message,
+        IReadOnlyDictionary<Guid, UserInfo> usersInfo,
+        IEnumerable<MessageReaction> reactions,
+        IEnumerable<Guid> readByUsers,
+        Guid? currentUserId = null)
+    {
+        usersInfo.TryGetValue(message.SenderId, out var senderObj);
+
+        var reactionsWithUser = new List<ReactionDto>();
+        foreach (var reaction in reactions)
+        {
+            usersInfo.TryGetValue(reaction.UserId, out var reactionUser);
+            reactionsWithUser.Add(new ReactionDto(
+                reaction.Id,
+                reaction.Emoji,
+                reaction.UserId,
+                reactionUser != null
+                    ? new MessageSenderDto(reactionUser.Id, reactionUser.Username, reactionUser.DisplayName, reactionUser.Avatar)
+                    : new MessageSenderDto(reaction.UserId, "unknown", "Unknown", null)
+            ));
+        }
+
+        var textMessage = message as TextMessage;
+        var mediaMessage = message as MediaMessage;
+        var storyMessage = message as StoryMessage;
+        var callMessage = message as CallMessage;
+
+        return new ChatMessageDto(
+            message.Id,
+            message.ChatId,
+            message.SenderId,
+            message.Content,
+            message.Type,
+            message.ReplyToId,
+            textMessage?.Quote,
+            storyMessage?.StoryId,
+            storyMessage?.StoryMediaUrl,
+            storyMessage?.StoryMediaType,
+            message.IsEdited,
+            message.IsDeleted,
+            message.CreatedAt,
+            message.SequenceId,
+            mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size, media.Duration)).ToList() ?? new List<MediaDto>(),
+            senderObj != null ? new MessageSenderDto(
+                senderObj.Id,
+                senderObj.Username,
+                senderObj.DisplayName,
+                senderObj.Avatar
+            ) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
+            reactionsWithUser,
+            readByUsers.Select(id => new ReadByDto(id)).ToList(),
+            callMessage?.CallType,
+            callMessage?.CallStatus,
+            callMessage?.Duration,
+            message is PollMessage pm ? pm.Options.Select(o => {
+                var voters = pm.IsAnonymous == false
+                    ? pm.Votes
+                        .Where(v => v.OptionId == o.Id)
+                        .Select(v => {
+                            usersInfo.TryGetValue(v.UserId, out var vu);
+                            return vu != null
+                                ? new MessageSenderDto(vu.Id, vu.Username, vu.DisplayName, vu.Avatar)
+                                : new MessageSenderDto(v.UserId, "unknown", "Unknown", null);
+                        })
+                        .ToList()
+                    : null;
+                return new PollOptionDto(o.Id, o.Text, o.VoteCount, voters, pm.IsAnonymous == false ? pm.Votes.Where(v => v.OptionId == o.Id).Select(v => v.UserId).ToList() : null);
+            }).ToList() : null,
+            (message as PollMessage)?.IsMultipleChoice,
+            (message as PollMessage)?.IsAnonymous,
+            (message as PollMessage)?.IsClosed,
+            (message is PollMessage poll && currentUserId.HasValue) ? poll.Votes.Where(v => v.UserId == currentUserId.Value).Select(v => v.OptionId).ToList() : null
+        );
+    }
+}

backend/src/Modules/Conversations/Application/DTOs/PinnedMessageDto.cs

@@ -0,0 +1,6 @@
+namespace Knot.Modules.Conversations.Application.DTOs;
+
+public record PinnedMessageDto(
+    Guid Id,
+    ChatMessageDto Message
+);

backend/src/Modules/Conversations/Application/Folders/Commands/AddToFolder/AddToFolderCommand.cs

@@ -1,5 +1,5 @@
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Contracts.Settings.Application.Abstractions;
 using Knot.Shared.Kernel;
 using MediatR;

backend/src/Modules/Conversations/Application/Folders/Commands/RemoveFromFolder/RemoveFromFolderCommand.cs

@@ -1,5 +1,5 @@
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Shared.Kernel;
 using MediatR;
 

backend/src/Modules/Conversations/Application/Messages/Delete/DeleteMessagesCommand.cs

@@ -1,5 +1,5 @@
-using global::Knot.Modules.Conversations.Application.Abstractions;
-using global::Knot.Modules.Conversations.Domain;
+using global::Knot.Contracts.Conversations.Application.Abstractions;
+using global::Knot.Contracts.Conversations.Domain;
 using global::Knot.Modules.Conversations.Infrastructure.SignalR;
 using global::Knot.Shared.Kernel;
 using MediatR;
@@ -42,10 +42,16 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
 
             if (request.DeleteForAll)
             {
+                // Only message sender can delete for everyone
                 if (message.SenderId == request.UserId)
                 {
                     message.Delete();
                 }
+                else
+                {
+                    // If not the sender, just delete for current user
+                    message.DeleteForUser(request.UserId);
+                }
             }
             else
             {
@@ -55,24 +61,13 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
             await _messageRepository.UpdateAsync(message, cancellationToken);
         }
 
-        if (request.DeleteForAll)
-        {
+        // Notify all clients in the chat about the deletion
         await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("messages_deleted", new
         {
             chatId = request.ChatId,
             messageIds = request.MessageIds,
-                deleteForAll = true
+            deleteForAll = request.DeleteForAll
         });
-        }
-        else
-        {
-            await _hubContext.Clients.User(request.UserId.ToString()).SendAsync("messages_deleted", new
-            {
-                chatId = request.ChatId,
-                messageIds = request.MessageIds,
-                deleteForAll = false
-            });
-        }
 
         return global::Knot.Shared.Kernel.Result.Success();
     }

backend/src/Modules/Conversations/Application/Messages/Edit/EditMessageCommand.cs

@@ -0,0 +1,69 @@
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Modules.Conversations.Infrastructure.SignalR;
+using Knot.Shared.Kernel;
+using MediatR;
+using Microsoft.AspNetCore.SignalR;
+
+namespace Knot.Modules.Conversations.Application.Messages.Edit;
+
+public sealed record EditMessageCommand(
+    Guid MessageId,
+    Guid ChatId,
+    Guid UserId,
+    string Content) : ICommand;
+
+public sealed class EditMessageCommandHandler : ICommandHandler<EditMessageCommand>
+{
+    private readonly IMessageRepository _messageRepository;
+    private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IHubContext<ChatHub> _hubContext;
+
+    public EditMessageCommandHandler(
+        IMessageRepository messageRepository,
+        IChatsUnitOfWork unitOfWork,
+        IHubContext<ChatHub> hubContext)
+    {
+        _messageRepository = messageRepository;
+        _unitOfWork = unitOfWork;
+        _hubContext = hubContext;
+    }
+
+    public async Task<Result> Handle(EditMessageCommand request, CancellationToken cancellationToken)
+    {
+        var message = await _messageRepository.GetByIdAsync(request.MessageId, cancellationToken);
+        
+        if (message is null)
+        {
+            return Result.Failure(new Error("Message.NotFound", "Message not found."));
+        }
+
+        if (message.SenderId != request.UserId)
+        {
+            return Result.Failure(new Error("Message.Forbidden", "You can only edit your own messages."));
+        }
+
+        if (message.ChatId != request.ChatId)
+        {
+             return Result.Failure(new Error("Message.InvalidChat", "Message does not belong to this chat."));
+        }
+
+        message.Edit(request.Content);
+
+        await _messageRepository.UpdateAsync(message, cancellationToken);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        // Notify clients
+        await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("message_edited", new
+        {
+            messageId = message.Id,
+            chatId = message.ChatId,
+            content = message.Content,
+            isEdited = true
+        });
+
+        return Result.Success();
+    }
+}

backend/src/Modules/Conversations/Application/Messages/GetMessages/GetMessagesQuery.cs

@@ -3,17 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.GetMessages;
 
-public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor) : IQuery<List<MessageDetailDto>>;
+public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, long? AfterSequenceId = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
 
 internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery, List<MessageDetailDto>>
 {
@@ -38,15 +38,39 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
             return Result.Failure<List<MessageDetailDto>>(ChatErrors.ChatsForbidden);
         }
 
+        List<Message> messages;
+        int queryLimit = request.Limit ?? ChatConstants.DefaultMessageQueryLimit;
+
+        if (request.AfterSequenceId.HasValue)
+        {
+            // Получаем только сообщения ПОСЛЕ указанного sequenceId (для синхронизации)
+            messages = await _messageRepository.GetChatMessagesAfterAsync(request.ChatId, request.AfterSequenceId.Value, queryLimit, cancellationToken);
+        }
+        else if (request.Pivot.HasValue)
+        {
+            messages = await _messageRepository.GetChatMessagesAroundAsync(request.ChatId, request.Pivot.Value, queryLimit, cancellationToken);
+        }
+        else
+        {
             DateTime? cursorDate = null;
-        if (!string.IsNullOrEmpty(request.Cursor) && DateTime.TryParse(request.Cursor, null, System.Globalization.DateTimeStyles.RoundtripKind, out var parsed))
+            long? cursorSequenceId = null;
+
+            if (!string.IsNullOrEmpty(request.Cursor))
+            {
+                if (long.TryParse(request.Cursor, out var seqId))
+                {
+                    cursorSequenceId = seqId;
+                }
+                else if (DateTime.TryParse(request.Cursor, null, System.Globalization.DateTimeStyles.RoundtripKind, out var parsed))
                 {
                     cursorDate = parsed.ToUniversalTime();
                 }
+            }
+
+            messages = await _messageRepository.GetChatMessagesCursorAsync(request.ChatId, cursorDate, cursorSequenceId, queryLimit, cancellationToken);
+        }
 
-        var messages = await _messageRepository.GetChatMessagesCursorAsync(request.ChatId, cursorDate, ChatConstants.DefaultMessageQueryLimit, cancellationToken);
         var result = new List<MessageDetailDto>();
-
         var userIdsToFetch = new HashSet<Guid>();
         var replyMessages = new Dictionary<Guid, Message>();
 
@@ -57,6 +81,14 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
         {
             userIdsToFetch.Add(m.SenderId);
 
+            if (m is PollMessage poll && !poll.IsAnonymous)
+            {
+                foreach (var vote in poll.Votes)
+                {
+                    userIdsToFetch.Add(vote.UserId);
+                }
+            }
+
             if (!m.ReplyToId.HasValue)
             {
                 continue;
@@ -85,70 +117,82 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                 continue;
             }
 
-            ReplyToMessageDto? replyToObj = null;
-            if (message.ReplyToId.HasValue && replyMessages.TryGetValue(message.ReplyToId.Value, out var replyMsg))
-            {
-                var senderObj = senders.TryGetValue(replyMsg.SenderId, out var rs)
-                    ? new MessageSenderDto(rs.Id, rs.Username, rs.DisplayName, rs.Avatar)
-                    : null;
+            senders.TryGetValue(message.SenderId, out var sender);
+            reactionsByMessage.TryGetValue(message.Id, out var reactions);
 
-                replyToObj = new ReplyToMessageDto(
-                    replyMsg.Id,
-                        replyMsg.Content,
-                        replyMsg.IsDeleted,
-                        (replyMsg as MediaMessage)?.Media.Select(rm => new MediaDto(rm.Id, rm.Type, rm.Url, rm.Filename, rm.Size)).ToList() ?? new List<MediaDto>(),
-                    senderObj
-                );
+
+            Message? replyMsg = null;
+            if (message.ReplyToId.HasValue)
+            {
+                replyMessages.TryGetValue(message.ReplyToId.Value, out replyMsg);
             }
 
-            var reactionsWithUser = new List<MessageReactionDto>();
-            var messageReactions = reactionsByMessage.TryGetValue(message.Id, out var mr) ? mr : new List<MessageReaction>();
-            foreach (var reaction in messageReactions)
+            UserInfo? replySender = null;
+            if (replyMsg != null)
             {
-                var userObj = senders.TryGetValue(reaction.UserId, out var reactionUser)
-                    ? new MessageSenderDto(reactionUser.Id, reactionUser.Username, reactionUser.DisplayName, reactionUser.Avatar)
-                    : new MessageSenderDto(reaction.UserId, "unknown", "Unknown", null);
-
-                reactionsWithUser.Add(new MessageReactionDto(
-                    reaction.Id,
-                    reaction.Emoji,
-                    reaction.UserId,
-                    userObj
-                ));
+                senders.TryGetValue(replyMsg.SenderId, out replySender);
             }
 
-            var textMessage = message as TextMessage;
-            var mediaMessage = message as MediaMessage;
-            var storyMessage = message as StoryMessage;
-
             result.Add(new MessageDetailDto(
                 message.Id,
                 message.ChatId,
                 message.SenderId,
                 message.Content,
-                message.Type,
+                message.Type.ToLower(),
                 message.ReplyToId,
-                replyToObj,
-                textMessage?.Quote,
+                replyMsg != null ? new ReplyToMessageDto(
+                    replyMsg.Id,
+                    replyMsg.Content,
+                    replyMsg.IsDeleted,
+                    replyMsg is MediaMessage mm ? mm.Media.Select(m => new MediaDto(m.Id, m.Type, m.Url, m.Filename, m.Size, m.Duration)).ToList() : new List<MediaDto>(),
+                    replySender != null ? new MessageSenderDto(replySender.Id, replySender.Username, replySender.DisplayName, replySender.Avatar) : null
+                ) : null,
+                (message as TextMessage)?.Quote,
                 message.IsEdited,
                 message.IsDeleted,
                 message.CreatedAt,
                 message.SequenceId,
                 message.ForwardedFromId,
-                message.ForwardedFromId.HasValue && senders.TryGetValue(message.ForwardedFromId.Value, out var fwdUser) ? new MessageSenderDto(fwdUser.Id, fwdUser.Username, fwdUser.DisplayName, fwdUser.Avatar) : null,
-                storyMessage?.StoryId,
-                storyMessage?.StoryMediaUrl,
-                storyMessage?.StoryMediaType,
-                mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList() ?? new List<MediaDto>(),
-                senders.TryGetValue(message.SenderId, out var senderUser) ? new MessageSenderDto(senderUser.Id, senderUser.Username, senderUser.DisplayName, senderUser.Avatar) : null,
-                chat.Members.Where(m => m.LastReadSequenceId >= message.SequenceId && m.UserId != message.SenderId).Select(m => new ReadByDto(m.UserId)).ToList(),
-                reactionsWithUser
+                null, // ForwardedFrom details not implemented here yet
+                (message as StoryMessage)?.StoryId,
+                (message as StoryMessage)?.StoryMediaUrl,
+                (message as StoryMessage)?.StoryMediaType,
+                (message as MediaMessage)?.Media.Select(m => new MediaDto(m.Id, m.Type, m.Url, m.Filename, m.Size, m.Duration)).ToList() ?? new List<MediaDto>(),
+                sender != null ? new MessageSenderDto(sender.Id, sender.Username, sender.DisplayName, sender.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
+                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList(),
+                reactions?.Select(r =>
+                {
+                    senders.TryGetValue(r.UserId, out var ru);
+                    return new MessageReactionDto(r.Id, r.Emoji, r.UserId, ru != null ? new MessageSenderDto(ru.Id, ru.Username, ru.DisplayName, ru.Avatar) : null);
+                }).ToList() ?? new List<MessageReactionDto>(),
+                (message as CallMessage)?.CallType,
+                (message as CallMessage)?.CallStatus,
+                (message as CallMessage)?.Duration,
+                (message as PollMessage)?.Options.Select(o =>
+                {
+                    var pm = (PollMessage)message;
+                    var voters = pm.IsAnonymous == false
+                         ? pm.Votes
+                             .Where(v => v.OptionId == o.Id)
+                             .Select(v =>
+                             {
+                                 senders.TryGetValue(v.UserId, out var vu);
+                                 return vu != null
+                                     ? new MessageSenderDto(vu.Id, vu.Username, vu.DisplayName, vu.Avatar)
+                                     : new MessageSenderDto(v.UserId, "unknown", "Unknown", null);
+                             })
+                             .ToList()
+                         : null;
+                    return new PollOptionDto(o.Id, o.Text, o.VoteCount, voters, pm.IsAnonymous == false ? pm.Votes.Where(v => v.OptionId == o.Id).Select(v => v.UserId).ToList() : null);
+                }).ToList(),
+                 (message as PollMessage)?.IsMultipleChoice,
+                 (message as PollMessage)?.IsAnonymous,
+                 (message as PollMessage)?.IsClosed,
+                 (message as PollMessage)?.Votes.Where(v => v.UserId == request.UserId).Select(v => v.OptionId).ToList(),
+                 message.IsDeletedForUser(request.UserId)
              ));
         }
 
         return Result.Success(result);
     }
 }
-
-
-

backend/src/Modules/Conversations/Application/Messages/GetSharedMedia/GetSharedMediaQuery.cs

@@ -6,9 +6,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -88,22 +88,17 @@ internal sealed class GetSharedMediaQueryHandler : IQueryHandler<GetSharedMediaQ
             var filteredMedia = messageMedia.Where(media =>
             {
                 var mType = media.Type?.ToLower() ?? "file";
-                var isGif = mType == "image" && media.Url != null && (media.Url.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase) || media.Url.EndsWith(".gif", StringComparison.OrdinalIgnoreCase));
+                var filename = media.Filename?.ToLower() ?? "";
+                var url = media.Url?.ToLower() ?? "";
                 
-                if (filterType == "gifs")
-                {
-                    return isGif;
-                }
+                var isGif = mType == "gif" || 
+                            (mType == "image" && (filename.EndsWith(".mp4") || filename.EndsWith(".gif") || url.EndsWith(".gif") || filename.Contains("gif"))) ||
+                            (mType == "video" && (filename.Contains("animation") || filename.Contains("gif")));
 
-                if (filterType == "files")
-                {
-                    return mType != "image" && mType != "video" && mType != "link";
-                }
-
-                if (filterType == "media")
-                {
-                    return (mType == "image" || mType == "video") && !isGif;
-                }
+                if (filterType == "gifs") return isGif;
+                if (filterType == "media") return (mType == "image" || mType == "video") && !isGif;
+                if (filterType == "files") return (mType == "file" || mType == "audio") && !isGif && mType != "image" && mType != "video";
+                if (filterType == "links") return mType == "link";
 
                 return true;
             }).ToList();
@@ -124,7 +119,7 @@ internal sealed class GetSharedMediaQueryHandler : IQueryHandler<GetSharedMediaQ
                     storyMessage?.StoryMediaType,
                     message.IsEdited,
                     message.Type,
-                    filteredMedia.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList()
+                    filteredMedia.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size, media.Duration)).ToList()
                 ));
             }
         }

backend/src/Modules/Conversations/Application/Messages/Pin/PinMessageCommandHandler.cs

@@ -0,0 +1,58 @@
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Conversations.Application.Messages.Pin;
+
+public sealed record PinMessageCommand(Guid MessageId, Guid ChatId, Guid UserId) : ICommand<Guid>;
+
+public sealed class PinMessageCommandHandler : ICommandHandler<PinMessageCommand, Guid>
+{
+    private readonly IMessageRepository _messageRepository;
+    private readonly IChatRepository _chatRepository;
+    private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IMediator _mediator;
+
+    public PinMessageCommandHandler(
+        IMessageRepository messageRepository,
+        IChatRepository chatRepository,
+        IChatsUnitOfWork unitOfWork,
+        IMediator mediator)
+    {
+        _messageRepository = messageRepository;
+        _chatRepository = chatRepository;
+        _unitOfWork = unitOfWork;
+        _mediator = mediator;
+    }
+
+    public async Task<Result<Guid>> Handle(PinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
+        if (chat is null) return Result.Failure<Guid>(ChatErrors.ChatsNotFound);
+
+        // Security check
+        if (!chat.Members.Any(m => m.UserId == request.UserId))
+            return Result.Failure<Guid>(ChatErrors.ChatsForbidden);
+
+        var message = await _messageRepository.GetByIdAsync(request.MessageId, cancellationToken);
+        if (message is null) return Result.Failure<Guid>(ChatErrors.NotFound);
+
+        if (message.ChatId != request.ChatId)
+            return Result.Failure<Guid>(ChatErrors.NotFound);
+
+        message.AddState(MessageState.IsPinned);
+        
+        await _messageRepository.UpdateAsync(message, cancellationToken);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        // Notify chat about pinned message change
+        await _mediator.Publish(new MessagePinnedDomainEvent(message.Id, message.ChatId, message.SenderId, message.Content), cancellationToken);
+
+        return Result.Success(message.Id);
+    }
+}
+
+public record MessagePinnedDomainEvent(Guid MessageId, Guid ChatId, Guid SenderId, string? Content) : INotification;

backend/src/Modules/Conversations/Application/Messages/React/AddReactionCommand.cs

@@ -1,7 +1,7 @@
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Shared.Kernel;
 using MediatR;

backend/src/Modules/Conversations/Application/Messages/React/RemoveReactionCommand.cs

@@ -1,7 +1,7 @@
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Shared.Kernel;
 using MediatR;

backend/src/Modules/Conversations/Application/Messages/Read/ReadMessagesCommandHandler.cs

@@ -1,7 +1,8 @@
-using MediatR;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Application.Abstractions;
+using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.Read;
 
@@ -11,11 +12,13 @@ public sealed class ReadMessagesCommandHandler : ICommandHandler<ReadMessagesCom
 {
     private readonly IChatRepository _chatRepository;
     private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IMessageRepository _messageRepository;
 
-    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork)
+    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork, IMessageRepository messageRepository)
     {
         _chatRepository = chatRepository;
         _unitOfWork = unitOfWork;
+        _messageRepository = messageRepository;
     }
 
     public async Task<Result> Handle(ReadMessagesCommand request, CancellationToken cancellationToken)
@@ -28,6 +31,23 @@ public sealed class ReadMessagesCommandHandler : ICommandHandler<ReadMessagesCom
 
         member.UpdateReadCursor(request.LastReadMessageId, request.LastReadSequenceId);
 
+        // Обновляем ReadByUsers для всех сообщений до LastReadSequenceId
+        var messages = await _messageRepository.GetChatMessagesAfterAsync(
+            request.ChatId,
+            0,
+            1000,
+            cancellationToken);
+
+        foreach (var message in messages)
+        {
+            if (message.SequenceId <= request.LastReadSequenceId &&
+                message.SenderId != request.UserId &&
+                !message.IsReadBy(request.UserId))
+            {
+                message.MarkAsRead(request.UserId);
+            }
+        }
+
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
         return Result.Success();

backend/src/Modules/Conversations/Application/Messages/SearchMessages/SearchMessagesQuery.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -41,7 +41,8 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
         var allReactions = await _reactionRepository.GetReactionsForMessagesAsync(messageIds, cancellationToken);
         var reactionsByMessage = allReactions.GroupBy(r => r.MessageId).ToDictionary(g => g.Key, g => g.ToList());
 
-        var result = messages.Select(message => {
+        var result = messages.Select(message =>
+        {
             var textMessage = message as TextMessage;
             var mediaMessage = message as MediaMessage;
             var storyMessage = message as StoryMessage;
@@ -66,7 +67,7 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
                 mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList() ?? new List<MediaDto>(),
                 senders.TryGetValue(message.SenderId, out var senderUser) ? new MessageSenderDto(senderUser.Id, senderUser.Username, senderUser.DisplayName, senderUser.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
                 reactionsByMessage.TryGetValue(message.Id, out var mr) ? mr.Select(reaction => new SimpleReactionDto(reaction.UserId, reaction.Emoji)).ToList() : new List<SimpleReactionDto>(),
-                new List<ReadByDto>()
+                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList()
             );
         }).ToList();
 

backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs

@@ -1,8 +1,8 @@
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Settings.Application.Abstractions;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
 using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
@@ -27,7 +27,10 @@ public sealed record SendMessageCommand(
     List<string>? PollOptions = null,
     bool? PollIsAnonymous = null,
     bool? PollAllowMultipleAnswers = null,
-    DateTime? PollExpiresAt = null) : ICommand<Guid>;
+    DateTime? PollExpiresAt = null,
+    string? CallType = null,
+    string? CallStatus = null,
+    int? Duration = null) : ICommand<Guid>;
 
 public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageCommand, Guid>
 {
@@ -132,8 +135,9 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         else if (request.Type == "poll")
         {
             if (!_messagesSettings.Current.AllowPolls) return Result.Failure<Guid>(ChatErrors.PollsDisabled);
+            if (chat.Type != ChatType.Group) return Result.Failure<Guid>(new Error("Poll.InvalidChat", "Polls are only allowed in groups."));
 
-            message = new PollMessage(
+            message = PollMessage.Create(
                 Guid.NewGuid(),
                 request.ChatId,
                 request.SenderId,
@@ -143,6 +147,18 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
                 request.PollAllowMultipleAnswers ?? false,
                 request.PollExpiresAt,
                 request.ReplyToId,
+                request.ForwardedFromId);
+        }
+        else if (request.Type == "call")
+        {
+            message = new CallMessage(
+                Guid.NewGuid(),
+                request.ChatId,
+                request.SenderId,
+                request.CallType ?? "voice",
+                request.CallStatus ?? "completed",
+                request.Duration,
+                request.ReplyToId,
                 request.ForwardedFromId,
                 DateTime.UtcNow,
                 false);
@@ -176,6 +192,7 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         var senderMember = chat.Members.First(m => m.UserId == request.SenderId);
         senderMember.UpdateReadCursor(message.Id, message.SequenceId);
         senderMember.UpdateDeliveredCursor(message.Id);
+        message.MarkAsRead(request.SenderId); // Отправитель всегда "прочитал" своё сообщение
 
         // 5. ���������
         _messageRepository.Add(message);

backend/src/Modules/Conversations/Application/Messages/Unpin/UnpinMessageCommandHandler.cs

@@ -0,0 +1,58 @@
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Conversations.Application.Messages.Unpin;
+
+public sealed record UnpinMessageCommand(Guid MessageId, Guid ChatId, Guid UserId) : ICommand<Guid>;
+
+public sealed class UnpinMessageCommandHandler : ICommandHandler<UnpinMessageCommand, Guid>
+{
+    private readonly IMessageRepository _messageRepository;
+    private readonly IChatRepository _chatRepository;
+    private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IMediator _mediator;
+
+    public UnpinMessageCommandHandler(
+        IMessageRepository messageRepository,
+        IChatRepository chatRepository,
+        IChatsUnitOfWork unitOfWork,
+        IMediator mediator)
+    {
+        _messageRepository = messageRepository;
+        _chatRepository = chatRepository;
+        _unitOfWork = unitOfWork;
+        _mediator = mediator;
+    }
+
+    public async Task<Result<Guid>> Handle(UnpinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
+        if (chat is null) return Result.Failure<Guid>(ChatErrors.ChatsNotFound);
+
+        // Security check
+        if (!chat.Members.Any(m => m.UserId == request.UserId))
+            return Result.Failure<Guid>(ChatErrors.ChatsForbidden);
+
+        var message = await _messageRepository.GetByIdAsync(request.MessageId, cancellationToken);
+        if (message is null) return Result.Failure<Guid>(ChatErrors.NotFound);
+
+        if (message.ChatId != request.ChatId)
+            return Result.Failure<Guid>(ChatErrors.NotFound);
+
+        message.RemoveState(MessageState.IsPinned);
+        
+        await _messageRepository.UpdateAsync(message, cancellationToken);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        // Notify chat about unpinned message change
+        await _mediator.Publish(new MessageUnpinnedDomainEvent(message.Id, message.ChatId), cancellationToken);
+
+        return Result.Success(message.Id);
+    }
+}
+
+public record MessageUnpinnedDomainEvent(Guid MessageId, Guid ChatId) : INotification;

backend/src/Modules/Conversations/Application/Messages/UploadFile/UploadFileCommand.cs

@@ -1,4 +1,4 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using System;
 using System.IO;
 using System.Threading;

backend/src/Modules/Conversations/Application/Messages/Vote/VotePollCommand.cs

@@ -0,0 +1,110 @@
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Shared.Kernel;
+using MediatR;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+namespace Knot.Modules.Conversations.Application.Messages.Vote;
+
+public sealed record VotePollCommand(
+    Guid MessageId,
+    Guid ChatId,
+    Guid UserId,
+    Guid OptionId) : ICommand;
+
+public sealed class VotePollCommandHandler : ICommandHandler<VotePollCommand>
+{
+    private readonly IMessageRepository _messageRepository;
+    private readonly IChatRepository _chatRepository;
+    private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IMessageNotifier _notifier;
+    private readonly IUserDisplayNameProvider _userProvider;
+
+    public VotePollCommandHandler(
+        IMessageRepository messageRepository, 
+        IChatRepository chatRepository,
+        IChatsUnitOfWork unitOfWork,
+        IMessageNotifier notifier,
+        IUserDisplayNameProvider userProvider)
+    {
+        _messageRepository = messageRepository;
+        _chatRepository = chatRepository;
+        _unitOfWork = unitOfWork;
+        _notifier = notifier;
+        _userProvider = userProvider;
+    }
+
+    public async Task<Result> Handle(VotePollCommand request, CancellationToken cancellationToken)
+    {
+        var message = await _messageRepository.GetByIdAsync(request.MessageId, cancellationToken);
+        if (message is not PollMessage poll) return Result.Failure(new Error("Poll.NotFound", "Poll not found"));
+
+        if (poll.IsClosed) return Result.Failure(new Error("Poll.Closed", "This poll is closed."));
+
+        var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
+        if (chat == null || !chat.Members.Any(m => m.UserId == request.UserId)) return Result.Failure(ChatErrors.ChatsForbidden);
+
+        var targetOption = poll.Options.FirstOrDefault(o => o.Id == request.OptionId);
+        if (targetOption == null) return Result.Failure(new Error("Poll.InvalidOption", "Invalid option ID."));
+
+        // Prevent duplicate or changed votes
+        var existingVote = poll.Votes.FirstOrDefault(v => v.UserId == request.UserId && v.OptionId == request.OptionId);
+        if (existingVote != null) return Result.Failure(new Error("Poll.AlreadyVoted", "You have already voted for this option."));
+
+        if (!poll.IsMultipleChoice)
+        {
+            var hasVotedInThisPoll = poll.Votes.Any(v => v.UserId == request.UserId);
+            if (hasVotedInThisPoll) return Result.Failure(new Error("Poll.AlreadyVoted", "You have already voted in this poll."));
+        }
+
+        poll.Votes.Add(new PollVote { UserId = request.UserId, OptionId = request.OptionId, VotedAt = DateTime.UtcNow });
+        targetOption.VoteCount++;
+
+        await _messageRepository.UpdateAsync(poll, cancellationToken);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        // Notify updated poll
+        var voterIds = poll.Votes.Select(v => v.UserId).Distinct().ToList();
+        var votersInfo = poll.IsAnonymous == false 
+            ? await _userProvider.GetUsersInfoAsync(voterIds, cancellationToken)
+            : new Dictionary<Guid, UserInfo>();
+
+        await _notifier.NotifyMessageUpdateAsync(poll.ChatId, "poll_updated", new
+        {
+            id = poll.Id,
+            chatId = poll.ChatId,
+            senderId = poll.SenderId,
+            createdAt = poll.CreatedAt,
+            type = "poll",
+            content = poll.Content,
+            pollOptions = poll.Options.Select(o => new { 
+                id = o.Id, 
+                text = o.Text, 
+                voteCount = o.VoteCount,
+                voters = poll.IsAnonymous == false
+                    ? poll.Votes.Where(v => v.OptionId == o.Id)
+                        .Select(v => {
+                            votersInfo.TryGetValue(v.UserId, out var vu);
+                            return vu != null 
+                                ? new { id = vu.Id, username = vu.Username, displayName = vu.DisplayName, avatar = vu.Avatar }
+                                : new { id = v.UserId, username = "unknown", displayName = "Unknown", avatar = (string?)null };
+                        }).ToList()
+                    : null,
+                voterIds = poll.IsAnonymous == false
+                    ? poll.Votes.Where(v => v.OptionId == o.Id).Select(v => v.UserId).ToList()
+                    : null
+            }).ToList(),
+            pollIsMultipleChoice = poll.IsMultipleChoice,
+            pollIsClosed = poll.IsClosed,
+            pollIsAnonymous = poll.IsAnonymous
+        }, cancellationToken);
+
+        return Result.Success();
+    }
+}

backend/src/Modules/Conversations/Application/Users/Commands/DeleteUser/DeleteUserCommand.cs

@@ -2,8 +2,8 @@ using System.Text.RegularExpressions;
 using Knot.Contracts.Auth.Application.Abstractions;
 using Knot.Contracts.Auth.Domain;
 using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using Knot.Shared.Kernel.Storage;
 using MediatR;
@@ -54,9 +54,11 @@ internal sealed class DeleteUserCommandHandler : ICommandHandler<DeleteUserComma
             if (msg is MediaMessage mediaMsg)
             {
                 foreach (var media in mediaMsg.Media)
+                {
+                    if (!string.IsNullOrEmpty(media.Url))
                     {
                         bool isUsedElsewhere = allMessages.Any(m => m.Id != msg.Id &&
-                        m is MediaMessage mm && mm.Media.Any(ame => ame.Url == media.Url));
+                            m is MediaMessage mm && mm.Media.Any(ame => !string.IsNullOrEmpty(ame.Url) && ame.Url == media.Url));
 
                         if (!isUsedElsewhere)
                         {
@@ -69,6 +71,7 @@ internal sealed class DeleteUserCommandHandler : ICommandHandler<DeleteUserComma
                     }
                 }
             }
+        }
 
         await _messageRepository.DeleteUserMessagesAsync(request.UserId, cancellationToken);
 

backend/src/Modules/Conversations/DependencyInjection.cs

@@ -1,16 +1,14 @@
 using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
-using Knot.Contracts.Messaging.Application.Abstractions;
-using Knot.Contracts.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.Persistence;
 using Knot.Modules.Conversations.Infrastructure.Persistence.Mongo;
+using Knot.Modules.Conversations.Infrastructure.Services;
 using Knot.Shared.Kernel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using ConversationsAbstractions = Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Messaging.Application.Abstractions;
 
 namespace Knot.Modules.Conversations;
 
@@ -29,21 +27,22 @@ public static class DependencyInjection
 
         var mongoConnectionString = configuration.GetConnectionString("MongoConnection") ?? "mongodb://localhost:27017";
 
-        services.AddScoped<ConversationsAbstractions.IChatsUnitOfWork>(sp => sp.GetRequiredService<ChatsDbContext>());
+        services.AddScoped<IChatsUnitOfWork>(sp => sp.GetRequiredService<ChatsDbContext>());
         services.AddScoped<Knot.Contracts.Conversations.Infrastructure.Persistence.IChatsDbContext>(sp => sp.GetRequiredService<ChatsDbContext>());
         services.AddScoped<IChatRepository, ChatRepository>();
         services.AddScoped<IFolderRepository, FolderRepository>();
         services.AddScoped<IUserChatSettingsRepository, UserChatSettingsRepository>();
-        services.AddScoped<IUserFolderSettingsRepository, UserFolderSettingsRepository>();
+        services.AddScoped<Knot.Contracts.Conversations.Domain.IUserFolderSettingsRepository, UserFolderSettingsRepository>();
 
         services.AddMediatR(config =>
             config.RegisterServicesFromAssembly(typeof(DependencyInjection).Assembly));
 
-        services.AddScoped<Knot.Contracts.Messaging.Application.Abstractions.IChatAccessProvider, Knot.Modules.Conversations.Infrastructure.Services.ChatAccessProvider>();
+        services.AddScoped<Knot.Contracts.Messaging.Application.Abstractions.IChatAccessProvider, ChatAccessProvider>();
         services.AddScoped<Knot.Contracts.Messaging.Application.Abstractions.IMessageNotifier, Knot.Modules.Conversations.Infrastructure.SignalR.MessageNotifier>();
-        services.AddScoped<ConversationsAbstractions.IUserStatusService, Knot.Modules.Conversations.Infrastructure.Services.UserStatusService>();
-        services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserStatusService, Knot.Modules.Conversations.Infrastructure.Services.UserStatusService>();
-        services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserDeleterService, Knot.Modules.Conversations.Infrastructure.Services.UserDeleterService>();
+        services.AddScoped<Knot.Contracts.Conversations.Application.Abstractions.IUserStatusService, UserStatusService>();
+        services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserStatusService, UserStatusService>();
+        services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserDeleterService, UserDeleterService>();
+        
         return services;
     }
 }

backend/src/Modules/Conversations/Domain/Chat.cs

@@ -1,157 +0,0 @@
-using Knot.Shared.Kernel;
-
-namespace Knot.Modules.Conversations.Domain;
-
-public sealed record ChatCreatedDomainEvent(Chat Chat) : IDomainEvent;
-public sealed record ChatMemberAddedDomainEvent(Guid ChatId, Guid UserId) : IDomainEvent;
-
-/// <summary>
-/// Тип чата: личный или групповой.
-/// </summary>
-public enum ChatType
-{
-    Personal,
-    Group,
-    Favorites
-}
-
-/// <summary>
-/// Роль участника в чате.
-/// </summary>
-public static class ChatRole
-{
-    public const string Owner = "owner";
-    public const string Admin = "admin";
-    public const string Member = "member";
-}
-
-/// <summary>
-/// Сущность чата (Агрегат).
-/// </summary>
-public sealed class Chat : AggregateRoot<Guid>
-{
-    public ChatType Type { get; private set; }
-    public string? Name { get; private set; }
-    public string? Description { get; private set; }
-    public string? Avatar { get; private set; }
-    public DateTime CreatedAt { get; private set; }
-    public long LastMessageSequenceId { get; private set; }
-
-    private readonly List<ChatMember> _members = new();
-    public IReadOnlyCollection<ChatMember> Members => _members.AsReadOnly();
-
-    private Chat(Guid id, ChatType type, string? name, string? avatar, string? description = null) : base(id)
-    {
-        Type = type;
-        Name = name;
-        Avatar = avatar;
-        Description = description;
-        CreatedAt = DateTime.UtcNow;
-    }
-
-    /// <summary>
-    /// Создает личный чат между двумя пользователями.
-    /// </summary>
-    public static Chat CreatePersonal()
-    {
-        var chat = new Chat(Guid.NewGuid(), ChatType.Personal, null, null);
-        chat.RaiseDomainEvent(new ChatCreatedDomainEvent(chat));
-        return chat;
-    }
-
-    /// <summary>
-    /// Создает групповой чат.
-    /// </summary>
-    public static Chat CreateGroup(string name, string? avatar = null)
-    {
-        var chat = new Chat(Guid.NewGuid(), ChatType.Group, name, avatar);
-        chat.RaiseDomainEvent(new ChatCreatedDomainEvent(chat));
-        return chat;
-    }
-
-    /// <summary>
-    /// Фабричный метод для создания чата.
-    /// </summary>
-    public static Chat Create(string? name, ChatType type, string? avatar = null, string? description = null)
-    {
-        var chat = new Chat(Guid.NewGuid(), type, name, avatar, description);
-        chat.RaiseDomainEvent(new ChatCreatedDomainEvent(chat));
-        return chat;
-    }
-
-    public void AddMember(Guid userId, string role = "member")
-    {
-        if (_members.Any(m => m.UserId == userId))
-        {
-            return;
-        }
-
-        _members.Add(new ChatMember(Id, userId, role));
-        RaiseDomainEvent(new ChatMemberAddedDomainEvent(Id, userId));
-    }
-
-    public void RemoveMember(Guid userId)
-    {
-        var member = _members.FirstOrDefault(m => m.UserId == userId);
-        if (member != null)
-        {
-            _members.Remove(member);
-        }
-    }
-
-    public void UpdateName(string name) => Name = name;
-
-    public void UpdateDescription(string? description) => Description = description;
-
-    public void UpdateAvatar(string? avatarUrl) => Avatar = avatarUrl;
-
-    public long IncrementSequenceId()
-    {
-        return ++LastMessageSequenceId;
-    }
-}
-
-/// <summary>
-/// Участник чата.
-/// </summary>
-public sealed class ChatMember : Entity<Guid>
-{
-    public Guid ChatId { get; private set; }
-    public Guid UserId { get; private set; }
-    public string Role { get; private set; }
-    public DateTime JoinedAt { get; private set; }
-    public bool IsPinned { get; private set; }
-    public bool IsMuted { get; private set; }
-    
-    public Guid? LastReadMessageId { get; private set; }
-    public long LastReadSequenceId { get; private set; }
-    public Guid? LastDeliveredMessageId { get; private set; }
-
-    // For EF Core
-    private ChatMember() : base(Guid.Empty) { Role = "member"; }
-
-    internal ChatMember(Guid chatId, Guid userId, string role) : base(Guid.NewGuid())
-    {
-        ChatId = chatId;
-        UserId = userId;
-        Role = role;
-        JoinedAt = DateTime.UtcNow;
-    }
-
-    public void TogglePin() => IsPinned = !IsPinned;
-
-    public void UpdateReadCursor(Guid messageId, long sequenceId)
-    {
-        if (sequenceId > LastReadSequenceId)
-        {
-            LastReadMessageId = messageId;
-            LastReadSequenceId = sequenceId;
-        }
-    }
-
-    public void UpdateDeliveredCursor(Guid messageId)
-    {
-        LastDeliveredMessageId = messageId;
-    }
-}
-

backend/src/Modules/Conversations/Domain/ChatConstants.cs

@@ -1,10 +0,0 @@
-namespace Knot.Modules.Conversations.Domain;
-
-public static class ChatConstants
-{
-    public const int DefaultMessageQueryLimit = 100;
-    public const int MaxSharedMediaQueryLimit = 300;
-    public const int SearchMessagesLimit = 50;
-    public const int MaxFileUploadSizeMb = 50;
-}
-

backend/src/Modules/Conversations/Domain/ChatErrors.cs

@@ -1,25 +0,0 @@
-using Knot.Shared.Kernel;
-
-namespace Knot.Modules.Conversations.Domain;
-
-public static class ChatErrors
-{
-    public static readonly Error FileEmpty = new Error("File.Empty", "No file uploaded");
-    public static readonly Error FileInvalidExtension = new Error("File.InvalidExtension", "Must be a ZIP archive");
-    public static readonly Error ImportExpired = new Error("Import.Expired", "Session not found or expired");
-    public static readonly Error ImportMissing = new Error("Import.Missing", "ZIP file lost");
-    public static readonly Error ChatNotFound = new Error("Chat.NotFound", "Chat not found or access denied");
-    public static readonly Error NotFound = new Error("Chat.NotFound", "Chat not found"); // Alias
-    public static readonly Error NotMember = new Error("Chat.NotMember", "You are not a member of this chat");
-    public static readonly Error ChatsForbidden = new Error("Chats.Forbidden", "Вы не являетесь участником этого чата.");
-    public static readonly Error MessagesNotFound = new Error("Messages.NotFound", "Message not found.");
-    public static readonly Error ChatsNotFound = new Error("Chats.NotFound", "Чат не найден.");
-    public static readonly Error Unauthorized = new Error("Chats.Unauthorized", "Access denied");
-    public static readonly Error FoldersDisabled = new Error("Folders.Disabled", "Folders feature is disabled by the administrator.");
-    public static readonly Error PollsDisabled = new Error("Polls.Disabled", "Polls are disabled by the administrator.");
-    public static readonly Error MediaDisabled = new Error("Media.Disabled", "Media messages are disabled by the administrator.");
-
-    public static Error ImportCreateChatFailed(string msg) => new Error("Import.CreateChatFailed", msg);
-    public static Error FileTooLarge(int maxMb) => new Error("File.TooLarge", $"File exceeds the maximum allowed size of {maxMb}MB.");
-}
-

backend/src/Modules/Conversations/Domain/Folder.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Knot.Shared.Kernel;
-
-namespace Knot.Modules.Conversations.Domain;
-
-/// <summary>
-/// Сущность папки для группировки чатов.
-/// </summary>
-public sealed class Folder : AggregateRoot<Guid>
-{
-    public string Name { get; private set; }
-    public string? Icon { get; private set; } // URL из хранилища
-    public bool IsDefault { get; private set; }
-    public FolderType Type { get; private set; }
-
-    public Folder(Guid id, string name, string? icon = null, bool isDefault = false, FolderType type = FolderType.Custom)
-        : base(id)
-    {
-        Name = name;
-        Icon = icon;
-        IsDefault = isDefault;
-        Type = type;
-    }
-
-    public void Update(string name, string? icon)
-    {
-        if (IsDefault) throw new InvalidOperationException("Cannot rename default folders.");
-        Name = name;
-        Icon = icon;
-    }
-}
-
-public enum FolderType
-{
-    All,        // Все чаты
-    New,        // Новые (с непрочитанными)
-    Muted,      // Без звука
-    Custom      // Пользовательская
-}
-
-/// <summary>
-/// Настройки конкретного чата для конкретного пользователя.
-/// Хранятся в PostgreSQL (связь User <-> Chat).
-/// </summary>
-public sealed class UserChatSettings : Entity<Guid>
-{
-    public Guid UserId { get; private set; }
-    public Guid ChatId { get; private set; }
-    
-    // Список папок, в которые входит чат для этого пользователя
-    private readonly List<Guid> _folderIds = new();
-    public IReadOnlyCollection<Guid> FolderIds => _folderIds.AsReadOnly();
-
-    public bool IsMuted { get; private set; }
-
-    private UserChatSettings() : base(Guid.NewGuid()) { }
-
-    public UserChatSettings(Guid userId, Guid chatId) : base(Guid.NewGuid())
-    {
-        UserId = userId;
-        ChatId = chatId;
-    }
-
-    public static UserChatSettings Create(Guid userId, Guid chatId) => new(userId, chatId);
-
-    public void AddToFolder(Guid folderId)
-    {
-        if (!_folderIds.Contains(folderId)) _folderIds.Add(folderId);
-    }
-
-    public void RemoveFromFolder(Guid folderId)
-    {
-        _folderIds.Remove(folderId);
-    }
-
-    public void SetMute(bool isMuted) => IsMuted = isMuted;
-}
-
-/// <summary>
-/// Глобальные настройки папок пользователя (скрытие дефолтных и т.д.).
-/// Будет храниться в MongoDB.
-/// </summary>
-public sealed class UserFolderSettings : AggregateRoot<Guid>
-{
-    public Guid UserId { get; private set; }
-    
-    // Список ID папок, которые пользователь скрыл (только для дефолтных)
-    public List<Guid> HiddenDefaultFolderIds { get; private set; } = new();
-
-    // Список пользовательских папок (Guid созданных Folder)
-    public List<Guid> CustomFolderIds { get; private set; } = new();
-
-    public UserFolderSettings(Guid userId) : base(Guid.NewGuid())
-    {
-        UserId = userId;
-    }
-
-    public void HideFolder(Guid folderId)
-    {
-        if (!HiddenDefaultFolderIds.Contains(folderId)) HiddenDefaultFolderIds.Add(folderId);
-    }
-
-    public void ShowFolder(Guid folderId)
-    {
-        HiddenDefaultFolderIds.Remove(folderId);
-    }
-}

backend/src/Modules/Conversations/Domain/IChatRepository.cs

@@ -1,39 +0,0 @@
-using Knot.Modules.Conversations.Domain;
-
-namespace Knot.Modules.Conversations.Domain;
-
-public interface IChatRepository
-{
-    void Add(Chat chat);
-    void Update(Chat chat);
-    void Remove(Chat chat);
-    Task<Chat?> GetByIdAsync(Guid id, CancellationToken cancellationToken);
-    Task<Chat?> GetFavoritesAsync(Guid userId, CancellationToken cancellationToken);
-    Task<List<Chat>> GetUserChatsAsync(Guid userId, CancellationToken cancellationToken);
-}
-
-public interface IFolderRepository
-{
-    void Add(Folder folder);
-    void Update(Folder folder);
-    void Remove(Folder folder);
-    Task<Folder?> GetByIdAsync(Guid id, CancellationToken cancellationToken);
-    Task<List<Folder>> GetUserFoldersAsync(Guid userId, CancellationToken cancellationToken);
-}
-
-public interface IUserChatSettingsRepository
-{
-    void Add(UserChatSettings settings);
-    void Update(UserChatSettings settings);
-    void Remove(UserChatSettings settings);
-    void RemoveRange(IEnumerable<UserChatSettings> settings);
-    Task<UserChatSettings?> GetAsync(Guid userId, Guid chatId, CancellationToken cancellationToken);
-    Task<List<UserChatSettings>> GetByUserIdAsync(Guid userId, CancellationToken cancellationToken);
-}
-
-public interface IUserFolderSettingsRepository
-{
-    Task<UserFolderSettings?> GetByUserIdAsync(Guid userId, CancellationToken cancellationToken);
-    Task UpdateAsync(UserFolderSettings settings, CancellationToken cancellationToken);
-    Task RemoveByUserIdAsync(Guid userId, CancellationToken cancellationToken);
-}

backend/src/Modules/Conversations/Infrastructure/Handlers/ChatCreatedDomainEventHandler.cs

@@ -1,5 +1,5 @@
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using MediatR;
 using Microsoft.AspNetCore.SignalR;

backend/src/Modules/Conversations/Infrastructure/Persistence/ChatRepository.cs

@@ -1,5 +1,5 @@
+using Knot.Contracts.Conversations.Domain;
 using Microsoft.EntityFrameworkCore;
-using Knot.Modules.Conversations.Domain;
 
 namespace Knot.Modules.Conversations.Infrastructure.Persistence;
 

backend/src/Modules/Conversations/Infrastructure/Persistence/ConversationsDbContext.cs

@@ -4,19 +4,18 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
-using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Domain;
 using Knot.Shared.Kernel;
 using Knot.Shared.Kernel.Security;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using DomainChat = Knot.Modules.Conversations.Domain.Chat;
+using DomainChat = Knot.Contracts.Conversations.Domain.Chat;
 
 namespace Knot.Modules.Conversations.Infrastructure.Persistence;
 
-public sealed class ChatsDbContext : DbContext, Knot.Modules.Conversations.Application.Abstractions.IChatsUnitOfWork, Knot.Contracts.Conversations.Infrastructure.Persistence.IChatsDbContext
+public sealed class ChatsDbContext : DbContext, Knot.Contracts.Conversations.Application.Abstractions.IChatsUnitOfWork, Knot.Contracts.Conversations.Infrastructure.Persistence.IChatsDbContext
 {
     private readonly IMediator? _mediator;
     private readonly IEncryptionService? _encryptionService;
@@ -54,6 +53,8 @@ public sealed class ChatsDbContext : DbContext, Knot.Modules.Conversations.Appli
                 {
                     builder.ToTable("Chats");
                     builder.HasKey(c => c.Id);
+                    builder.Property(c => c.IsImporting);
+                    builder.Property(c => c.ImportJobId);
                     builder.Property(c => c.Type).HasConversion<string>();
 
                     builder.OwnsMany(c => c.Members, mb =>

backend/src/Modules/Conversations/Infrastructure/Persistence/Mongo/ConversationsMongoDbMapConfigurator.cs

@@ -1,4 +1,4 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using MongoDB.Bson.Serialization;
 
 namespace Knot.Modules.Conversations.Infrastructure.Persistence.Mongo;

backend/src/Modules/Conversations/Infrastructure/Persistence/Mongo/UserFolderSettingsRepository.cs

@@ -1,4 +1,4 @@
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using MongoDB.Driver;
 
 namespace Knot.Modules.Conversations.Infrastructure.Persistence.Mongo;

backend/src/Modules/Conversations/Infrastructure/Services/UserStatusService.cs

@@ -1,9 +1,11 @@
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 
 namespace Knot.Modules.Conversations.Infrastructure.Services;
 
-public sealed class UserStatusService : IUserStatusService, Knot.Contracts.Conversations.Abstractions.IUserStatusService
+public sealed class UserStatusService : 
+    Knot.Contracts.Conversations.Application.Abstractions.IUserStatusService, 
+    Knot.Contracts.Conversations.Abstractions.IUserStatusService
 {
     public bool IsUserOnline(string userId)
     {

backend/src/Modules/Conversations/Infrastructure/SignalR/ChatHub.cs

@@ -1,16 +1,26 @@
 using System.Collections.Concurrent;
 using System.Security.Claims;
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Modules.Conversations.Application.DTOs;
+using Knot.Modules.Conversations.Application.Messages.Delete;
+using Knot.Modules.Conversations.Application.Messages.Edit;
+using Knot.Modules.Conversations.Application.Messages.Pin;
+using Knot.Modules.Conversations.Application.Messages.React;
+using Knot.Modules.Conversations.Application.Messages.Read;
+using Knot.Modules.Conversations.Application.Messages.Send;
+using Knot.Modules.Conversations.Application.Messages.Unpin;
+using Knot.Modules.Conversations.Application.Messages.Vote;
+using Knot.Shared.Kernel;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using Knot.Modules.Conversations.Application.Messages.Send;
-using Knot.Modules.Conversations.Application.Messages.Read;
-using Knot.Modules.Conversations.Application.Messages.Delete;
-using Knot.Modules.Conversations.Application.Messages.React;
-using Knot.Modules.Conversations.Domain;
-using Knot.Shared.Kernel;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -28,19 +38,38 @@ public sealed class ChatHub : Hub
     public static int OnlineUsersCount => _userConnections.Count;
     public static bool IsUserOnline(string userId) => _userConnections.ContainsKey(userId);
 
+    // userId → CallSession (one user can be in only one call at a time)
+    private static readonly ConcurrentDictionary<string, CallSession> _activeSessionsByUser = new();
+    // chatId → (startTime, callType)
+    private static readonly ConcurrentDictionary<string, (DateTime StartTime, string CallType)> _activeGroupCalls = new();
+
     private readonly ISender _sender;
     private readonly IUserContext _userContext;
     private readonly IChatRepository _chatRepository;
+    private readonly IUserRepository _userRepository;
+    private readonly IMessageRepository _messageRepository;
     private readonly ILogger<ChatHub> _logger;
     private readonly IMemoryCache _cache;
+    private readonly IUserDisplayNameProvider _userProvider;
 
-    public ChatHub(ISender sender, IUserContext userContext, IChatRepository chatRepository, ILogger<ChatHub> logger, IMemoryCache cache)
+    public ChatHub(
+        ISender sender,
+        IUserContext userContext,
+        IChatRepository chatRepository,
+        IUserRepository userRepository,
+        IMessageRepository messageRepository,
+        ILogger<ChatHub> logger,
+        IMemoryCache cache,
+        IUserDisplayNameProvider userProvider)
     {
         _sender = sender;
         _userContext = userContext;
         _chatRepository = chatRepository;
+        _userRepository = userRepository;
+        _messageRepository = messageRepository;
         _logger = logger;
         _cache = cache;
+        _userProvider = userProvider;
     }
 
     public override async Task OnConnectedAsync()
@@ -103,14 +132,18 @@ public sealed class ChatHub : Hub
             new AttachmentRequest(a.Type, a.Url, a.FileName, a.FileSize)).ToList();
 
         var command = new SendMessageCommand(
-            request.ChatId,
-            _userContext.UserId,
-            request.Content,
-            request.Type,
-            attachments,
-            request.ReplyToId,
-            request.Quote,
-            request.ForwardedFromId);
+            ChatId: request.ChatId,
+            SenderId: _userContext.UserId,
+            Content: request.Content,
+            Type: request.Type,
+            Attachments: attachments,
+            ReplyToId: request.ReplyToId,
+            Quote: request.Quote,
+            ForwardedFromId: request.ForwardedFromId,
+            PollOptions: request.PollOptions,
+            PollIsAnonymous: request.PollIsAnonymous,
+            PollAllowMultipleAnswers: request.PollAllowMultipleAnswers
+        );
 
         await _sender.Send(command);
     }
@@ -125,6 +158,7 @@ public sealed class ChatHub : Hub
             await _sender.Send(command);
         }
 
+        // Отправляем событие всем в чате о том, что пользователь прочитал сообщения
         await Clients.Group(request.ChatId.ToString()).SendAsync("messages_read", new
         {
             ChatId = request.ChatId.ToString(),
@@ -218,6 +252,62 @@ public sealed class ChatHub : Hub
         _logger.LogInformation("RemoveReaction completed successfully");
     }
 
+    [HubMethodName("pin_message")]
+    public async Task PinMessage(PinMessageRequest request)
+    {
+        var command = new PinMessageCommand(request.MessageId, request.ChatId, _userContext.UserId);
+        var result = await _sender.Send(command);
+        var message = await _messageRepository.GetByIdAsync(request.MessageId, Context.ConnectionAborted);
+        if (message != null)
+        {
+            var senderInfo = await _userProvider.GetUsersInfoAsync(new[] { message.SenderId });
+            var dto = MessageMapper.MapToDto(message, senderInfo, Enumerable.Empty<MessageReaction>(), Enumerable.Empty<Guid>());
+
+            await Clients.Group(request.ChatId.ToString()).SendAsync("message_pinned", new
+            {
+                chatId = request.ChatId,
+                message = dto,
+                userId = _userContext.UserId
+            });
+        }
+    }
+
+    [HubMethodName("unpin_message")]
+    public async Task UnpinMessage(PinMessageRequest request)
+    {
+        var command = new UnpinMessageCommand(request.MessageId, request.ChatId, _userContext.UserId);
+        var result = await _sender.Send(command);
+
+        await Clients.Group(request.ChatId.ToString()).SendAsync("message_unpinned", new
+        {
+            chatId = request.ChatId,
+            messageId = request.MessageId,
+            userId = _userContext.UserId
+        });
+    }
+
+    [HubMethodName("edit_message")]
+    public async Task EditMessage(EditMessageHubRequest request)
+    {
+        var command = new EditMessageCommand(request.MessageId, request.ChatId, _userContext.UserId, request.Content);
+        var result = await _sender.Send(command);
+        if (result.IsFailure)
+        {
+            throw new HubException(result.Error.Description);
+        }
+    }
+
+    [HubMethodName("vote_poll")]
+    public async Task VotePoll(VotePollRequest request)
+    {
+        var command = new VotePollCommand(request.MessageId, request.ChatId, _userContext.UserId, request.OptionId);
+        var result = await _sender.Send(command);
+        if (result.IsFailure)
+        {
+            throw new HubException(result.Error.Description);
+        }
+    }
+
     // ────────────────────────────────────────────────────────────────
     // Friend signals (Proxy methods for real-time notification)
     // ────────────────────────────────────────────────────────────────
@@ -284,10 +374,12 @@ public sealed class ChatHub : Hub
     [HubMethodName("call_offer")]
     public async Task CallOffer(CallOfferRequest request)
     {
-        // Try to get caller info from current user's claims
-        var displayName = Context.User?.FindFirstValue("name") ?? Context.User?.FindFirstValue(ClaimTypes.Name) ?? "User";
-        var avatar = Context.User?.FindFirstValue("avatar");
-        var username = Context.User?.FindFirstValue("unique_name") ?? Context.User?.Identity?.Name;
+        // Fetch fresh user info from repository instead of relying on potentially stale JWT claims
+        var user = await _userRepository.GetByIdAsync(_userContext.UserId);
+
+        var displayName = user?.DisplayName ?? Context.User?.FindFirstValue("name") ?? Context.User?.FindFirstValue(ClaimTypes.Name) ?? "User";
+        var avatar = user?.Avatar ?? Context.User?.FindFirstValue("avatar");
+        var username = user?.Username ?? Context.User?.FindFirstValue("unique_name") ?? Context.User?.Identity?.Name;
 
         await SendToUserAsync(request.TargetUserId, "call_incoming", new
         {
@@ -297,18 +389,41 @@ public sealed class ChatHub : Hub
             chatId = request.ChatId,
             callerInfo = new
             {
-
                 id = _userContext.UserId.ToString(),
                 displayName = displayName,
                 avatar = avatar,
                 username = username
             }
         });
+
+        // Track session for history
+        Guid? chatId = null;
+        if (Guid.TryParse(request.ChatId, out var parsedChatId)) chatId = parsedChatId;
+
+        if (!chatId.HasValue)
+        {
+            var userChats = await _chatRepository.GetUserChatsAsync(_userContext.UserId, Context.ConnectionAborted);
+            if (Guid.TryParse(request.TargetUserId, out var targetId))
+            {
+                var personalChat = userChats.FirstOrDefault(c => c.Type == ChatType.Personal && c.Members.Any(m => m.UserId == targetId));
+                if (personalChat != null) chatId = personalChat.Id;
+            }
+        }
+
+        var session = new CallSession(chatId, _userContext.UserId, Guid.Parse(request.TargetUserId), request.CallType, DateTime.UtcNow);
+        _activeSessionsByUser[_userContext.UserId.ToString()] = session;
+        _activeSessionsByUser[request.TargetUserId] = session;
     }
 
     [HubMethodName("call_answer")]
     public async Task CallAnswer(CallAnswerRequest request)
     {
+        if (_activeSessionsByUser.TryGetValue(_userContext.UserId.ToString(), out var session))
+        {
+            session.IsAnswered = true;
+            session.AnswerTime = DateTime.UtcNow;
+        }
+
         await SendToUserAsync(request.TargetUserId, "call_answered", new
         {
             from = _userContext.UserId.ToString(),
@@ -319,6 +434,19 @@ public sealed class ChatHub : Hub
     [HubMethodName("call_decline")]
     public async Task CallDecline(TargetUserRequest request)
     {
+        var currentUserIdStr = _userContext.UserId.ToString();
+        if (_activeSessionsByUser.TryRemove(currentUserIdStr, out var session))
+        {
+            _activeSessionsByUser.TryRemove(request.TargetUserId, out _);
+            if (session.ChatId.HasValue)
+            {
+                // If declined by recipient, it's a "declined" call
+                // If current user is recipient (not the one who started), status is declined
+                string status = _userContext.UserId == session.FromUserId ? "cancelled" : "declined";
+                await CreateCallMessage(session.ChatId.Value, session.FromUserId, session.CallType, status, 0);
+            }
+        }
+
         await SendToUserAsync(request.TargetUserId, "call_declined", new
         {
             from = _userContext.UserId.ToString(),
@@ -328,12 +456,53 @@ public sealed class ChatHub : Hub
     [HubMethodName("call_end")]
     public async Task CallEnd(TargetUserRequest request)
     {
+        var currentUserIdStr = _userContext.UserId.ToString();
+        if (_activeSessionsByUser.TryRemove(currentUserIdStr, out var session))
+        {
+            _activeSessionsByUser.TryRemove(request.TargetUserId, out _);
+            if (session.ChatId.HasValue)
+            {
+                int duration = session.IsAnswered && session.AnswerTime.HasValue
+                    ? (int)(DateTime.UtcNow - session.AnswerTime.Value).TotalSeconds
+                    : 0;
+
+                string status = session.IsAnswered ? "completed" : (_userContext.UserId == session.FromUserId ? "cancelled" : "missed");
+                await CreateCallMessage(session.ChatId.Value, session.FromUserId, session.CallType, status, duration);
+            }
+        }
+
         await SendToUserAsync(request.TargetUserId, "call_ended", new
         {
             from = _userContext.UserId.ToString(),
         });
     }
 
+    private async Task CreateCallMessage(Guid chatId, Guid senderId, string callType, string status, int duration)
+    {
+        var command = new SendMessageCommand(
+            chatId,
+            senderId,
+            null,
+            "call",
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            callType,
+            status,
+            duration
+        );
+
+        await _sender.Send(command);
+    }
+
     [HubMethodName("ice_candidate")]
     public async Task IceCandidate(IceCandidateRequest request)
     {
@@ -396,14 +565,20 @@ public sealed class ChatHub : Hub
         var chatId = request.ChatId;
         var userId = _userContext.UserId.ToString();
 
+        // Fetch fresh user info from repository
+        var user = await _userRepository.GetByIdAsync(_userContext.UserId);
 
-        var displayName = Context.User?.FindFirstValue("name") ?? Context.User?.FindFirstValue(ClaimTypes.Name) ?? "User";
-        var avatar = Context.User?.FindFirstValue("avatar");
-        var username = Context.User?.FindFirstValue("unique_name") ?? Context.User?.Identity?.Name ?? "user";
+        var displayName = user?.DisplayName ?? Context.User?.FindFirstValue("name") ?? Context.User?.FindFirstValue(ClaimTypes.Name) ?? "User";
+        var avatar = user?.Avatar ?? Context.User?.FindFirstValue("avatar");
+        var username = user?.Username ?? Context.User?.FindFirstValue("unique_name") ?? Context.User?.Identity?.Name ?? "user";
 
         var userInfo = new ParticipantInfo(userId, username, displayName, avatar);
 
-        var participants = _groupCallParticipants.GetOrAdd(chatId, _ => new ConcurrentDictionary<string, ParticipantInfo>());
+        var participants = _groupCallParticipants.GetOrAdd(chatId, _ =>
+        {
+            _activeGroupCalls[chatId] = (DateTime.UtcNow, request.CallType);
+            return new ConcurrentDictionary<string, ParticipantInfo>();
+        });
         var isFirst = participants.IsEmpty;
         participants.TryAdd(userId, userInfo);
 
@@ -461,6 +636,11 @@ public sealed class ChatHub : Hub
             if (participants.IsEmpty)
             {
                 _groupCallParticipants.TryRemove(chatId, out _);
+                if (_activeGroupCalls.TryRemove(chatId, out var info))
+                {
+                    var duration = (int)(DateTime.UtcNow - info.StartTime).TotalSeconds;
+                    await CreateCallMessage(Guid.Parse(chatId), _userContext.UserId, info.CallType, "completed", duration);
+                }
                 await Clients.Group(chatId).SendAsync("group_call_ended", new { chatId = chatId });
             }
         }
@@ -549,7 +729,7 @@ public sealed class ChatHub : Hub
         await Clients.Group(request.ChatId).SendAsync("group_call_status_updated", new
         {
             chatId = request.ChatId,
-            userId = Context.UserIdentifier,
+            userId = _userContext.UserId.ToString(),
             isMuted = request.IsMuted,
             isVideoOff = request.IsVideoOff
         });
@@ -576,7 +756,7 @@ public sealed class ChatHub : Hub
         await Clients.Group(chatId).SendAsync("group_call_status_updated", new
         {
             chatId = chatId,
-            userId = Context.UserIdentifier,
+            userId = _userContext.UserId.ToString(),
             isMuted = isMuted,
             isVideoOff = isVideoOff
         });
@@ -660,7 +840,10 @@ public sealed class ChatHub : Hub
         List<AttachmentHubRequest>? Attachments = null,
         Guid? ReplyToId = null,
         string? Quote = null,
-        Guid? ForwardedFromId = null);
+        Guid? ForwardedFromId = null,
+        List<string>? PollOptions = null,
+        bool? PollIsAnonymous = null,
+        bool? PollAllowMultipleAnswers = null);
     public record ReadMessagesRequest(Guid ChatId, Guid LastReadMessageId, long LastReadSequenceId);
     public record CallOfferRequest(string TargetUserId, object Offer, string CallType, string? ChatId);
     public record CallAnswerRequest(string TargetUserId, object Answer);
@@ -672,6 +855,7 @@ public sealed class ChatHub : Hub
     public record CallStatusRequest(string TargetUserId, bool IsMuted, bool IsVideoOff);
     public record AddReactionRequest(Guid MessageId, Guid ChatId, string Emoji);
     public record RemoveReactionRequest(Guid MessageId, Guid ChatId, string Emoji);
+    public record PinMessageRequest(Guid MessageId, Guid ChatId);
     public record DeleteMessagesHubRequest(Guid ChatId, List<string> MessageIds, bool DeleteForAll);
     public record GroupCallJoinRequest(string ChatId, string CallType);
     public record ParticipantInfo(string Id, string Username, string DisplayName, string? Avatar, bool IsSharingScreen = false, bool IsMuted = false, bool IsVideoOff = false);
@@ -684,5 +868,27 @@ public sealed class ChatHub : Hub
     public record GroupRenegotiateRequest(string ChatId, string TargetUserId, object Offer);
     public record GroupRenegotiateAnswerRequest(string ChatId, string TargetUserId, object Answer);
     public record FriendSignalRequest(string FriendId);
+    public record VotePollRequest(Guid MessageId, Guid ChatId, Guid OptionId);
+    public record EditMessageHubRequest(Guid MessageId, Guid ChatId, string Content);
+
+    public class CallSession
+    {
+        public Guid? ChatId { get; }
+        public Guid FromUserId { get; }
+        public Guid ToUserId { get; }
+        public string CallType { get; }
+        public DateTime StartTime { get; }
+        public bool IsAnswered { get; set; }
+        public DateTime? AnswerTime { get; set; }
+
+        public CallSession(Guid? chatId, Guid fromUserId, Guid toUserId, string callType, DateTime startTime)
+        {
+            ChatId = chatId;
+            FromUserId = fromUserId;
+            ToUserId = toUserId;
+            CallType = callType;
+            StartTime = startTime;
+        }
+    }
 }
 

backend/src/Modules/Conversations/Infrastructure/SignalR/MessageNotifier.cs

@@ -5,4 +5,23 @@ using System.Threading;
 using System.Threading.Tasks;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Microsoft.AspNetCore.SignalR;
-public class MessageNotifier : IMessageNotifier { private readonly IHubContext<ChatHub> _hubContext; public MessageNotifier(IHubContext<ChatHub> hubContext) { _hubContext = hubContext; } public Task NotifyNewMessageAsync(Guid chatId, object messagePayload, CancellationToken cancellationToken) { return _hubContext.Clients.Group(chatId.ToString()).SendAsync("new_message", messagePayload, cancellationToken); } }
+
+public class MessageNotifier : IMessageNotifier 
+{ 
+    private readonly IHubContext<ChatHub> _hubContext; 
+    
+    public MessageNotifier(IHubContext<ChatHub> hubContext) 
+    { 
+        _hubContext = hubContext; 
+    } 
+    
+    public Task NotifyNewMessageAsync(Guid chatId, object messagePayload, CancellationToken cancellationToken) 
+    { 
+        return _hubContext.Clients.Group(chatId.ToString()).SendAsync("new_message", messagePayload, cancellationToken); 
+    } 
+    
+    public Task NotifyMessageUpdateAsync(Guid chatId, string updateType, object updatePayload, CancellationToken cancellationToken) 
+    { 
+        return _hubContext.Clients.Group(chatId.ToString()).SendAsync(updateType, updatePayload, cancellationToken); 
+    } 
+}

backend/src/Modules/Conversations/Migrations/20260322191932_InitialConversations.Designer.cs

@@ -26,7 +26,7 @@ namespace Knot.Modules.Conversations.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Knot.Modules.Conversations.Domain.Chat", b =>
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -56,9 +56,9 @@ namespace Knot.Modules.Conversations.Migrations
                     b.ToTable("Chats", "chats");
                 });
 
-            modelBuilder.Entity("Knot.Modules.Conversations.Domain.Chat", b =>
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
                 {
-                    b.OwnsMany("Knot.Modules.Conversations.Domain.ChatMember", "Members", b1 =>
+                    b.OwnsMany("Knot.Contracts.Conversations.Domain.ChatMember", "Members", b1 =>
                         {
                             b1.Property<Guid>("Id")
                                 .ValueGeneratedOnAdd()

backend/src/Modules/Conversations/Migrations/20260406122703_AddIsImportingToChat.Designer.cs

@@ -0,0 +1,166 @@
+// <auto-generated />
+using System;
+using Knot.Modules.Conversations.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Knot.Modules.Conversations.Migrations
+{
+    [DbContext(typeof(ChatsDbContext))]
+    [Migration("20260406122703_AddIsImportingToChat")]
+    partial class AddIsImportingToChat
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("chats")
+                .HasAnnotation("ProductVersion", "10.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Avatar")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsImporting")
+                        .HasColumnType("boolean");
+
+                    b.Property<long>("LastMessageSequenceId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Chats", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Folder", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Icon")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Folders", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.UserChatSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ChatId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("FolderIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsMuted")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ChatId")
+                        .IsUnique();
+
+                    b.ToTable("UserChatSettings", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
+                {
+                    b.OwnsMany("Knot.Contracts.Conversations.Domain.ChatMember", "Members", b1 =>
+                        {
+                            b1.Property<Guid>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("uuid");
+
+                            b1.Property<Guid>("ChatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("IsMuted")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPinned")
+                                .HasColumnType("boolean");
+
+                            b1.Property<DateTime>("JoinedAt")
+                                .HasColumnType("timestamp with time zone");
+
+                            b1.Property<Guid?>("LastDeliveredMessageId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<Guid?>("LastReadMessageId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<long>("LastReadSequenceId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Role")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<Guid>("UserId")
+                                .HasColumnType("uuid");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ChatId", "UserId")
+                                .IsUnique();
+
+                            b1.ToTable("ChatMembers", "chats");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ChatId");
+                        });
+
+                    b.Navigation("Members");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

backend/src/Modules/Conversations/Migrations/20260406122703_AddIsImportingToChat.cs

@@ -0,0 +1,32 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Knot.Modules.Conversations.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIsImportingToChat : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsImporting",
+                schema: "chats",
+                table: "Chats",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsImporting",
+                schema: "chats",
+                table: "Chats");
+        }
+    }
+}

backend/src/Modules/Conversations/Migrations/20260406123444_AddImportJobIdToChat.Designer.cs

@@ -0,0 +1,169 @@
+// <auto-generated />
+using System;
+using Knot.Modules.Conversations.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Knot.Modules.Conversations.Migrations
+{
+    [DbContext(typeof(ChatsDbContext))]
+    [Migration("20260406123444_AddImportJobIdToChat")]
+    partial class AddImportJobIdToChat
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("chats")
+                .HasAnnotation("ProductVersion", "10.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Avatar")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ImportJobId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsImporting")
+                        .HasColumnType("boolean");
+
+                    b.Property<long>("LastMessageSequenceId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Chats", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Folder", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Icon")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Folders", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.UserChatSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ChatId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("FolderIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsMuted")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ChatId")
+                        .IsUnique();
+
+                    b.ToTable("UserChatSettings", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
+                {
+                    b.OwnsMany("Knot.Contracts.Conversations.Domain.ChatMember", "Members", b1 =>
+                        {
+                            b1.Property<Guid>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("uuid");
+
+                            b1.Property<Guid>("ChatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("IsMuted")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPinned")
+                                .HasColumnType("boolean");
+
+                            b1.Property<DateTime>("JoinedAt")
+                                .HasColumnType("timestamp with time zone");
+
+                            b1.Property<Guid?>("LastDeliveredMessageId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<Guid?>("LastReadMessageId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<long>("LastReadSequenceId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Role")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<Guid>("UserId")
+                                .HasColumnType("uuid");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ChatId", "UserId")
+                                .IsUnique();
+
+                            b1.ToTable("ChatMembers", "chats");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ChatId");
+                        });
+
+                    b.Navigation("Members");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

backend/src/Modules/Conversations/Migrations/20260406123444_AddImportJobIdToChat.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Knot.Modules.Conversations.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddImportJobIdToChat : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ImportJobId",
+                schema: "chats",
+                table: "Chats",
+                type: "uuid",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ImportJobId",
+                schema: "chats",
+                table: "Chats");
+        }
+    }
+}

backend/src/Modules/Conversations/Migrations/ChatsDbContextModelSnapshot.cs

@@ -23,7 +23,7 @@ namespace Knot.Modules.Conversations.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("Knot.Modules.Conversations.Domain.Chat", b =>
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -38,6 +38,12 @@ namespace Knot.Modules.Conversations.Migrations
                     b.Property<string>("Description")
                         .HasColumnType("text");
 
+                    b.Property<Guid?>("ImportJobId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsImporting")
+                        .HasColumnType("boolean");
+
                     b.Property<long>("LastMessageSequenceId")
                         .HasColumnType("bigint");
 
@@ -53,9 +59,61 @@ namespace Knot.Modules.Conversations.Migrations
                     b.ToTable("Chats", "chats");
                 });
 
-            modelBuilder.Entity("Knot.Modules.Conversations.Domain.Chat", b =>
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Folder", b =>
                 {
-                    b.OwnsMany("Knot.Modules.Conversations.Domain.ChatMember", "Members", b1 =>
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Icon")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Folders", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.UserChatSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ChatId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("FolderIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsMuted")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ChatId")
+                        .IsUnique();
+
+                    b.ToTable("UserChatSettings", "chats");
+                });
+
+            modelBuilder.Entity("Knot.Contracts.Conversations.Domain.Chat", b =>
+                {
+                    b.OwnsMany("Knot.Contracts.Conversations.Domain.ChatMember", "Members", b1 =>
                         {
                             b1.Property<Guid>("Id")
                                 .ValueGeneratedOnAdd()

backend/src/Modules/Conversations/Presentation/Endpoints/ChatsEndpoints.cs

@@ -9,7 +9,7 @@ using Knot.Modules.Conversations.Application.Chats.Members;
 using Knot.Modules.Conversations.Application.Chats.TogglePin;
 using Knot.Modules.Conversations.Application.Chats.Update;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 using Microsoft.AspNetCore.Builder;

backend/src/Modules/Conversations/Presentation/Endpoints/MessagesEndpoints.cs

@@ -19,9 +19,17 @@ public static class MessagesEndpoints
     {
         var group = app.MapGroup("api/messages").RequireAuthorization();
 
-        group.MapGet("chat/{chatId:guid}", async ([FromRoute] Guid chatId, [FromQuery] string? cursor, ISender sender, IUserContext userContext, CancellationToken ct) =>
+        group.MapGet("chat/{chatId:guid}", async (
+            [FromRoute] Guid chatId,
+            [FromQuery] string? cursor,
+            [FromQuery] long? afterSequenceId,
+            [FromQuery] long? pivot,
+            [FromQuery] int? limit,
+            ISender sender,
+            IUserContext userContext,
+            CancellationToken ct) =>
         {
-            var result = await sender.Send(new GetMessagesQuery(userContext.UserId, chatId, cursor), ct);
+            var result = await sender.Send(new GetMessagesQuery(userContext.UserId, chatId, cursor, pivot, afterSequenceId, limit), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error.Description);
         });
 

backend/src/Modules/Messaging/Domain/Message.cs

@@ -42,6 +42,10 @@ public abstract class Message : AggregateRoot<Guid>
     protected List<DeletedMessage> _deletedFor = new();
     public IReadOnlyCollection<DeletedMessage> DeletedFor => _deletedFor.AsReadOnly();
 
+    // ================== Прочитано ==================
+    protected List<Guid> _readByUsers = new();
+    public IReadOnlyCollection<Guid> ReadByUsers => _readByUsers.AsReadOnly();
+
     // ================== Инфраструктурный конструктор EF ==================
     protected Message() : base(Guid.Empty) { }
 
@@ -89,6 +93,16 @@ public abstract class Message : AggregateRoot<Guid>
             _deletedFor.Add(new DeletedMessage(Id, userId));
         }
     }
+
+    public void MarkAsRead(Guid userId)
+    {
+        if (!_readByUsers.Contains(userId))
+        {
+            _readByUsers.Add(userId);
+        }
+    }
+
+    public bool IsReadBy(Guid userId) => _readByUsers.Contains(userId);
 }
 
 

backend/src/Modules/Messaging/Infrastructure/Handlers/MessageSentDomainEventHandler.cs

@@ -84,10 +84,17 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                 size = m.Size
             }).ToList() ?? (object)Array.Empty<object>(),
             sender = senderObj,
-            readBy = new List<object>(),
+            readBy = message.ReadByUsers.Select(id => new { id }).ToList(),
             storyId = (message as StoryMessage)?.StoryId,
             storyMediaUrl = (message as StoryMessage)?.StoryMediaUrl,
-            storyMediaType = (message as StoryMessage)?.StoryMediaType
+            storyMediaType = (message as StoryMessage)?.StoryMediaType,
+            callType = (message as CallMessage)?.CallType,
+            callStatus = (message as CallMessage)?.CallStatus,
+            duration = (message as CallMessage)?.Duration,
+            pollOptions = (message as PollMessage)?.Options.Select(o => new { id = o.Id, text = o.Text, voteCount = o.VoteCount }).ToList(),
+            pollIsMultipleChoice = (message as PollMessage)?.IsMultipleChoice,
+            pollIsClosed = (message as PollMessage)?.IsClosed,
+            pollIsAnonymous = (message as PollMessage)?.IsAnonymous
         }, cancellationToken);
     }
 }

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,22 +62,83 @@ 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>> GetPinnedMessagesAsync(Guid chatId, CancellationToken cancellationToken)
+    {
+        var builder = Builders<Message>.Filter;
+        var filter = builder.And(
+            builder.Eq(m => m.ChatId, chatId),
+            builder.BitsAnySet(m => m.State, (long)MessageState.IsPinned)
+        );
+
+        return await _messages.Find(filter)
+            .SortByDescending(m => m.CreatedAt)
+            .ToListAsync(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);
     }
 
+    public async Task<List<Message>> GetChatMessagesAfterAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken)
+    {
+        var builder = Builders<Message>.Filter;
+        var filter = builder.And(
+            builder.Eq(m => m.ChatId, chatId),
+            builder.Gt(m => m.SequenceId, sequenceId)
+        );
+
+        return await _messages.Find(filter)
+            .SortBy(m => m.SequenceId)
+            .Limit(limit)
+            .ToListAsync(cancellationToken);
+    }
+
+    public async Task<List<Message>> GetChatMessagesAroundAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken)
+    {
+        var builder = Builders<Message>.Filter;
+
+        // Target message
+        var targetFilter = builder.And(builder.Eq(m => m.ChatId, chatId), builder.Eq(m => m.SequenceId, sequenceId));
+        var targetMsg = await _messages.Find(targetFilter).FirstOrDefaultAsync(cancellationToken);
+
+        // Older messages
+        var olderFilter = builder.And(builder.Eq(m => m.ChatId, chatId), builder.Lt(m => m.SequenceId, sequenceId));
+        var older = await _messages.Find(olderFilter)
+            .SortByDescending(m => m.SequenceId)
+            .Limit(limit / 2)
+            .ToListAsync(cancellationToken);
+
+        // Newer messages
+        var newerFilter = builder.And(builder.Eq(m => m.ChatId, chatId), builder.Gt(m => m.SequenceId, sequenceId));
+        var newer = await _messages.Find(newerFilter)
+            .SortBy(m => m.SequenceId)
+            .Limit(limit / 2)
+            .ToListAsync(cancellationToken);
+
+        var result = new List<Message>();
+        result.AddRange(older);
+        if (targetMsg != null) result.Add(targetMsg);
+        result.AddRange(newer);
+
+        return result.OrderBy(m => m.SequenceId).ToList();
+    }
+
     public async Task<List<Message>> SearchMessagesAsync(string query, Guid? chatId, Guid requestingUserId, CancellationToken cancellationToken)
     {
         // Not ideal for SQL/Mongo combination but keeping the signature

backend/src/Modules/Messaging/Infrastructure/Persistence/Mongo/MongoDbMapConfigurator.cs

@@ -71,6 +71,13 @@ public static class MongoDbMapConfigurator
             cm.SetDiscriminator("PollMessage");
         });
 
+        BsonClassMap.RegisterClassMap<CallMessage>(cm =>
+        {
+            cm.AutoMap();
+            cm.SetIgnoreExtraElements(true);
+            cm.SetDiscriminator("CallMessage");
+        });
+
         BsonClassMap.RegisterClassMap<PollOption>(cm => cm.AutoMap());
         BsonClassMap.RegisterClassMap<PollVote>(cm => cm.AutoMap());
 

backend/src/Modules/TelegramImport/Application/Abstractions/ITelegramHtmlParser.cs

@@ -10,4 +10,5 @@ public interface ITelegramHtmlParser
 {
     Task<List<TelegramMessage>> ParseMessagesAsync(Stream htmlStream, string baseDirInZip, CancellationToken ct = default);
     Task<List<string>> ExtractAllUserNamesAsync(Stream htmlStream, CancellationToken ct = default);
+    Task<string?> ExtractGroupNameAsync(Stream htmlStream, CancellationToken ct = default);
 }

backend/src/Modules/TelegramImport/Application/TelegramImport/AnalyzeImportCommand.cs

@@ -10,6 +10,7 @@ using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using Knot.Contracts.Settings.Application.Abstractions;
 using Knot.Contracts.Settings.Application.DTOs;
+using Knot.Modules.TelegramImport.Application.Abstractions;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -25,18 +26,23 @@ public record ImportConflictDto(string Type, string Message, bool Blocked);
 public record AnalyzeImportResponseDto(
     Guid Token,
     List<string> Names,
-    List<ImportConflictDto> Conflicts);
+    List<ImportConflictDto> Conflicts,
+    int TotalMessages,
+    string? GroupName);
 
 public record AnalyzeImportCommand(Stream FileStream, string FileName) : ICommand<AnalyzeImportResponseDto>;
 
 internal sealed class AnalyzeImportCommandHandler : ICommandHandler<AnalyzeImportCommand, AnalyzeImportResponseDto>
 {
     private readonly ISettingsService _settingsService;
+    private readonly ITelegramHtmlParser _htmlParser;
 
-    public AnalyzeImportCommandHandler(ISettingsService settingsService)
+    public AnalyzeImportCommandHandler(ISettingsService settingsService, ITelegramHtmlParser htmlParser)
     {
         _settingsService = settingsService;
+        _htmlParser = htmlParser;
     }
+
     public async Task<Result<AnalyzeImportResponseDto>> Handle(AnalyzeImportCommand request, CancellationToken cancellationToken)
     {
         if (request.FileStream == null || request.FileStream.Length == 0)
@@ -52,50 +58,53 @@ internal sealed class AnalyzeImportCommandHandler : ICommandHandler<AnalyzeImpor
         var token = Guid.NewGuid();
         var tempPath = Path.Combine(Path.GetTempPath(), $"{token}.zip");
 
+        try
+        {
             await using (var fs = new FileStream(tempPath, FileMode.Create))
             {
                 await request.FileStream.CopyToAsync(fs, cancellationToken);
             }
 
             var names = new HashSet<string>();
+            int totalMessages = 0;
+            string? groupName = null;
 
             using (var archive = ZipFile.OpenRead(tempPath))
             {
                 var htmlEntries = archive.Entries
-                .Where(e => e.FullName.EndsWith(".html", StringComparison.OrdinalIgnoreCase) && e.Name.StartsWith("messages", StringComparison.OrdinalIgnoreCase));
+                    .Where(e => e.FullName.EndsWith(".html", StringComparison.OrdinalIgnoreCase) && 
+                               (e.Name.StartsWith("messages", StringComparison.OrdinalIgnoreCase) || e.Name == "export_results.html"))
+                    .OrderBy(e => e.FullName.Length)
+                    .ThenBy(e => e.FullName)
+                    .ToList();
 
                 foreach (var entry in htmlEntries)
                 {
                     using var stream = entry.Open();
-                var parser = new HtmlParser();
-                var doc = parser.ParseDocument(stream);
                     
-                var messageNodes = doc.QuerySelectorAll(".message");
-                if (messageNodes == null)
+                    if (string.IsNullOrEmpty(groupName))
                     {
-                    continue;
+                        groupName = await _htmlParser.ExtractGroupNameAsync(stream, cancellationToken);
+                        // Reset stream position if possible? No, entry.Open() returns a new stream.
+                        // But wait! ExtractGroupNameAsync consumess the stream!
+                        // I'll reopen it for messages if it's the same entry.
                     }
 
-                foreach (var node in messageNodes)
+                    using var stream2 = entry.Open(); 
+                    var messages = await _htmlParser.ParseMessagesAsync(stream2, "", cancellationToken);
+                    totalMessages += messages.Count;
+
+                    foreach (var m in messages)
                     {
-                    var fromNameNode = node.QuerySelector(".from_name");
-                    if (fromNameNode != null)
-                    {
-                        var nameNodeText = (IElement)fromNameNode.Clone();
-                        var innerSpans = nameNodeText.QuerySelectorAll("span");
-                        foreach (var span in innerSpans)
-                        {
-                            span.Remove();
+                        if (!string.IsNullOrEmpty(m.SenderName))
+                            names.Add(m.SenderName);
+                    }
+                }
             }
 
-                        var name = nameNodeText.TextContent.Trim();
-                        if (!string.IsNullOrWhiteSpace(name))
+            if (names.Count == 0 && totalMessages == 0)
             {
-                            names.Add(name);
-                        }
-                    }
-                }
-            }
+                return Result.Failure<AnalyzeImportResponseDto>(new Error("TelegramImport.NoMessagesFound", "В архиве не найдено сообщений Telegram или формат HTML не распознан."));
             }
 
             // Анализ конфликтов политик
@@ -113,7 +122,13 @@ internal sealed class AnalyzeImportCommandHandler : ICommandHandler<AnalyzeImpor
 
             TelegramImportState.TempZips[token] = tempPath;
 
-        return Result.Success(new AnalyzeImportResponseDto(token, names.ToList(), conflicts));
+            return Result.Success(new AnalyzeImportResponseDto(token, names.OrderBy(x => x).ToList(), conflicts, totalMessages, groupName));
+        }
+        catch (Exception ex)
+        {
+            if (File.Exists(tempPath)) File.Delete(tempPath);
+            return Result.Failure<AnalyzeImportResponseDto>(new Error("TelegramImport.ProcessError", $"Ошибка при обработке архива: {ex.Message}"));
+        }
     }
 }
 

backend/src/Modules/TelegramImport/Application/TelegramImport/DTOs/ExecuteImportRequest.cs

@@ -6,7 +6,8 @@ namespace Knot.Modules.TelegramImport.Application.TelegramImport.DTOs;
 public record ExecuteImportRequest(
     Guid Token,
     Dictionary<string, Guid> Mapping,
-    string? GroupName
+    string? GroupName,
+    int TotalMessages = 0
 );