e# speciallyse enter a commit message to explain why this merge is

necessary,
if it merges an updated upstream into a topic branch.

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

@@ -4,7 +4,6 @@ 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,7 +7,5 @@ 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,12 +19,4 @@ 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/Messaging/Application/Abstractions/IMessageRepository.cs

@@ -13,7 +13,6 @@ public interface IMessageRepository
 
     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/Message.cs

@@ -19,16 +19,13 @@ public abstract class Message : AggregateRoot<Guid>
 
     public bool IsEdited => HasState(MessageState.IsEdited);
     public bool IsDeleted => HasState(MessageState.IsDeleted);
-
+    
     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)
+    protected Message(Guid id, Guid chatId, Guid senderId, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported) 
         : base(id)
     {
         ChatId = chatId;
@@ -45,25 +42,15 @@ public abstract class Message : AggregateRoot<Guid>
     public bool IsDeletedForUser(Guid userId) => _deletedFor.Exists(d => d.UserId == userId);
 
     public virtual void Delete() => AddState(MessageState.IsDeleted);
-    public virtual void Edit(string newContent)
-    {
-        Content = newContent;
-        AddState(MessageState.IsEdited);
+    public virtual void Edit(string newContent) 
+    { 
+        Content = newContent; 
+        AddState(MessageState.IsEdited); 
     }
 
-    public void DeleteForUser(Guid userId)
-    {
-        if (!_deletedFor.Exists(x => x.UserId == userId))
-            _deletedFor.Add(new DeletedMessage(Id, userId));
+    public void DeleteForUser(Guid userId) 
+    { 
+        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/Host/appsettings.json

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

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

@@ -5,8 +5,5 @@ 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,6 +1,4 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Contracts.Auth.Application.Auth.DTOs;
 using Knot.Shared.Kernel;
 
@@ -11,12 +9,10 @@ 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, IJwtTokenProvider tokenProvider)
+    public GetMeQueryHandler(IUserRepository userRepository)
     {
         _userRepository = userRepository;
-        _tokenProvider = tokenProvider;
     }
 
     public async Task<Result<AuthResponseDto>> Handle(GetMeQuery request, CancellationToken cancellationToken)
@@ -27,18 +23,9 @@ 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 = newAccessToken,
+            AccessToken = string.Empty,
             RefreshToken = string.Empty,
             UserId = user.Id,
             Username = user.Username,

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

@@ -5,6 +5,9 @@ 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>
@@ -28,21 +31,14 @@ 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 = refreshToken,
+            RefreshToken = string.Empty,
             UserId = user.Id,
             Username = user.Username,
             DisplayName = user.DisplayName
         });
     }
 }
-

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

@@ -1,7 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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,4 +1,5 @@
 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;
@@ -8,6 +9,9 @@ using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Auth.Application.Users.Register;
 
+/// <summary>
+/// ������� ��� ����������� ������ ������������.
+/// </summary>
 public sealed record RegisterUserCommand(
     string Username,
     string Password,
@@ -15,6 +19,9 @@ public sealed record RegisterUserCommand(
     string? Email,
     string? Bio) : ICommand<AuthResponseDto>;
 
+/// <summary>
+/// ���������� ������� �����������.
+/// </summary>
 internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserCommand, AuthResponseDto>
 {
     private readonly IUserRepository _userRepository;
@@ -41,13 +48,16 @@ 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,
@@ -55,33 +65,21 @@ internal sealed class RegisterUserCommandHandler : ICommandHandler<RegisterUserC
             request.Email,
             request.Bio);
 
-        var repoImpl = _userRepository as Infrastructure.Persistence.UserRepository;
-        repoImpl?.Add(user);
+        // 4. ���������� - ���������� ����� � Domain User
+        var repoWithDomainUserAdd = _userRepository as Infrastructure.Persistence.UserRepository;
+        repoWithDomainUserAdd?.Add(user);
 
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
-        // 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);
+        string token = _tokenProvider.Generate(user.Id, user.Username, user.DisplayName, user.Avatar);
 
         return Result.Success(new AuthResponseDto
         {
             AccessToken = token,
-            RefreshToken = refreshToken,
-            UserId = userContract.Id,
-            Username = userContract.Username,
-            DisplayName = userContract.DisplayName
+            RefreshToken = string.Empty,
+            UserId = user.Id,
+            Username = user.Username,
+            DisplayName = user.DisplayName
         });
     }
 }
-

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

@@ -26,7 +26,6 @@ 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() {
@@ -49,10 +48,9 @@ public sealed class User : AggregateRoot<Guid>
         PhoneNumber = phoneNumber;
     }
 
-    public void SetRefreshToken(string? refreshToken, DateTime? expiry = null)
+    public void SetRefreshToken(string? refreshToken)
     {
         RefreshToken = refreshToken;
-        RefreshTokenExpiry = expiry;
     }
 
     public void SetBannedUntil(DateTime? bannedUntil)
@@ -81,8 +79,6 @@ 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)
@@ -185,9 +181,7 @@ public sealed class User : AggregateRoot<Guid>
             IsOnline = IsOnline,
             IsExternal = IsExternal,
             Domain = _domain,
-            LastSeen = LastSeen,
-            RefreshToken = RefreshToken,
-            RefreshTokenExpiry = RefreshTokenExpiry
+            LastSeen = LastSeen
         };
     }
 }

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

@@ -50,12 +50,6 @@ 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/20270419220000_AddRefreshTokenExpiry.Designer.cs

@@ -1,100 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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/Presentation/Endpoints/AuthEndpoints.cs

@@ -1,13 +1,12 @@
-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 Knot.Modules.Auth.Application.Users.Login;
+using Knot.Modules.Auth.Application.Users.Register;
+using Knot.Modules.Auth.Application.Users.GetMe;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Knot.Modules.Auth.Presentation.Endpoints;
 
@@ -29,12 +28,6 @@ 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/Chats/LeaveOrDelete/LeaveOrDeleteChat.cs

@@ -1,15 +1,13 @@
 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.Shared.Kernel.Storage;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using MediatR;
-using Microsoft.AspNetCore.SignalR;
+using System.Linq;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Shared.Kernel.Storage;
 
 namespace Knot.Modules.Conversations.Application.Chats.LeaveOrDelete;
 
@@ -21,21 +19,17 @@ internal sealed class LeaveOrDeleteChatCommandHandler : ICommandHandler<LeaveOrD
     private readonly IMessageRepository _messageRepository;
     private readonly IFileStorageService _fileStorage;
     private readonly IChatsUnitOfWork _uow;
-    private readonly IHubContext<ChatHub> _hubContext;
 
     public LeaveOrDeleteChatCommandHandler(
-        IChatRepository chatRepository,
-
+        IChatRepository chatRepository, 
         IMessageRepository messageRepository,
         IFileStorageService fileStorage,
-        IChatsUnitOfWork uow,
-        IHubContext<ChatHub> hubContext)
+        IChatsUnitOfWork uow)
     {
         _chatRepository = chatRepository;
         _messageRepository = messageRepository;
         _fileStorage = fileStorage;
         _uow = uow;
-        _hubContext = hubContext;
     }
 
     public async Task<Result<SuccessResponse>> Handle(LeaveOrDeleteChatCommand request, CancellationToken cancellationToken)
@@ -64,14 +58,6 @@ internal sealed class LeaveOrDeleteChatCommandHandler : ICommandHandler<LeaveOrD
             // 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);
@@ -81,8 +67,7 @@ internal sealed class LeaveOrDeleteChatCommandHandler : ICommandHandler<LeaveOrD
 
     private async Task DeleteChatMediaAndMessagesAsync(Guid chatId, CancellationToken ct)
     {
-        try
-
+        try 
         {
             // Get all messages directly from Mongo (not paged)
             var messages = await _messageRepository.GetChatMessagesAsync(chatId, int.MaxValue, 0, ct);

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

@@ -32,8 +32,7 @@ public record MessageDetailDto(
     bool? PollIsMultipleChoice = null,
     bool? PollIsAnonymous = null,
     bool? PollIsClosed = null,
-    List<Guid>? UserVotedOptionIds = null,
-    bool IsDeletedForUser = false
+    List<Guid>? UserVotedOptionIds = null
 );
 
 public record ReplyToMessageDto(

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

@@ -42,16 +42,10 @@ 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
             {
@@ -61,13 +55,24 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
             await _messageRepository.UpdateAsync(message, cancellationToken);
         }
 
-        // Notify all clients in the chat about the deletion
-        await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("messages_deleted", new
+        if (request.DeleteForAll)
         {
-            chatId = request.ChatId,
-            messageIds = request.MessageIds,
-            deleteForAll = request.DeleteForAll
-        });
+            await _hubContext.Clients.Group(request.ChatId.ToString()).SendAsync("messages_deleted", new
+            {
+                chatId = request.ChatId,
+                messageIds = request.MessageIds,
+                deleteForAll = true
+            });
+        }
+        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/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.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.GetMessages;
 
-public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, long? AfterSequenceId = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
+public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
 
 internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery, List<MessageDetailDto>>
 {
@@ -41,12 +41,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
         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)
+        if (request.Pivot.HasValue)
         {
             messages = await _messageRepository.GetChatMessagesAroundAsync(request.ChatId, request.Pivot.Value, queryLimit, cancellationToken);
         }
@@ -119,8 +114,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
 
             senders.TryGetValue(message.SenderId, out var sender);
             reactionsByMessage.TryGetValue(message.Id, out var reactions);
-
-
+            
             Message? replyMsg = null;
             if (message.ReplyToId.HasValue)
             {
@@ -147,7 +141,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                     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 is TextMessage tm ? tm.Quote : null,
                 message.IsEdited,
                 message.IsDeleted,
                 message.CreatedAt,
@@ -159,23 +153,20 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                 (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 =>
-                {
+                new List<ReadByDto>(), // ReadBy not implemented in this detailed view yet
+                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 =>
-                {
+                (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 =>
-                             {
+                             .Select(v => {
                                  senders.TryGetValue(v.UserId, out var vu);
                                  return vu != null
                                      ? new MessageSenderDto(vu.Id, vu.Username, vu.DisplayName, vu.Avatar)
@@ -183,13 +174,12 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                              })
                              .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(),
+                     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)
+                 (message as PollMessage)?.Votes.Where(v => v.UserId == request.UserId).Select(v => v.OptionId).ToList()
              ));
         }
 

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

@@ -1,8 +1,7 @@
-using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Contracts.Conversations.Domain;
-using Knot.Contracts.Messaging.Application.Abstractions;
-using Knot.Shared.Kernel;
 using MediatR;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Shared.Kernel;
+using Knot.Contracts.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Application.Messages.Read;
 
@@ -12,13 +11,11 @@ public sealed class ReadMessagesCommandHandler : ICommandHandler<ReadMessagesCom
 {
     private readonly IChatRepository _chatRepository;
     private readonly IChatsUnitOfWork _unitOfWork;
-    private readonly IMessageRepository _messageRepository;
 
-    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork, IMessageRepository messageRepository)
+    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork)
     {
         _chatRepository = chatRepository;
         _unitOfWork = unitOfWork;
-        _messageRepository = messageRepository;
     }
 
     public async Task<Result> Handle(ReadMessagesCommand request, CancellationToken cancellationToken)
@@ -31,23 +28,6 @@ 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.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -41,8 +41,7 @@ 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;
@@ -67,7 +66,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>(),
-                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList()
+                new List<ReadByDto>()
             );
         }).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.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
@@ -192,7 +192,6 @@ 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/Infrastructure/SignalR/ChatHub.cs

@@ -1,26 +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.Caching.Memory;
 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.Contracts.Conversations.Domain;
+using Knot.Shared.Kernel;
+using Microsoft.Extensions.Caching.Memory;
+using Knot.Contracts.Auth.Domain;
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Modules.Conversations.Application.Messages.Pin;
+using Knot.Modules.Conversations.Application.Messages.Unpin;
+using Knot.Modules.Conversations.Application.Messages.Vote;
+using Knot.Modules.Conversations.Application.Messages.Edit;
+using Knot.Modules.Conversations.Application.DTOs;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -37,7 +37,7 @@ 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)
@@ -53,12 +53,12 @@ public sealed class ChatHub : Hub
     private readonly IUserDisplayNameProvider _userProvider;
 
     public ChatHub(
-        ISender sender,
-        IUserContext userContext,
-        IChatRepository chatRepository,
-        IUserRepository userRepository,
+        ISender sender, 
+        IUserContext userContext, 
+        IChatRepository chatRepository, 
+        IUserRepository userRepository, 
         IMessageRepository messageRepository,
-        ILogger<ChatHub> logger,
+        ILogger<ChatHub> logger, 
         IMemoryCache cache,
         IUserDisplayNameProvider userProvider)
     {
@@ -158,7 +158,6 @@ public sealed class ChatHub : Hub
             await _sender.Send(command);
         }
 
-        // Отправляем событие всем в чате о том, что пользователь прочитал сообщения
         await Clients.Group(request.ChatId.ToString()).SendAsync("messages_read", new
         {
             ChatId = request.ChatId.ToString(),
@@ -262,7 +261,7 @@ public sealed class ChatHub : Hub
         {
             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,
@@ -277,7 +276,7 @@ public sealed class ChatHub : Hub
     {
         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,
@@ -329,7 +328,7 @@ public sealed class ChatHub : Hub
     public async Task FriendAccepted(FriendSignalRequest request)
     {
         if (request == null || string.IsNullOrEmpty(request.FriendId)) return;
-
+        
         _logger.LogInformation("Signaling friend_request_accepted to {FriendId} from {UserId}", request.FriendId, _userContext.UserId);
         await SendToUserAsync(request.FriendId, "friend_request_accepted", new { userId = _userContext.UserId });
     }
@@ -351,8 +350,8 @@ public sealed class ChatHub : Hub
     {
         if (string.IsNullOrEmpty(targetUserId))
         {
-            _logger.LogWarning("SendToUserAsync called with null or empty targetUserId");
-            return;
+             _logger.LogWarning("SendToUserAsync called with null or empty targetUserId");
+             return;
         }
 
         if (_userConnections.TryGetValue(targetUserId, out var connectionIds))
@@ -399,15 +398,15 @@ public sealed class ChatHub : Hub
         // 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 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);
@@ -462,10 +461,10 @@ public sealed class ChatHub : Hub
             _activeSessionsByUser.TryRemove(request.TargetUserId, out _);
             if (session.ChatId.HasValue)
             {
-                int duration = session.IsAnswered && session.AnswerTime.HasValue
-                    ? (int)(DateTime.UtcNow - session.AnswerTime.Value).TotalSeconds
+                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);
             }
@@ -574,7 +573,7 @@ public sealed class ChatHub : Hub
 
         var userInfo = new ParticipantInfo(userId, username, displayName, avatar);
 
-        var participants = _groupCallParticipants.GetOrAdd(chatId, _ =>
+        var participants = _groupCallParticipants.GetOrAdd(chatId, _ => 
         {
             _activeGroupCalls[chatId] = (DateTime.UtcNow, request.CallType);
             return new ConcurrentDictionary<string, ParticipantInfo>();

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

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

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

@@ -18,7 +18,7 @@ public abstract class Message : AggregateRoot<Guid>
     public Guid SenderId { get; protected set; }
     public DateTime CreatedAt { get; protected set; }
     public long SequenceId { get; protected set; }
-
+    
     public void SetSequenceId(long sequenceId)
     {
         SequenceId = sequenceId;
@@ -26,10 +26,10 @@ public abstract class Message : AggregateRoot<Guid>
     // ================== Опциональные метаданные (общего назначения) ==================
     public Guid? ReplyToId { get; protected set; }
     public Guid? ForwardedFromId { get; protected set; }
-
+    
     // ================== Флаги ==================
     public MessageState State { get; protected set; }
-
+    
     // ================== Абстрактные / Виртуальные свойства ==================
     public abstract string Type { get; }
     public abstract string? Content { get; protected set; }
@@ -42,20 +42,16 @@ 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) { }
 
     protected Message(
-        Guid id,
-        Guid chatId,
-        Guid senderId,
-        Guid? replyToId,
-        Guid? forwardedFromId,
-        DateTime createdAt,
+        Guid id, 
+        Guid chatId, 
+        Guid senderId, 
+        Guid? replyToId, 
+        Guid? forwardedFromId, 
+        DateTime createdAt, 
         bool isImported) : base(id)
     {
         ChatId = chatId;
@@ -63,7 +59,7 @@ public abstract class Message : AggregateRoot<Guid>
         ReplyToId = replyToId;
         ForwardedFromId = forwardedFromId;
         CreatedAt = createdAt;
-
+        
         if (isImported) AddState(MessageState.IsImported);
     }
 
@@ -93,16 +89,6 @@ 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,7 +84,7 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                 size = m.Size
             }).ToList() ?? (object)Array.Empty<object>(),
             sender = senderObj,
-            readBy = message.ReadByUsers.Select(id => new { id }).ToList(),
+            readBy = new List<object>(),
             storyId = (message as StoryMessage)?.StoryId,
             storyMediaUrl = (message as StoryMessage)?.StoryMediaUrl,
             storyMediaType = (message as StoryMessage)?.StoryMediaType,

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

@@ -95,28 +95,14 @@ public sealed class MessageRepository : IMessageRepository
             .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)

client-web/src/core/domain/types.ts

@@ -6,7 +6,7 @@ export interface UserBasic {
   displayName: string;
   avatarUrl: string | null;
   // Fallbacks for compatibility
-  username?: string;
+  username?: string; 
   avatar?: string | null;
 }
 
@@ -51,11 +51,11 @@ export interface Reaction {
   id: string;
   emoji: string;
   userId: string;
-  user: {
-    id: string;
-    username: string;
+  user: { 
+    id: string; 
+    username: string; 
     userName?: string;
-    displayName: string;
+    displayName: string; 
     avatar?: string | null;
     avatarUrl?: string | null;
   };
@@ -84,7 +84,6 @@ export interface Message {
   storyMediaType?: string | null;
   isEdited: boolean;
   isDeleted: boolean;
-  isDeletedForUser?: boolean;
   scheduledAt?: string | null;
   createdAt: string;
   updatedAt?: string;
@@ -96,9 +95,9 @@ export interface Message {
     isDeleted?: boolean;
     quote?: string | null;
     media?: MediaItem[];
-    sender: {
-      id: string;
-      username: string;
+    sender: { 
+      id: string; 
+      username: string; 
       userName?: string;
       displayName: string;
       avatar?: string | null;

client-web/src/core/infrastructure/httpClient.ts

@@ -3,74 +3,11 @@ const API_BASE = '/api';
 
 export class HttpClient {
   private token: string | null = null;
-  private isRefreshing = false;
-  private refreshSubscribers: Array<(token: string) => void> = [];
 
   setToken(token: string | null) {
     this.token = token;
   }
 
-  private subscribeTokenRefresh(cb: (token: string) => void) {
-    this.refreshSubscribers.push(cb);
-  }
-
-  private onRefreshed(token: string) {
-    this.refreshSubscribers.forEach(cb => cb(token));
-    this.refreshSubscribers = [];
-  }
-
-  private async handle401(): Promise<string | null> {
-    if (this.isRefreshing) {
-      return new Promise(resolve => {
-        this.subscribeTokenRefresh(token => {
-          resolve(token);
-        });
-      });
-    }
-
-    const refreshToken = localStorage.getItem('knot_refresh_token');
-    if (!refreshToken) {
-      return null;
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      const response = await fetch(`${API_BASE}/auth/refresh`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ refreshToken }),
-      });
-
-      if (!response.ok) {
-        localStorage.removeItem('knot_token');
-        localStorage.removeItem('knot_refresh_token');
-        this.token = null;
-        return null;
-      }
-
-      const data = await response.json();
-      const newToken = data.accessToken;
-      const newRefreshToken = data.refreshToken;
-
-      localStorage.setItem('knot_token', newToken);
-      if (newRefreshToken) {
-        localStorage.setItem('knot_refresh_token', newRefreshToken);
-      }
-
-      this.token = newToken;
-      this.onRefreshed(newToken);
-      return newToken;
-    } catch (err) {
-      localStorage.removeItem('knot_token');
-      localStorage.removeItem('knot_refresh_token');
-      this.token = null;
-      return null;
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
   async request<T>(endpoint: string, options: RequestInit & { timeout?: number } = {}): Promise<T> {
     const { timeout = 30_000, ...fetchOptions } = options;
     const controller = new AbortController();
@@ -104,36 +41,6 @@ export class HttpClient {
     }
     clearTimeout(timer);
 
-    // Handle 401 Unauthorized
-    if (response.status === 401 && endpoint !== '/auth/refresh') {
-      const newToken = await this.handle401();
-      if (newToken) {
-        // Retry the original request with new token
-        const retryHeaders: Record<string, string> = {
-          ...computedHeaders,
-          Authorization: `Bearer ${newToken}`,
-        };
-
-        const retryController = new AbortController();
-        const retryTimer = timeout > 0 ? setTimeout(() => retryController.abort(), timeout) : undefined;
-
-        try {
-          response = await fetch(`${API_BASE}${endpoint}`, {
-            ...fetchOptions,
-            headers: retryHeaders,
-            signal: retryController.signal,
-          });
-        } catch (err) {
-          clearTimeout(retryTimer);
-          if (err instanceof DOMException && err.name === 'AbortError') {
-            throw new Error('Время ожидания запроса истекло');
-          }
-          throw err;
-        }
-        clearTimeout(retryTimer);
-      }
-    }
-
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));
       const errorMessage = errorData.error || errorData.message || `Request failed with status ${response.status}`;

client-web/src/core/infrastructure/i18n.ts

@@ -194,8 +194,7 @@ const translations = {
     clearChatConfirm: 'Очистить историю чата для себя? Собеседник сохранит свою историю.',
     clearHistory: 'Очистить историю',
     clearHistoryConfirm: 'Очистить историю?',
-    deleteChatConfirm: 'Удалить чат? Это действие нельзя отменить. Чат будет удалён у всех участников.',
-    deleteGroupChatConfirm: 'Удалить чат? Это действие нельзя отменить. Чат будет удалён у всех участников.',
+    deleteChatConfirm: 'Удалить чат? Это действие нельзя отменить.',
     pinChat: 'Закрепить чат',
     unpinChat: 'Открепить чат',
     chatCleared: 'Очищено',
@@ -575,8 +574,7 @@ const translations = {
     clearChatConfirm: 'Clear chat history for yourself? The other person will keep their history.',
     clearHistory: 'Clear history',
     clearHistoryConfirm: 'Clear history?',
-    deleteChatConfirm: 'Delete this chat? This action cannot be undone. The chat will be removed for all participants.',
-    deleteGroupChatConfirm: 'Delete this chat? This action cannot be undone. The chat will be removed for all participants.',
+    deleteChatConfirm: 'Delete this chat? This action cannot be undone.',
     pinChat: 'Pin chat',
     unpinChat: 'Unpin chat',
     chatCleared: 'Chat cleared',

client-web/src/core/utils/normalize.ts

@@ -25,6 +25,14 @@ export function normalizeUser(user: any): any {
     result.avatar = result.avatarUrl;
   }
 
+  // 3. Приведение bio (Settings -> bio, Profiles -> about)
+  if (!result.bio && result.about) {
+    result.bio = result.about;
+  }
+  if (!result.about && result.bio) {
+    result.about = result.bio;
+  }
+
   return result;
 }
 

client-web/src/modules/auth/application/authStore.ts

@@ -5,7 +5,6 @@ import type { User } from '../../../core/domain/types';
 
 interface AuthState {
   token: string | null;
-  refreshToken: string | null;
   user: User | null;
   isLoading: boolean;
   error: string | null;
@@ -24,9 +23,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
     if (t) AuthApi.setToken(t);
     return t;
   })(),
-  refreshToken: (() => {
-    return localStorage.getItem('knot_refresh_token');
-  })(),
   user: null,
   isLoading: true,
   error: null,
@@ -37,20 +33,17 @@ export const useAuthStore = create<AuthState>((set, get) => ({
     try {
       const res = await AuthApi.getConfig();
       set({ config: res });
-    } catch { }
+    } catch {}
   },
 
   login: async (username, password) => {
     try {
       set({ error: null, isLoading: true });
-      const { token, refreshToken, user } = await AuthApi.login(username, password);
+      const { token, user } = await AuthApi.login(username, password);
       localStorage.setItem('knot_token', token);
-      if (refreshToken) {
-        localStorage.setItem('knot_refresh_token', refreshToken);
-      }
       AuthApi.setToken(token);
       connectSocket(token);
-      set({ token, refreshToken, user, isLoading: false });
+      set({ token, user, isLoading: false });
       await get().fetchConfig();
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -62,14 +55,11 @@ export const useAuthStore = create<AuthState>((set, get) => ({
   register: async (username, displayName, password, bio) => {
     try {
       set({ error: null, isLoading: true });
-      const { token, refreshToken, user } = await AuthApi.register(username, displayName, password, bio);
+      const { token, user } = await AuthApi.register(username, displayName, password, bio);
       localStorage.setItem('knot_token', token);
-      if (refreshToken) {
-        localStorage.setItem('knot_refresh_token', refreshToken);
-      }
       AuthApi.setToken(token);
       connectSocket(token);
-      set({ token, refreshToken, user, isLoading: false });
+      set({ token, user, isLoading: false });
       await get().fetchConfig();
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -80,10 +70,9 @@ export const useAuthStore = create<AuthState>((set, get) => ({
 
   logout: () => {
     localStorage.removeItem('knot_token');
-    localStorage.removeItem('knot_refresh_token');
     AuthApi.setToken(null);
     disconnectSocket();
-    set({ token: null, refreshToken: null, user: null });
+    set({ token: null, user: null });
   },
 
   checkAuth: async () => {
@@ -132,12 +121,11 @@ export const useAuthStore = create<AuthState>((set, get) => ({
       errorMsg.includes('Недействительный токен') ||
       errorMsg.includes('Требуется авторизация')
     ) {
-      localStorage.removeItem('knot_token');
-      localStorage.removeItem('knot_refresh_token');
-      set({ token: null, refreshToken: null, user: null, isLoading: false });
+        localStorage.removeItem('knot_token');
+        set({ token: null, user: null, isLoading: false });
     } else {
-      // Keep the token but stop loading if we're just offline/network error/500
-      set({ isLoading: false });
+        // Keep the token but stop loading if we're just offline/network error/500
+        set({ isLoading: false });
     }
   },
 

client-web/src/modules/auth/infrastructure/authApi.ts

@@ -3,68 +3,51 @@ import type { User } from '../../../core/domain/types';
 
 export class AuthApi {
   static async login(username: string, password: string) {
-    const response = await httpClient.request<{ accessToken: string; refreshToken: string; userId: string; username: string; displayName: string }>('/auth/login', {
+    const response = await httpClient.request<any>('/auth/login', {
       method: 'POST',
       body: JSON.stringify({ username, password }),
     });
 
     return {
       token: response.accessToken,
-      refreshToken: response.refreshToken,
       user: {
-        id: response.userId,
-        username: response.username,
+        ...response,
+        id: response.userId || (response as any).id,
+        username: response.username || (response as any).userName,
         displayName: response.displayName,
-        avatar: null
-      } as User
+        avatar: response.avatar || null
+      } as unknown as User
     };
   }
 
   static async register(username: string, displayName: string, password: string, bio?: string) {
-    const response = await httpClient.request<{ accessToken: string; refreshToken: string; userId: string; username: string; displayName: string }>('/auth/register', {
+    const response = await httpClient.request<any>('/auth/register', {
       method: 'POST',
       body: JSON.stringify({ username, displayName, password, bio }),
     });
 
     return {
       token: response.accessToken,
-      refreshToken: response.refreshToken,
       user: {
-        id: response.userId,
-        username: response.username,
+        ...response,
+        id: response.userId || (response as any).id,
+        username: response.username || (response as any).userName,
         displayName: response.displayName,
-        avatar: null
-      } as User
-    };
-  }
-
-  static async refresh(refreshToken: string) {
-    const response = await httpClient.request<{ accessToken: string; refreshToken: string; userId: string; username: string; displayName: string }>('/auth/refresh', {
-      method: 'POST',
-      body: JSON.stringify({ refreshToken }),
-    });
-
-    return {
-      token: response.accessToken,
-      refreshToken: response.refreshToken,
-      user: {
-        id: response.userId,
-        username: response.username,
-        displayName: response.displayName,
-        avatar: null
-      } as User
+        avatar: response.avatar || null
+      } as unknown as User
     };
   }
 
   static async getMe() {
-    const response = await httpClient.request<{ userId: string; username: string; displayName: string; avatar: string | null; accessToken?: string }>('/auth/me');
+    const response = await httpClient.request<any>('/auth/me');
     return {
       user: {
-        id: response.userId,
-        username: response.username,
+        ...response,
+        id: response.userId || response.id,
+        username: response.username || response.userName,
         displayName: response.displayName,
-        avatar: response.avatar
-      } as User,
+        avatar: response.avatar || response.avatarUrl
+      } as unknown as User,
       token: response.accessToken
     };
   }

client-web/src/modules/chats/application/chatStore.ts

@@ -125,9 +125,9 @@ export const useChatStore = create<ChatState>((set, get) => ({
       set({ isLoadingMessages: true });
       const currentMessages = state.messages[chatId] || [];
       const cursor = !reset && currentMessages.length > 0 ? currentMessages[0].sequenceId.toString() : undefined;
-
+      
       const fetched = await ChatApi.getMessages(chatId, cursor);
-
+      
       set((state) => {
         // Merge fetched messages with any that arrived via socket
         const existing = reset ? [] : (state.messages[chatId] || []);
@@ -401,7 +401,6 @@ export const useChatStore = create<ChatState>((set, get) => ({
         if (m.sequenceId <= lastReadSequenceId) {
           const alreadyRead = m.readBy?.some((r) => r.userId === userId);
           if (alreadyRead) return m;
-          // Увеличиваем счётчик только если текущий пользователь читает чужие сообщения
           if (userId === currentUserId && m.senderId !== currentUserId) newlyReadCount++;
           return { ...m, readBy: [...(m.readBy || []), { userId }] };
         }
@@ -413,7 +412,6 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const updatedChats = state.chats.map((chat) => {
         if (chat.id === chatId) {
           const updatedLastMessages = chat.messages?.map(updateMsg);
-          // Уменьшаем unreadCount только если текущий пользователь прочитал сообщения
           if (userId === currentUserId) {
             return { ...chat, messages: updatedLastMessages, unreadCount: Math.max(0, (chat.unreadCount || 0) - newlyReadCount) };
           }
@@ -477,16 +475,16 @@ export const useChatStore = create<ChatState>((set, get) => ({
   addChat: (chat) => {
     set((state) => {
       const existing = state.chats.find((c) => c.id === chat.id);
-
+      
       const messagesFromState = state.messages[chat.id] || [];
       const messagesToUse = messagesFromState.length > 0 ? messagesFromState : (chat.messages || []);
-
+      
       let unreadCount = chat.unreadCount || 0;
       if (!existing && messagesFromState.length > 0) {
         const userId = useAuthStore.getState().user?.id;
         unreadCount = messagesFromState.filter((m) => m.senderId !== userId && !m.readBy?.some(r => r.userId === userId)).length;
       }
-
+      
       const updatedChat = { ...chat, messages: messagesToUse.length > 0 ? [messagesToUse[messagesToUse.length - 1]] : [], unreadCount };
 
       if (existing) {
@@ -526,9 +524,9 @@ export const useChatStore = create<ChatState>((set, get) => ({
       const existing = state.pinnedMessages[chatId] || [];
       if (existing.some(m => m.id === message.id)) return state;
       return {
-        pinnedMessages: {
-          ...state.pinnedMessages,
-          [chatId]: [...existing, message]
+        pinnedMessages: { 
+          ...state.pinnedMessages, 
+          [chatId]: [...existing, message] 
         },
       };
     });
@@ -552,7 +550,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     try {
       set({ isLoadingMessages: true });
       const fetched = await ChatApi.getMessages(chatId, undefined, sequenceId, 50);
-
+      
       set((state) => ({
         messages: { ...state.messages, [chatId]: fetched },
         // Since we jumped, we assume there is more history to load above

client-web/src/modules/chats/presentation/ChatPage.tsx

@@ -58,15 +58,13 @@ export default function ChatPage() {
   const [groupCallSessionId, setGroupCallSessionId] = useState(0);
 
   const [incomingGroupCall, setIncomingGroupCall] = useState<{ chatId: string; from: string; callerInfo: any; callType: string; chatName: string } | null>(null);
-
+  
   const groupCallOpenRef = useRef(false);
   const groupCallChatIdRef = useRef('');
 
   const [activeTab, setActiveTab] = useState('chats');
   const { t } = useLang();
 
-  const activeChat = useChatStore((state) => state.activeChat);
-
   useEffect(() => {
     groupCallOpenRef.current = groupCallOpen;
     groupCallChatIdRef.current = groupCallChatId;
@@ -182,12 +180,7 @@ export default function ChatPage() {
     });
 
     socket.on('messages_read', (data: any) => {
-      const chatId = data.chatId || data.ChatId;
-      const userId = data.userId || data.UserId;
-      const lastReadSequenceId = data.lastReadSequenceId || data.LastReadSequenceId || 0;
-
-      // Обновляем стейт - добавляем userId в readBy для всех сообщений до lastReadSequenceId
-      markRead(chatId, userId, lastReadSequenceId);
+      markRead(data.chatId || data.ChatId, data.userId || data.UserId, data.lastReadSequenceId || data.LastReadSequenceId || 0);
     });
 
     socket.on('user_typing', (data: { chatId: string; userId: string }) => {
@@ -288,7 +281,7 @@ export default function ChatPage() {
         callType: data.callType,
         chatName: chat.name || 'Group',
       });
-
+      
       // Auto-dismiss after 15 seconds if ignored
       setTimeout(() => {
         setIncomingGroupCall(prev => {
@@ -337,16 +330,6 @@ export default function ChatPage() {
     };
   }, [user?.id]);
 
-  // Join chat group when activeChat changes
-  useEffect(() => {
-    if (activeChat) {
-      const socket = getSocket();
-      if (socket) {
-        socket.emit('join_chat', activeChat);
-      }
-    }
-  }, [activeChat]);
-
   const handleStartCall = (targetUser: UserBasic, type: 'voice' | 'video') => {
     setCallTarget(targetUser);
     setCallType(type);
@@ -383,6 +366,8 @@ export default function ChatPage() {
     setGroupCallOpen(false);
   };
 
+  const activeChat = useChatStore((state) => state.activeChat);
+
   return (
     <motion.div
       initial={{ opacity: 0 }}
@@ -398,14 +383,14 @@ export default function ChatPage() {
         {activeTab === 'chats' ? (
           <>
             {/* Chat List (Sidebar) */}
-            <div
+            <div 
               className={`${activeChat ? 'hidden lg:block' : 'block'} w-full lg:w-[360px] flex-shrink-0 bg-surface-container-low h-full overflow-hidden`}
             >
               <Sidebar />
             </div>
 
             {/* Selected Chat View (Main Area) */}
-            <div
+            <div 
               className={`${activeChat ? 'block' : 'hidden lg:block'} flex-1 h-full min-w-0 bg-surface-container-lowest relative group slide-on-ice`}
             >
               <ChatView onStartCall={handleStartCall} onStartGroupCall={handleStartGroupCall} />
@@ -413,31 +398,31 @@ export default function ChatPage() {
           </>
         ) : activeTab === 'contacts' ? (
           <div className="flex-1 flex flex-row h-full overflow-hidden">
-            {/* Contacts Sidebar List */}
-            <div className="w-full lg:w-[360px] flex-shrink-0 bg-surface-container-low h-full overflow-hidden antialiased">
-              <ContactsSidebar onSwitchToChat={() => setActiveTab('chats')} />
-            </div>
+             {/* Contacts Sidebar List */}
+             <div className="w-full lg:w-[360px] flex-shrink-0 bg-surface-container-low h-full overflow-hidden antialiased">
+                <ContactsSidebar onSwitchToChat={() => setActiveTab('chats')} />
+             </div>
 
-            {/* Right side placeholder / Profile detail */}
-            <div className="hidden lg:flex flex-1 items-center justify-center bg-surface-base h-full relative slide-on-ice">
-              <div className="flex flex-col items-center gap-6 max-w-sm text-center">
-                <div className="w-24 h-24 rounded-3xl bg-primary/10 flex items-center justify-center text-primary shadow-inner">
-                  <Users size={48} className="knot-logo-spin opacity-50" />
+             {/* Right side placeholder / Profile detail */}
+              <div className="hidden lg:flex flex-1 items-center justify-center bg-surface-base h-full relative slide-on-ice">
+                <div className="flex flex-col items-center gap-6 max-w-sm text-center">
+                    <div className="w-24 h-24 rounded-3xl bg-primary/10 flex items-center justify-center text-primary shadow-inner">
+                        <Users size={48} className="knot-logo-spin opacity-50" />
+                    </div>
+                    <div>
+                        <h2 className="text-xl font-bold text-white mb-2">{t('contacts')}</h2>
+                        <p className="text-sm text-zinc-500 leading-relaxed max-w-[280px]">
+                            {t('selectContactToChat')}
+                        </p>
+                    </div>
+                    <button 
+                        onClick={() => setActiveTab('chats')}
+                        className="px-8 py-3 rounded-2xl bg-primary text-on-primary shadow-lg shadow-primary/20 hover:scale-105 active:scale-95 transition-all text-sm font-bold tracking-tight"
+                    >
+                        {t('backToChats')}
+                    </button>
                 </div>
-                <div>
-                  <h2 className="text-xl font-bold text-white mb-2">{t('contacts')}</h2>
-                  <p className="text-sm text-zinc-500 leading-relaxed max-w-[280px]">
-                    {t('selectContactToChat')}
-                  </p>
-                </div>
-                <button
-                  onClick={() => setActiveTab('chats')}
-                  className="px-8 py-3 rounded-2xl bg-primary text-on-primary shadow-lg shadow-primary/20 hover:scale-105 active:scale-95 transition-all text-sm font-bold tracking-tight"
-                >
-                  {t('backToChats')}
-                </button>
-              </div>
-            </div>
+             </div>
           </div>
         ) : activeTab === 'settings' ? (
           <SettingsPage />
@@ -447,7 +432,7 @@ export default function ChatPage() {
           </div>
         )}
       </main>
-
+      
 
       <CallModal
         key={callSessionId}
@@ -500,9 +485,9 @@ export default function ChatPage() {
             >
               <div className="relative mb-6">
                 <div className="absolute inset-0 rounded-[1.5rem] bg-emerald-500/20 animate-call-wave" />
-                <Avatar
-                  src={incomingGroupCall.callerInfo?.avatar ? getMediaUrl(incomingGroupCall.callerInfo.avatar) : null}
-                  name={incomingGroupCall.chatName || '?'}
+                <Avatar 
+                  src={incomingGroupCall.callerInfo?.avatar ? getMediaUrl(incomingGroupCall.callerInfo.avatar) : null} 
+                  name={incomingGroupCall.chatName || '?'} 
                   size="2xl"
                   className="relative shadow-2xl"
                 />
@@ -514,9 +499,9 @@ export default function ChatPage() {
                 {incomingGroupCall.callerInfo?.displayName || incomingGroupCall.callerInfo?.username || 'User'} {t('isCalling' as any) || 'звонит...'}
               </p>
               <p className="text-zinc-400 text-sm mb-8 bg-white/5 px-3 py-1 rounded-full border border-white/5">
-                {t('groupCall' as any) || 'Групповой звонок'}
+                {t('groupCall' as any) || 'Групповой звонок'} 
               </p>
-
+              
               <div className="flex items-center gap-8 w-full justify-center">
                 <button
                   onClick={() => {

client-web/src/modules/chats/presentation/components/ChatListItem.tsx

@@ -63,14 +63,14 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
             : lastMessage.media?.[0]?.type === 'video'
               ? t('video')
               : t('file')
-          : lastMessage.type === 'call'
-            ? `${lastMessage.callType === 'video' ? '🎬' : '📞'} ${t(
+        : lastMessage.type === 'call'
+          ? `${lastMessage.callType === 'video' ? '🎬' : '📞'} ${t(
               lastMessage.callStatus === 'missed' ? 'missedCall' :
-                lastMessage.callStatus === 'declined' ? 'declinedCall' :
-                  lastMessage.callStatus === 'cancelled' ? 'cancelledCall' :
-                    'completedCall'
+              lastMessage.callStatus === 'declined' ? 'declinedCall' :
+              lastMessage.callStatus === 'cancelled' ? 'cancelledCall' :
+              'completedCall'
             )}`
-            : lastMessage.content || ''
+          : lastMessage.content || ''
     : '';
 
   const previewText = chat.isImporting ? 'Импорт...' : stripMarkdown(lastMessageText);
@@ -78,9 +78,7 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
   const isMine = !chat.isImporting && lastMessage?.senderId === user?.id;
 
   // Галочки прочтения
-  // Для своих сообщений: проверено, есть ли в readBy другие пользователи (получатели)
-  // Для чужих сообщений: не показываем галочки
-  const isRead = !chat.isImporting && isMine && lastMessage?.readBy?.some((r) => r.userId !== user?.id);
+  const isRead = !chat.isImporting && lastMessage?.readBy?.some((r) => r.userId !== user?.id);
 
   const timeStr = !chat.isImporting && lastMessage
     ? formatDistanceToNow(new Date(lastMessage.createdAt), { addSuffix: false, locale: lang === 'ru' ? ru : enUS })
@@ -91,25 +89,25 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
 
   useEffect(() => {
     if (!chat.isImporting || !chat.importJobId) {
-      setImportStatus(null);
-      return;
+        setImportStatus(null);
+        return;
     }
 
     const poll = async () => {
-      try {
-        const data = await httpClient.request<any>(`/import/telegram/status/${chat.importJobId}`);
-        setImportStatus({ processed: data.processedMessages, total: data.totalMessages });
-        if (data.status === 'Completed' || data.status === 'Failed') {
-          loadChats();
+        try {
+            const data = await httpClient.request<any>(`/import/telegram/status/${chat.importJobId}`);
+            setImportStatus({ processed: data.processedMessages, total: data.totalMessages });
+            if (data.status === 'Completed' || data.status === 'Failed') {
+                loadChats();
+            }
+        } catch (e: any) {
+            if (e.status === 404) {
+                // Job might have expired or backend restarted
+                console.warn('Import job not found');
+            } else {
+                console.error('Failed to poll status', e);
+            }
         }
-      } catch (e: any) {
-        if (e.status === 404) {
-          // Job might have expired or backend restarted
-          console.warn('Import job not found');
-        } else {
-          console.error('Failed to poll status', e);
-        }
-      }
     };
 
     poll();
@@ -119,9 +117,9 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
 
   const handleClick = () => {
     if (chat.isImporting) {
-      // Here we could show a progress modal, but for now just select it
-      setActiveChat(chat.id);
-      return;
+        // Here we could show a progress modal, but for now just select it
+        setActiveChat(chat.id);
+        return;
     }
     if ((window as any).hasUnsavedAttachments && !isActive) {
       setShowAttachmentConfirm(true);
@@ -133,7 +131,7 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
   const proceedWithClick = () => {
     setShowAttachmentConfirm(false);
     (window as any).hasUnsavedAttachments = false;
-
+    
     if (isActive) {
       window.dispatchEvent(new CustomEvent('CHAT_SCROLL_TO_BOTTOM', { detail: { chatId: chat.id } }));
     } else {
@@ -190,8 +188,9 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
       <button
         onClick={handleClick}
         onContextMenu={handleContextMenu}
-        className={`w-full flex items-center gap-4 px-4 py-3.5 transition-all duration-300 slide-on-ice text-left rounded-2xl mx-1 my-0.5 w-[calc(100%-8px)] ${isActive ? 'bg-primary/10' : 'hover:bg-surface-container-highest/20'
-          }`}
+        className={`w-full flex items-center gap-4 px-4 py-3.5 transition-all duration-300 slide-on-ice text-left rounded-2xl mx-1 my-0.5 w-[calc(100%-8px)] ${
+          isActive ? 'bg-primary/10' : 'hover:bg-surface-container-highest/20'
+        }`}
       >
         {/* Аватар */}
         <div className="relative flex-shrink-0">
@@ -201,7 +200,7 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
             </div>
           ) : (
             <div className="avatar-knot-container group-hover:scale-105 transition-transform">
-              <Avatar src={chatAvatar || undefined} name={chatName || '??'} size="lg" online={isOnline ? true : false} />
+               <Avatar src={chatAvatar || undefined} name={chatName || '??'} size="lg" online={isOnline ? true : false} />
             </div>
           )}
         </div>
@@ -226,20 +225,20 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
               )}
               <div className="flex flex-col gap-1 w-full min-w-0">
                 <p className={`text-[13px] truncate leading-tight ${isTyping ? 'text-tertiary font-bold' : draft ? 'text-error font-medium' : 'text-on-surface-variant/60'}`}>
-                  {isTyping ? t('typing') : draft ? <><span className="font-bold">{t('draft')} </span>{stripMarkdown(draft)}</> : previewText}
-                  {chat.isImporting && importStatus && importStatus.total > 0 && (
-                    <span className="ml-1.5 text-[11px] font-black text-primary/70 tabular-nums">
-                      {importStatus.processed} / {importStatus.total}
-                    </span>
-                  )}
+                    {isTyping ? t('typing') : draft ? <><span className="font-bold">{t('draft')} </span>{stripMarkdown(draft)}</> : previewText}
+                    {chat.isImporting && importStatus && importStatus.total > 0 && (
+                        <span className="ml-1.5 text-[11px] font-black text-primary/70 tabular-nums">
+                            {importStatus.processed} / {importStatus.total}
+                        </span>
+                    )}
                 </p>
                 {chat.isImporting && importStatus && importStatus.total > 0 && (
-                  <div className="w-full h-1 bg-surface-container-highest rounded-full overflow-hidden mt-0.5">
-                    <div
-                      className="h-full bg-primary transition-all duration-500 ease-out"
-                      style={{ width: `${Math.min(100, Math.round((importStatus.processed / importStatus.total) * 100))}%` }}
-                    />
-                  </div>
+                    <div className="w-full h-1 bg-surface-container-highest rounded-full overflow-hidden mt-0.5">
+                        <div 
+                            className="h-full bg-primary transition-all duration-500 ease-out" 
+                            style={{ width: `${Math.min(100, Math.round((importStatus.processed / importStatus.total) * 100))}%` }}
+                        />
+                    </div>
                 )}
               </div>
             </div>

client-web/src/modules/chats/presentation/components/ChatView.tsx

@@ -98,13 +98,13 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
     NotificationStore.useNotificationStore.getState().addNotification('info', (t as any)('searchingHistory') || 'Searching message in history...');
 
     const chatStore = useChatStore.getState();
-
+    
     if (sequenceId !== undefined) {
       await chatStore.jumpToMessage(activeChat, sequenceId);
       // Wait a bit for React to render
       setTimeout(() => {
         if (!tryScroll()) {
-          NotificationStore.useNotificationStore.getState().addNotification('warning', (t as any)('messageNotFound') || 'Message not found');
+           NotificationStore.useNotificationStore.getState().addNotification('warning', (t as any)('messageNotFound') || 'Message not found');
         }
       }, 300);
     } else {
@@ -137,25 +137,25 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
 
   useEffect(() => {
     if (!chat?.isImporting || !chat?.importJobId) {
-      setImportStatus(null);
-      return;
+        setImportStatus(null);
+        return;
     }
 
     const poll = async () => {
-      try {
-        const data = await httpClient.request<any>(`/import/telegram/status/${chat.importJobId}`);
-        setImportStatus({ processed: data.processedMessages, total: data.totalMessages, status: data.status });
-        if (data.status === 'Completed' || data.status === 'Failed') {
-          setImportStatus(null);
-          loadChats();
+        try {
+            const data = await httpClient.request<any>(`/import/telegram/status/${chat.importJobId}`);
+            setImportStatus({ processed: data.processedMessages, total: data.totalMessages, status: data.status });
+            if (data.status === 'Completed' || data.status === 'Failed') {
+                setImportStatus(null);
+                loadChats();
+            }
+        } catch (e: any) {
+            if (e.status === 404) {
+                console.warn('Import job not found');
+            } else {
+                console.error('Failed to poll status', e);
+            }
         }
-      } catch (e: any) {
-        if (e.status === 404) {
-          console.warn('Import job not found');
-        } else {
-          console.error('Failed to poll status', e);
-        }
-      }
     };
 
     poll();
@@ -187,31 +187,12 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
   // Refs and logic for tracking session's first unread message to show the divider exactly once per load
   const sessionUnreadRef = useRef<{ chatId: string, msgId: string | null }>({ chatId: '', msgId: null });
 
-  // Update sessionUnreadRef when chat changes OR when messages are marked as read
-  useEffect(() => {
-    if (!activeChat || isLoadingMessages) return;
-
-    // Reset on chat change
-    if (activeChat !== sessionUnreadRef.current.chatId) {
-      const firstUnreadMsg = chatMessages.find(
-        (m) => m.senderId !== user?.id && !m.readBy?.some((r) => r.userId === user?.id)
-      );
-      sessionUnreadRef.current = { chatId: activeChat, msgId: firstUnreadMsg ? firstUnreadMsg.id : null };
-    } else {
-      // Update if the first unread message was read (msgId no longer exists in unread list)
-      const firstUnreadMsg = chatMessages.find(
-        (m) => m.senderId !== user?.id && !m.readBy?.some((r) => r.userId === user?.id)
-      );
-      if (sessionUnreadRef.current.msgId && !firstUnreadMsg) {
-        // All messages are now read
-        sessionUnreadRef.current.msgId = null;
-      } else if (firstUnreadMsg && sessionUnreadRef.current.msgId !== firstUnreadMsg.id) {
-        // First unread changed (some messages were read)
-        sessionUnreadRef.current.msgId = firstUnreadMsg.id;
-      }
-    }
-  }, [activeChat, chatMessages, user?.id, isLoadingMessages]);
-
+  if (activeChat && activeChat !== sessionUnreadRef.current.chatId && !isLoadingMessages) {
+    const firstUnreadMsg = chatMessages.find(
+      (m) => m.senderId !== user?.id && !m.readBy?.some((r) => r.userId === user?.id)
+    );
+    sessionUnreadRef.current = { chatId: activeChat, msgId: firstUnreadMsg ? firstUnreadMsg.id : null };
+  }
   const firstUnreadId = activeChat === sessionUnreadRef.current.chatId ? sessionUnreadRef.current.msgId : null;
   const initialScrollChatId = useRef<string | null>(null);
 
@@ -289,19 +270,19 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
   const saveScrollPosition = useCallback((targetChatId?: string) => {
     const container = scrollContainerRef.current;
     const chatId = targetChatId || activeChat;
-
+    
     if (!container || !chatId || !scrollReady || isInitializingRef.current || isScrollingToBottomRef.current) return;
 
     // Проверка: сообщения в стейте должны быть от целевого чата
     if (chatMessages.length > 0 && chatMessages[0].chatId !== chatId) return;
-
+    
     const isAtBottomNow = container.scrollHeight - container.scrollTop - container.clientHeight < 40;
     isAtBottomRef.current = isAtBottomNow;
-
+    
     if (isAtBottomNow) {
-      localStorage.setItem(`chat_at_bottom_${chatId}`, 'true');
-      localStorage.removeItem(`chat_anchor_${chatId}`);
-      return;
+       localStorage.setItem(`chat_at_bottom_${chatId}`, 'true');
+       localStorage.removeItem(`chat_anchor_${chatId}`);
+       return;
     }
 
     const messageElements = container.querySelectorAll('[data-message-id]');
@@ -323,8 +304,8 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
     }
 
     if (anchor && anchor.id) {
-      localStorage.setItem(`chat_anchor_${chatId}`, JSON.stringify(anchor));
-      localStorage.removeItem(`chat_at_bottom_${chatId}`);
+       localStorage.setItem(`chat_anchor_${chatId}`, JSON.stringify(anchor));
+       localStorage.removeItem(`chat_at_bottom_${chatId}`);
     }
   }, [activeChat, scrollReady, chatMessages]);
 
@@ -332,7 +313,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
   const restoreScrollPosition = useCallback(() => {
     const container = scrollContainerRef.current;
     if (!container || !activeChat) return false;
-
+    
     if (chatMessages.length > 0 && chatMessages[0].chatId !== activeChat) return false;
     if (chatMessages.length === 0) return true;
 
@@ -349,16 +330,16 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
       try {
         const { id, offset } = JSON.parse(saved);
         let el = container.querySelector(`[data-message-id="${id}"]`) as HTMLElement;
-
+        
         // Поиск ближайшего, если точное сообщение еще не загружено
         if (!el) {
-          const msgIndex = chatMessages.findIndex(m => m.id === id);
-          if (msgIndex !== -1) {
-            for (let i = msgIndex; i < chatMessages.length; i++) {
-              const nextEl = container.querySelector(`[data-message-id="${chatMessages[i].id}"]`) as HTMLElement;
-              if (nextEl) { el = nextEl; break; }
-            }
-          }
+           const msgIndex = chatMessages.findIndex(m => m.id === id);
+           if (msgIndex !== -1) {
+              for (let i = msgIndex; i < chatMessages.length; i++) {
+                 const nextEl = container.querySelector(`[data-message-id="${chatMessages[i].id}"]`) as HTMLElement;
+                 if (nextEl) { el = nextEl; break; }
+              }
+           }
         }
 
         if (el) {
@@ -387,7 +368,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
   useEffect(() => {
     if (isLoadingMessages || !scrollContainerRef.current || !activeChat) return;
     const container = scrollContainerRef.current;
-
+    
     const observer = new ResizeObserver(() => {
       if (isInitializingRef.current) return;
 
@@ -424,18 +405,18 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
 
       // Сохраняем позицию старого чата
       if (prevChatIdRef.current && scrollContainerRef.current && scrollReady) {
-        saveScrollPosition(prevChatIdRef.current);
+          saveScrollPosition(prevChatIdRef.current);
       }
-
+      
       setScrollReady(false);
       prevChatIdRef.current = activeChat;
-
+      
       if (scrollContainerRef.current) {
-        scrollContainerRef.current.scrollTop = 0;
+          scrollContainerRef.current.scrollTop = 0;
       }
 
       const timer = setTimeout(() => {
-        isInitializingRef.current = false;
+          isInitializingRef.current = false;
       }, 600);
 
       return () => clearTimeout(timer);
@@ -462,7 +443,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
 
       if (scrollTimeoutRef.current) clearTimeout(scrollTimeoutRef.current);
       scrollTimeoutRef.current = setTimeout(() => saveScrollPosition(), 150);
-
+      
       const st = container.scrollTop;
       const isScrollingUp = st < lastScrollTopRef.current;
       const stChanged = st !== lastScrollTopRef.current;
@@ -492,7 +473,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
 
       const containerRect = container.getBoundingClientRect();
       const messageElements = container.querySelectorAll('[data-message-id]');
-
+      
       let currentTopMsgId = null;
       for (const el of messageElements) {
         const rect = el.getBoundingClientRect();
@@ -525,15 +506,15 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
         // Принудительный сброс режима (Второй Клик)
         localStorage.setItem(`chat_at_bottom_${activeChat}`, 'true');
         localStorage.removeItem(`chat_anchor_${activeChat}`);
-
+        
         isScrollingToBottomRef.current = true;
         if (scrollContainerRef.current) {
-          scrollContainerRef.current.scrollTo({
-            top: scrollContainerRef.current.scrollHeight,
-            behavior: 'smooth'
-          });
+            scrollContainerRef.current.scrollTo({
+                top: scrollContainerRef.current.scrollHeight,
+                behavior: 'smooth'
+            });
         }
-
+        
         setTimeout(() => {
           isScrollingToBottomRef.current = false;
         }, 1000);
@@ -592,7 +573,6 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
       {
         root: scrollContainerRef.current,
         threshold: 0.1,
-        rootMargin: '0px',
       }
     );
 
@@ -604,26 +584,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
       unreadElements.forEach((el: Element) => {
         const id = el.getAttribute('data-message-id');
         if (id && !sentReadIdsRef.current.has(id)) {
-          // Check if element is already visible
-          const rect = el.getBoundingClientRect();
-          const containerRect = scrollContainerRef.current!.getBoundingClientRect();
-          const isVisible = rect.top >= containerRect.top && rect.bottom <= containerRect.bottom;
-
-          if (isVisible) {
-            // Mark as read immediately without waiting for intersection
-            const seqId = parseInt(el.getAttribute('data-sequence-id') || '0', 10);
-            if (seqId > 0) {
-              socket.emit('read_messages', {
-                chatId: activeChat,
-                lastReadMessageId: id,
-                lastReadSequenceId: seqId,
-              });
-              useChatStore.getState().markRead(activeChat, user.id, seqId);
-              sentReadIdsRef.current.add(id);
-            }
-          } else {
-            observer.observe(el);
-          }
+          observer.observe(el);
         }
       });
     };
@@ -685,7 +646,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
       <section className="flex-1 h-full flex flex-col items-center justify-center bg-[#010101] relative overflow-hidden">
         {/* Background Knot Texture */}
         <div className="absolute inset-0 opacity-[0.04] pointer-events-none flex items-center justify-center">
-          <span className="material-symbols-outlined text-white text-[500px] select-none">cloud_download</span>
+            <span className="material-symbols-outlined text-white text-[500px] select-none">cloud_download</span>
         </div>
 
         {/* Chat Empty State View */}
@@ -1191,16 +1152,16 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
             <div className="space-y-4">
               <div className="flex items-center justify-between mb-2 px-1">
                 <span className="text-xs font-black uppercase tracking-widest text-primary">
-                  {importStatus?.status === 'Processing' ? 'Обработка' :
-                    importStatus?.status === 'Queued' ? 'В очереди' : 'Загрузка'}
+                  {importStatus?.status === 'Processing' ? 'Обработка' : 
+                   importStatus?.status === 'Queued' ? 'В очереди' : 'Загрузка'}
                 </span>
                 <span className="text-xs font-black text-on-surface tabular-nums">
                   {importStatus?.processed || 0} / {importStatus?.total || 0}
                 </span>
               </div>
-
+              
               <div className="h-3 w-full bg-surface-container-highest rounded-full overflow-hidden border border-outline/10 p-0.5">
-                <motion.div
+                <motion.div 
                   initial={{ width: 0 }}
                   animate={{ width: `${Math.min(100, Math.round(((importStatus?.processed || 0) / (importStatus?.total || 1)) * 100))}%` }}
                   transition={{ type: 'spring', damping: 20 }}
@@ -1238,9 +1199,9 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
               {chatPinnedMessages.length > 1 && (
                 <div className="absolute left-1 top-1.5 bottom-1.5 w-0.5 rounded-full bg-white/5 flex flex-col gap-0.5 overflow-hidden">
                   {chatPinnedMessages.map((_, idx) => (
-                    <div
-                      key={idx}
-                      className={`flex-1 transition-colors duration-300 ${idx === pinnedIndex % chatPinnedMessages.length ? 'bg-primary' : 'bg-primary/20'}`}
+                    <div 
+                      key={idx} 
+                      className={`flex-1 transition-colors duration-300 ${idx === pinnedIndex % chatPinnedMessages.length ? 'bg-primary' : 'bg-primary/20'}`} 
                     />
                   ))}
                 </div>
@@ -1265,8 +1226,8 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
                     {t('pinnedMessage')} {chatPinnedMessages.length > 1 ? `#${(pinnedIndex % chatPinnedMessages.length) + 1}` : ''}
                   </p>
                   <p className="text-sm text-zinc-300 truncate font-medium">
-                    {chatPinnedMessages[pinnedIndex % chatPinnedMessages.length]?.content ||
-                      (chatPinnedMessages[pinnedIndex % chatPinnedMessages.length]?.media?.length > 0 ? t('media') : '...')}
+                    {chatPinnedMessages[pinnedIndex % chatPinnedMessages.length]?.content || 
+                     (chatPinnedMessages[pinnedIndex % chatPinnedMessages.length]?.media?.length > 0 ? t('media') : '...')}
                   </p>
                 </div>
               </button>

client-web/src/modules/chats/presentation/components/GroupSettings.tsx

@@ -76,9 +76,10 @@ export default function GroupSettings({ chat, onClose, onGoToMessage }: GroupSet
 
   const fileInputRef = useRef<HTMLInputElement>(null);
   const searchInputRef = useRef<HTMLInputElement>(null);
+  const getSearchedUserId = (u: UserPresence & { userId?: string }) => u.id || u.userId || '';
 
   // Keep local state in sync with chat prop
-  useEffect(() => {
+  useEffect(() => { 
     setGroupName(chat.name || '');
     setGroupDesc(chat.description || '');
   }, [chat.name, chat.description]);
@@ -95,7 +96,10 @@ export default function GroupSettings({ chat, onClose, onGoToMessage }: GroupSet
         const results = await UserApi.searchUsers(searchQuery);
         // Filter out users already in the group
         const memberIds = new Set(chat.members.map((m) => m.user.id));
-        setSearchResults(results.filter((u) => !memberIds.has(u.id)));
+        setSearchResults(results.filter((u) => {
+          const candidateId = getSearchedUserId(u as UserPresence & { userId?: string });
+          return !!candidateId && !memberIds.has(candidateId);
+        }));
       } catch (e) {
         console.error(e);
       } finally {
@@ -565,10 +569,13 @@ export default function GroupSettings({ chat, onClose, onGoToMessage }: GroupSet
                       <Loader2 size={16} className="text-zinc-500 animate-spin" />
                     </div>
                   )}
-                  {searchResults.map((u) => (
+                  {searchResults.map((u) => {
+                    const candidateId = getSearchedUserId(u as UserPresence & { userId?: string });
+                    if (!candidateId) return null;
+                    return (
                     <button
-                      key={u.id}
-                      onClick={() => handleAddMember(u.id)}
+                      key={candidateId}
+                      onClick={() => handleAddMember(candidateId)}
                       className="flex items-center gap-3 w-full px-3 py-2 rounded-xl hover:bg-surface-hover transition-colors"
                     >
                       <Avatar 
@@ -583,7 +590,8 @@ export default function GroupSettings({ chat, onClose, onGoToMessage }: GroupSet
                       </div>
                       <UserPlus size={14} className="text-knot-400 flex-shrink-0" />
                     </button>
-                  ))}
+                    );
+                  })}
                   {searchQuery.trim() && !isSearching && searchResults.length === 0 && (
                     <p className="text-xs text-zinc-500 text-center py-2">{t('usersNotFound')}</p>
                   )}

client-web/src/modules/chats/presentation/components/MessageBubble.tsx

@@ -25,13 +25,14 @@ import {
   PhoneIncoming,
   PhoneOutgoing,
   BarChart2,
+  Music,
 } from 'lucide-react';
 import { useAuthStore } from '../../../auth/application/authStore';
 import { useChatStore } from '../../application/chatStore';
 import { getSocket } from '../../../../core/infrastructure/socket';
 import { useLang } from '../../../../core/infrastructure/i18n';
 import { extractWaveform, getMediaUrl, generateAvatarColor, getInitials } from '../../../../core/utils/utils';
-import type { Message, MediaItem, Reaction, ChatMember } from '../../../../core/domain/types';
+import { AUDIO_EXTENSIONS, type Message, type MediaItem, type Reaction, type ChatMember } from '../../../../core/domain/types';
 import ImageLightbox from '../../../../core/presentation/components/ui/ImageLightbox';
 import LinkPreview from './LinkPreview';
 import Avatar from '../../../../core/presentation/components/ui/Avatar';
@@ -355,11 +356,13 @@ function MessageBubble({
     return false;
   };
 
+  const isAudioFile = (m: MediaItem) => m.type === 'audio' || AUDIO_EXTENSIONS.some(ext => m.filename?.toLowerCase().endsWith(ext));
+
   const hasImage = media.some((m) => m.type === 'image' || isMediaGif(m));
   const hasVoice = message.type === 'voice' || media.some((m) => m.type === 'voice');
-  const hasAudio = !hasVoice && (message.type === 'audio' || media.some((m) => m.type === 'audio'));
+  const hasAudio = !hasVoice && (message.type === 'audio' || media.some(isAudioFile));
   const hasVideo = media.some((m) => m.type === 'video' && !isMediaGif(m));
-  const hasFile = media.some((m) => m.type !== 'image' && m.type !== 'voice' && m.type !== 'video' && m.type !== 'audio' && !isMediaGif(m));
+  const hasFile = media.some((m) => m.type !== 'image' && m.type !== 'voice' && m.type !== 'video' && !isAudioFile(m) && !isMediaGif(m));
 
   const reactionGroups: Record<string, { count: number; users: string[]; isMine: boolean; avatars: { url?: string | null, initials: string, colorClass?: string }[] }> = {};
   (message.reactions || []).forEach((r) => {
@@ -610,7 +613,7 @@ function MessageBubble({
 
               return (
               <div className={`
-                ${needsFrame ? `-mx-[14px] ${message.forwardedFrom || message.replyTo || message.storyId ? 'mt-2' : '-mt-[8px]'} ${message.content ? 'mb-2' : hasReactions ? 'mb-1' : '-mb-[8px]'}` : ''}
+                ${needsFrame ? `-mx-[14px] ${message.forwardedFrom || message.replyTo || message.storyId ? 'mt-2' : '-mt-[8px]'} ${message.content || hasVoice || hasAudio || hasFile || message.type === 'poll' ? 'mb-3' : hasReactions ? 'mb-1' : '-mb-[8px]'}` : ''}
                 ${isSingleGif ? 'max-w-[260px]' : ''}
                 overflow-hidden relative rounded-[1.25rem]
               `}>
@@ -706,7 +709,7 @@ function MessageBubble({
 
             {/* Голосовое - Optimized Kinetic Layout */}
             {hasVoice && (
-              <div className="flex items-center gap-3 min-w-[200px] py-0.5">
+              <div className={`flex items-center gap-3 min-w-[200px] py-0.5 ${hasImage || hasVideo || message.forwardedFrom || message.replyTo || message.storyId ? 'mt-3' : ''}`}>
                 <audio
                   ref={audioRef}
                   src={media.find((m) => m.type === 'voice')?.url}
@@ -765,7 +768,7 @@ function MessageBubble({
 
             {/* Аудио (mp3 файлы) */}
             {hasAudio && (() => {
-              const audioMedia = media.find((m) => m.type === 'audio');
+              const audioMedia = media.find(isAudioFile);
               const formatSize = (bytes?: number | null) => {
                 if (!bytes) return "";
                 if (bytes < 1024) return bytes + " B";
@@ -775,7 +778,7 @@ function MessageBubble({
               };
               
               return (
-                <div className="min-w-[220px]">
+                <div className={`min-w-[220px] ${hasImage || hasVideo || hasVoice || message.forwardedFrom || message.replyTo || message.storyId ? 'mt-3' : ''}`}>
                   {audioMedia?.filename && (
                     <div className="flex items-center gap-2 mb-2 min-w-0">
                       <Volume2 size={14} className={isMine ? 'text-[#0a0a0a]/60' : 'text-zinc-400'} />
@@ -855,7 +858,7 @@ function MessageBubble({
             {/* Файлы */}
             {hasFile &&
               media
-                .filter((m) => m.type !== 'image' && m.type !== 'voice' && m.type !== 'video' && m.type !== 'audio' && m.type !== 'gif')
+                .filter((m) => m.type !== 'image' && m.type !== 'voice' && m.type !== 'video' && !isAudioFile(m) && m.type !== 'gif')
                 .map((m) => {
                   const formatSize = (bytes?: number | null) => {
                     if (!bytes) return "";
@@ -872,7 +875,7 @@ function MessageBubble({
                       target="_blank"
                       rel="noopener noreferrer"
                       className={`flex items-center gap-3 p-3 rounded-2xl ${isMine ? 'bg-[#0a0a0a]/5 hover:bg-[#0a0a0a]/10' : 'bg-zinc-900/50 hover:bg-zinc-800/80 border border-white/5'
-                        } transition-all mb-1 group/file`}
+                        } transition-all mb-1 group/file ${hasImage || hasVideo || hasVoice || hasAudio || message.forwardedFrom || message.replyTo || message.storyId ? 'mt-3' : ''}`}
                     >
                       <div className={`w-11 h-11 rounded-xl flex items-center justify-center ${isMine ? 'bg-[#0a0a0a]/10' : 'bg-primary/20'
                         } group-hover/file:scale-110 transition-transform`}>
@@ -1031,7 +1034,7 @@ function MessageBubble({
               const onlyEmojiRegex = /^[\p{Extended_Pictographic}\s]+$/u;
               const isOnlyEmojis = onlyEmojiRegex.test(message.content) && message.content.length <= 15;
               return (
-              <div className="flex items-end gap-2 text-sm w-full">
+              <div className={`flex items-end gap-2 text-sm w-full ${hasImage || hasVideo || hasVoice || hasAudio || hasFile || message.forwardedFrom || message.replyTo || message.storyId ? 'mt-3' : ''}`}>
                 <div className="flex-1 min-w-0 w-full">
                   <p className={`whitespace-pre-wrap break-words leading-relaxed w-full ${isOnlyEmojis ? 'text-5xl my-1' : ''} ${isMine ? 'text-[#0a0a0a] font-normal' : 'text-zinc-200'}`}>
                     {renderFormattedText(message.content)}

client-web/src/modules/users/infrastructure/userApi.ts

@@ -14,9 +14,13 @@ export class UserApi {
 
   static async updateProfile(data: { displayName?: string; bio?: string; birthday?: string | null }) {
     // Конечная точка в новом бэкенде: PUT /api/profiles/profile
+    const payload = {
+      ...data,
+      about: data.bio // Дублируем для совместимости
+    };
     return httpClient.request<User>('/profiles/profile', {
       method: 'PUT',
-      body: JSON.stringify(data),
+      body: JSON.stringify(payload),
     });
   }
 

client-web/src/modules/users/presentation/components/UserProfile.tsx

@@ -263,7 +263,7 @@ export default function UserProfile({ userId, onClose, onMessage, isSelf: isSelf
               {/* About Section */}
               <div className="p-8 rounded-[2.5rem] bg-white/[0.02] border border-white/5 mb-10 group relative transition-colors hover:bg-white/[0.04]">
                 <div className="flex items-center gap-3 mb-4 text-primary"><Info size={16} /><span className="text-xs font-black uppercase tracking-[0.2em]">{t('aboutMe')}</span></div>
-                <p className="text-base text-white/80 leading-relaxed font-medium">{user.about || t('noBio')}</p>
+                <p className="text-base text-white/80 leading-relaxed font-medium">{user.bio || t('noBio')}</p>
               </div>
 
               {/* Tabs Nav */}

docker/docker-compose.yml

@@ -1,7 +1,6 @@
 services:
   db:
     image: postgres:15-alpine
-    container_name: knot-db
     restart: always
     environment:
       - POSTGRES_USER
@@ -10,20 +9,19 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
-      - "5432:5432"
+      - "${DB_PORT:-5432}:5432"
 
   server:
     build:
       context: ../backend
       dockerfile: Dockerfile
-    container_name: knot-server
     restart: always
     depends_on:
       - db
       - minio
       - mongo
     ports:
-      - "5059:8080"
+      - "${SERVER_PORT:-5059}:8080"
     environment:
       - DATABASE_URL
       - MONGO_CONNECTION
@@ -41,23 +39,21 @@ services:
 
   minio:
     image: minio/minio
-    container_name: knot-minio
     restart: always
     environment:
       - MINIO_ROOT_USER
       - MINIO_ROOT_PASSWORD
     ports:
-      - "9000:9000"
-      - "9001:9001"
+      - "${MINIO_API_PORT:-9000}:9000"
+      - "${MINIO_CONSOLE_PORT:-9001}:9001"
     command: server /data --console-address ":9001"
     volumes:
       - minio_data:/data
   mongo:
     image: mongo:6-jammy
-    container_name: knot-mongo
     restart: always
     ports:
-      - "27017:27017"
+      - "${MONGO_PORT:-27017}:27017"
     volumes:
       - mongo_data:/data/db
 
@@ -65,10 +61,9 @@ services:
     build:
       context: ..
       dockerfile: client-web/Dockerfile
-    container_name: knot-web
     restart: always
     ports:
-      - "9090:80"
+      - "${WEB_PORT:-9090}:80"
     depends_on:
       - server