Правка уведомления

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

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

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

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

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

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

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

@@ -13,6 +13,7 @@ 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

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

backend/src/Host/appsettings.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

backend/src/Modules/Conversations/Application/Messages/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, int? Limit = null) : IQuery<List<MessageDetailDto>>;
+public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, long? AfterSequenceId = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
 
 internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery, List<MessageDetailDto>>
 {
@@ -41,7 +41,12 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
         List<Message> messages;
         int queryLimit = request.Limit ?? ChatConstants.DefaultMessageQueryLimit;
 
-        if (request.Pivot.HasValue)
+        if (request.AfterSequenceId.HasValue)
+        {
+            // Получаем только сообщения ПОСЛЕ указанного sequenceId (для синхронизации)
+            messages = await _messageRepository.GetChatMessagesAfterAsync(request.ChatId, request.AfterSequenceId.Value, queryLimit, cancellationToken);
+        }
+        else if (request.Pivot.HasValue)
         {
             messages = await _messageRepository.GetChatMessagesAroundAsync(request.ChatId, request.Pivot.Value, queryLimit, cancellationToken);
         }
@@ -115,6 +120,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)
             {
@@ -141,7 +147,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 is TextMessage tm ? tm.Quote : null,
+                (message as TextMessage)?.Quote,
                 message.IsEdited,
                 message.IsDeleted,
                 message.CreatedAt,
@@ -153,20 +159,23 @@ 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),
-                new List<ReadByDto>(), // ReadBy not implemented in this detailed view yet
-                reactions?.Select(r => {
+                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList(),
+                reactions?.Select(r =>
+                {
                     senders.TryGetValue(r.UserId, out var ru);
                     return new MessageReactionDto(r.Id, r.Emoji, r.UserId, ru != null ? new MessageSenderDto(ru.Id, ru.Username, ru.DisplayName, ru.Avatar) : null);
                 }).ToList() ?? new List<MessageReactionDto>(),
                 (message as CallMessage)?.CallType,
                 (message as CallMessage)?.CallStatus,
                 (message as CallMessage)?.Duration,
-                (message as PollMessage)?.Options.Select(o => {
+                (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)
@@ -179,7 +188,8 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                  (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 as PollMessage)?.Votes.Where(v => v.UserId == request.UserId).Select(v => v.OptionId).ToList(),
+                 message.IsDeletedForUser(request.UserId)
              ));
         }
 

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

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

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

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

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

@@ -1,8 +1,8 @@
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Settings.Application.Abstractions;
-using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
@@ -192,6 +192,7 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         var senderMember = chat.Members.First(m => m.UserId == request.SenderId);
         senderMember.UpdateReadCursor(message.Id, message.SequenceId);
         senderMember.UpdateDeliveredCursor(message.Id);
+        message.MarkAsRead(request.SenderId); // Отправитель всегда "прочитал" своё сообщение
 
         // 5. ���������
         _messageRepository.Add(message);

backend/src/Modules/Conversations/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.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;
+using Microsoft.Extensions.Logging;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -158,6 +158,7 @@ public sealed class ChatHub : Hub
             await _sender.Send(command);
         }
 
+        // Отправляем событие всем в чате о том, что пользователь прочитал сообщения
         await Clients.Group(request.ChatId.ToString()).SendAsync("messages_read", new
         {
             ChatId = request.ChatId.ToString(),

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

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

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

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

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

@@ -84,7 +84,7 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                 size = m.Size
             }).ToList() ?? (object)Array.Empty<object>(),
             sender = senderObj,
-            readBy = new List<object>(),
+            readBy = message.ReadByUsers.Select(id => new { id }).ToList(),
             storyId = (message as StoryMessage)?.StoryId,
             storyMediaUrl = (message as StoryMessage)?.StoryMediaUrl,
             storyMediaType = (message as StoryMessage)?.StoryMediaType,

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

@@ -95,6 +95,20 @@ 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;

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

@@ -84,6 +84,7 @@ export interface Message {
   storyMediaType?: string | null;
   isEdited: boolean;
   isDeleted: boolean;
+  isDeletedForUser?: boolean;
   scheduledAt?: string | null;
   createdAt: string;
   updatedAt?: string;

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

@@ -3,11 +3,74 @@ 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();
@@ -41,6 +104,36 @@ 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,7 +194,8 @@ const translations = {
     clearChatConfirm: 'Очистить историю чата для себя? Собеседник сохранит свою историю.',
     clearHistory: 'Очистить историю',
     clearHistoryConfirm: 'Очистить историю?',
-    deleteChatConfirm: 'Удалить чат? Это действие нельзя отменить.',
+    deleteChatConfirm: 'Удалить чат? Это действие нельзя отменить. Чат будет удалён у всех участников.',
+    deleteGroupChatConfirm: 'Удалить чат? Это действие нельзя отменить. Чат будет удалён у всех участников.',
     pinChat: 'Закрепить чат',
     unpinChat: 'Открепить чат',
     chatCleared: 'Очищено',
@@ -575,6 +576,7 @@ const translations = {
     clearHistory: 'Clear history',
     clearHistoryConfirm: 'Clear history?',
     deleteChatConfirm: 'Delete this chat? This action cannot be undone.',
+    deleteGroupChatConfirm: 'Delete this chat? This action cannot be undone. The chat will be removed for all participants.',
     pinChat: 'Pin chat',
     unpinChat: 'Unpin chat',
     chatCleared: 'Chat cleared',

client-web/src/core/presentation/layouts/GlobalNavBar.tsx

@@ -17,7 +17,7 @@ export default function GlobalNavBar({ activeTab, onTabChange }: GlobalNavBarPro
 
   return (
     <nav
-      className="lg:fixed lg:left-0 lg:top-0 lg:h-[100dvh] lg:w-20 w-full h-16 fixed bottom-0 left-0 bg-surface-container-low border-t lg:border-t-0 lg:border-r border-white/5 flex lg:flex-col flex-row items-center justify-around lg:justify-start lg:py-8 lg:gap-4 z-50 transition-all safe-area-bottom"
+      className="lg:fixed lg:left-0 lg:top-0 lg:h-[100dvh] lg:w-20 w-full h-16 fixed bottom-0 left-0 bg-surface-container-low border-t lg:border-t-0 lg:border-r border-white/5 flex lg:flex-col flex-row items-center justify-around lg:justify-start lg:pt-8 lg:pb-14 lg:gap-4 z-50 transition-all safe-area-bottom"
     >
       <div className="hidden lg:flex mb-10 flex-col items-center">
         <span className="text-2xl font-black text-primary tracking-tighter italic knot-logo-spin">Knot</span>
@@ -46,7 +46,7 @@ export default function GlobalNavBar({ activeTab, onTabChange }: GlobalNavBarPro
       </div>
 
       <div 
-        className="lg:mt-auto group cursor-pointer relative flex items-center justify-center px-4 lg:px-0"
+        className="lg:mt-auto lg:mb-4 group cursor-pointer relative flex items-center justify-center px-4 lg:px-0"
         onClick={() => onTabChange('settings')}
       >
         <div className="absolute -inset-1 bg-primary/20 rounded-2xl opacity-0 group-hover:opacity-100 blur transition-opacity" />

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

@@ -5,6 +5,7 @@ import type { User } from '../../../core/domain/types';
 
 interface AuthState {
   token: string | null;
+  refreshToken: string | null;
   user: User | null;
   isLoading: boolean;
   error: string | null;
@@ -23,6 +24,9 @@ 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,
@@ -39,11 +43,14 @@ export const useAuthStore = create<AuthState>((set, get) => ({
   login: async (username, password) => {
     try {
       set({ error: null, isLoading: true });
-      const { token, user } = await AuthApi.login(username, password);
+      const { token, refreshToken, 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, user, isLoading: false });
+      set({ token, refreshToken, user, isLoading: false });
       await get().fetchConfig();
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -55,11 +62,14 @@ export const useAuthStore = create<AuthState>((set, get) => ({
   register: async (username, displayName, password, bio) => {
     try {
       set({ error: null, isLoading: true });
-      const { token, user } = await AuthApi.register(username, displayName, password, bio);
+      const { token, refreshToken, 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, user, isLoading: false });
+      set({ token, refreshToken, user, isLoading: false });
       await get().fetchConfig();
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -70,9 +80,10 @@ export const useAuthStore = create<AuthState>((set, get) => ({
 
   logout: () => {
     localStorage.removeItem('knot_token');
+    localStorage.removeItem('knot_refresh_token');
     AuthApi.setToken(null);
     disconnectSocket();
-    set({ token: null, user: null });
+    set({ token: null, refreshToken: null, user: null });
   },
 
   checkAuth: async () => {
@@ -122,7 +133,8 @@ export const useAuthStore = create<AuthState>((set, get) => ({
       errorMsg.includes('Требуется авторизация')
     ) {
       localStorage.removeItem('knot_token');
-        set({ token: null, user: null, isLoading: false });
+      localStorage.removeItem('knot_refresh_token');
+      set({ token: null, refreshToken: null, user: null, isLoading: false });
     } else {
       // 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,13 +3,14 @@ import type { User } from '../../../core/domain/types';
 
 export class AuthApi {
   static async login(username: string, password: string) {
-    const response = await httpClient.request<{ accessToken: string; userId: string; username: string; displayName: string }>('/auth/login', {
+    const response = await httpClient.request<{ accessToken: string; refreshToken: string; userId: string; username: string; displayName: string }>('/auth/login', {
       method: 'POST',
       body: JSON.stringify({ username, password }),
     });
 
     return {
       token: response.accessToken,
+      refreshToken: response.refreshToken,
       user: {
         id: response.userId,
         username: response.username,
@@ -20,13 +21,32 @@ export class AuthApi {
   }
 
   static async register(username: string, displayName: string, password: string, bio?: string) {
-    const response = await httpClient.request<{ accessToken: string; userId: string; username: string; displayName: string }>('/auth/register', {
+    const response = await httpClient.request<{ accessToken: string; refreshToken: string; userId: string; username: string; displayName: string }>('/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,
+        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,

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

@@ -401,6 +401,7 @@ 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 }] };
         }
@@ -412,6 +413,7 @@ 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) };
           }

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

@@ -180,7 +180,12 @@ export default function ChatPage() {
     });
 
     socket.on('messages_read', (data: any) => {
-      markRead(data.chatId || data.ChatId, data.userId || data.UserId, data.lastReadSequenceId || data.LastReadSequenceId || 0);
+      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);
     });
 
     socket.on('user_typing', (data: { chatId: string; userId: string }) => {

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

@@ -78,7 +78,9 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
   const isMine = !chat.isImporting && lastMessage?.senderId === user?.id;
 
   // Галочки прочтения
-  const isRead = !chat.isImporting && lastMessage?.readBy?.some((r) => r.userId !== user?.id);
+  // Для своих сообщений: проверено, есть ли в readBy другие пользователи (получатели)
+  // Для чужих сообщений: не показываем галочки
+  const isRead = !chat.isImporting && isMine && 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 })
@@ -188,8 +190,7 @@ 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'
           }`}
       >
         {/* Аватар */}
@@ -282,7 +283,11 @@ function ChatListItem({ chat, isActive }: ChatListItemProps) {
 
       <ConfirmModal
         open={showDeleteConfirm}
-        message={isFavorites ? t('clearHistoryConfirm') : t('deleteChatConfirm')}
+        message={
+          isFavorites ? t('clearHistoryConfirm') :
+            chat.type === 'group' ? t('deleteGroupChatConfirm') :
+              t('deleteChatConfirm')
+        }
         onConfirm={confirmDelete}
         onCancel={() => setShowDeleteConfirm(false)}
       />

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

@@ -1060,7 +1060,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
                           setShowTopMenu(false);
                           if (activeChat) {
                             setConfirmAction({
-                              message: t('deleteChatConfirm'),
+                              message: chat.type === 'group' ? t('deleteGroupChatConfirm') : t('deleteChatConfirm'),
                               action: async () => {
                                 try {
                                   await ChatApi.deleteChat(activeChat);
@@ -1377,11 +1377,7 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
         </>
       )}
 
-      {typingInChat.length > 0 && (
-        <div className="px-4 pb-1">
-          <TypingIndicator />
-        </div>
-      )}
+      {/* Typing indicator is already shown in the header, removed from here to prevent layout jumping */}
 
       {(() => {
         return (

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

@@ -79,7 +79,11 @@ function MessageBubble({
   const [quotedText, setQuotedText] = useState<string | null>(null);
 
   // Прочитано
-  const isRead = message.readBy?.some((r) => r.userId !== user?.id);
+  // Для своих сообщений: проверено, есть ли в readBy другие пользователи (получатели)
+  // Для чужих сообщений: проверено, есть ли в readBy текущий пользователь
+  const isRead = isMine
+    ? message.readBy?.some((r) => r.userId !== user?.id)  // Кто-то кроме меня прочитал
+    : message.readBy?.some((r) => r.userId === user?.id); // Я прочитал
 
   const timeStr = new Date(message.createdAt).toLocaleTimeString(lang === 'ru' ? 'ru-RU' : 'en-US', {
     hour: '2-digit',
@@ -290,7 +294,7 @@ function MessageBubble({
     };
   }, [showContext]);
 
-  if (message.isDeleted) {
+  if (message.isDeleted || message.isDeletedForUser) {
     return null;
   }
 
@@ -455,7 +459,7 @@ function MessageBubble({
           </div>
         )}
 
-        {!isMine && (
+        {!isMine && activeChat?.type !== 'personal' && activeChat?.type !== 'favorites' && (
           <div className="w-8 flex-shrink-0 mr-2 self-end">
             {showAvatar ? (
               <button onClick={() => onViewProfile?.(message.senderId)}>
@@ -472,7 +476,7 @@ function MessageBubble({
         )}
 
         <div className={`max-[500px]:max-w-[85%] max-w-[75%] lg:max-w-[65%] min-w-0 ${isMine ? 'items-end' : 'items-start'} flex flex-col`}>
-          {!isMine && showAvatar && (
+          {!isMine && showAvatar && activeChat?.type !== 'personal' && activeChat?.type !== 'favorites' && (
             <button
               className="text-xs font-medium text-knot-400 ml-3 mb-0.5 hover:underline"
               onClick={() => onViewProfile?.(message.senderId)}
@@ -491,8 +495,7 @@ function MessageBubble({
                 onContextMenu={handleContextMenu}
                 onDoubleClick={handleReply}
                 title={t('reply') ? `${t('reply')} (Double Click)` : 'Double click to reply'}
-            className={`cursor-pointer max-w-full min-w-[60px] transition-all duration-500 overflow-hidden ${
-              !needsFrame
+                className={`cursor-pointer max-w-full min-w-[60px] transition-all duration-500 overflow-hidden ${!needsFrame
                   ? 'p-0 shadow-none border-none bg-transparent'
                   : isMine
                     ? 'bubble-sent px-4 py-3 hover:brightness-110'
@@ -503,8 +506,7 @@ function MessageBubble({
                 {/* Reply */}
                 {message.replyTo && (
                   <div
-              className={`mb-2 pl-3 py-2 cursor-pointer transition-all -mx-1 px-2 rounded-xl ${
-                isMine ? 'bg-[#1a1a1a] border-l-[3px] border-l-primary hover:bg-[#202020]' : 'bg-white/5 border-l-[3px] border-l-primary hover:bg-white/10'
+                    className={`mb-2 pl-3 py-2 cursor-pointer transition-all -mx-1 px-2 rounded-xl ${isMine ? 'bg-[#1a1a1a] border-l-[3px] border-l-primary hover:bg-[#202020]' : 'bg-white/5 border-l-[3px] border-l-primary hover:bg-white/10'
                       }`}
                     onClick={(e) => {
                       e.stopPropagation();
@@ -565,8 +567,7 @@ function MessageBubble({
                 {/* Story Reply Quote */}
                 {message.storyId && (
                   <div
-              className={`mb-1.5 pl-2.5 py-0.5 border-l-[3px] transition-colors -mx-1 px-1 rounded-sm ${
-                isMine ? 'border-l-white/80 hover:bg-white/10' : 'border-l-knot-500 hover:bg-knot-500/10'
+                    className={`mb-1.5 pl-2.5 py-0.5 border-l-[3px] transition-colors -mx-1 px-1 rounded-sm ${isMine ? 'border-l-white/80 hover:bg-white/10' : 'border-l-knot-500 hover:bg-knot-500/10'
                       }`}
                   >
                     <p className={`text-[11px] font-bold uppercase tracking-wider mb-1 ${isMine ? 'text-white/80' : 'text-knot-500/80'}`}>
@@ -613,12 +614,11 @@ 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]
               `}>
-                <div className={`grid gap-[2px] ${galleryMedia.length > 1 ? 'w-[80vw] sm:w-[380px] md:w-[450px]' : 'w-full'} ${
-                  galleryMedia.length === 1 ? 'grid-cols-1' : 'grid-cols-6'
+                      <div className={`grid gap-[2px] ${galleryMedia.length > 1 ? 'w-[80vw] sm:w-[380px] md:w-[450px]' : 'w-full'} ${galleryMedia.length === 1 ? 'grid-cols-1' : 'grid-cols-6'
                         }`}>
                         {galleryMedia.map((m, idx) => {
                           const gif = isMediaGif(m);
@@ -703,6 +703,89 @@ function MessageBubble({
                           </span>
                         </div>
                       )}
+                    </span>
+                  </div>
+                )}
+              </div>
+              );
+            })()}
+
+            {/* Голосовое - Optimized Kinetic Layout */}
+            {hasVoice && (
+              <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}
+                  preload="auto"
+                />
+                <button
+                  onClick={toggleAudio}
+                  className={`w-9 h-9 rounded-full flex items-center justify-center flex-shrink-0 ${isMine ? 'bg-white text-primary' : 'bg-primary text-white'} shadow-sm transition-all active:scale-95`}
+                >
+                  {isPlaying ? (
+                    <Pause size={16} fill="currentColor" />
+                  ) : (
+                    <Play size={16} fill="currentColor" className="ml-0.5" />
+                  )}
+                </button>
+                <div className="flex-1 min-w-0">
+                  <div
+                    className="flex items-center gap-[2px] h-6 cursor-pointer"
+                    onClick={(e) => {
+                      const audio = audioRef.current;
+                      if (!audio || !audio.duration) return;
+                      const rect = e.currentTarget.getBoundingClientRect();
+                      const pct = (e.clientX - rect.left) / rect.width;
+                      audio.currentTime = pct * audio.duration;
+                      setAudioProgress(pct * 100);
+                      if (!isPlaying) toggleAudio();
+                    }}
+                  >
+                    {(waveformBars || Array(28).fill(0.5)).map((val, i) => {
+                      const barHeight = Math.max(10, val * 85);
+                      const progress = audioProgress / 100;
+                      const barProgress = i / 28;
+                      const isActive = barProgress < progress;
+                      return (
+                        <div
+                          key={i}
+                          className={`flex-1 rounded-full transition-all duration-200 ${isActive
+                            ? isMine ? 'bg-[#000000] opacity-70' : 'bg-primary'
+                            : isMine ? 'bg-[#000000] opacity-20' : 'bg-white/30'
+                            }`}
+                          style={{ height: `${barHeight}%` }}
+                        />
+                      );
+                    })}
+                  </div>
+                  <div className="flex justify-end mt-0.5">
+                    <span className={`text-[10px] font-bold tabular-nums ${isMine ? 'text-[#0a0a0a]/60' : 'text-white/60'}`}>
+                      {isPlaying
+                        ? formatDuration(audioRef.current?.currentTime || 0)
+                        : formatDuration(audioDuration || message.media?.find((m) => m.type === 'voice')?.duration || 0)}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            )}
+
+            {/* Аудио (mp3 файлы) */}
+            {hasAudio && (() => {
+              const audioMedia = media.find(isAudioFile);
+              const formatSize = (bytes?: number | null) => {
+                if (!bytes) return "";
+                if (bytes < 1024) return bytes + " B";
+                if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + " KB";
+                if (bytes < 1024 * 1024 * 1024) return (bytes / (1024 * 1024)).toFixed(1) + " MB";
+                return (bytes / (1024 * 1024 * 1024)).toFixed(1) + " GB";
+              };
+              
+              return (
+                <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'} />
+                      <span className={`text-[11px] font-bold truncate ${isMine ? 'text-[#0a0a0a]/80' : 'text-zinc-200'}`}>{audioMedia.filename}</span>
                     </div>
                   );
                 })()}
@@ -778,78 +861,18 @@ function MessageBubble({
                   };
 
                   return (
-                <div className="min-w-[220px]">
-                  {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'} />
-                      <span className={`text-[11px] font-bold truncate ${isMine ? 'text-[#0a0a0a]/80' : 'text-zinc-200'}`}>{audioMedia.filename}</span>
-                    </div>
-                  )}
-                  <div className="flex items-center gap-3">
-                    <audio
-                      ref={audioRef}
-                      src={getMediaUrl(audioMedia?.url)}
-                      preload="auto"
-                    />
-                    <button
-                      onClick={toggleAudio}
-                      className={`w-9 h-9 rounded-full flex items-center justify-center flex-shrink-0 ${isMine ? 'bg-[#0a0a0a]/10 hover:bg-[#0a0a0a]/20 text-[#0a0a0a]' : 'bg-primary text-white shadow-lg'} transition-all active:scale-95`}
-                    >
-                      {isPlaying ? (
-                        <Pause size={16} fill="currentColor" />
-                      ) : (
-                        <Play size={16} fill="currentColor" className="ml-0.5" />
-                      )}
-                    </button>
-                    <div className="flex-1 min-w-0">
-                      <div className="flex items-center gap-[2px] h-6 cursor-pointer" 
-                           onClick={(e) => {
-                             const audio = audioRef.current;
-                             if (!audio || !audio.duration) return;
-                             const rect = e.currentTarget.getBoundingClientRect();
-                             const pct = (e.clientX - rect.left) / rect.width;
-                             audio.currentTime = pct * audio.duration;
-                             setAudioProgress(pct * 100);
-                           }}>
-                        {Array.from({ length: 28 }).map((_, i) => {
-                          const barHeight = [40, 65, 35, 80, 50, 90, 45, 70, 55, 85, 30, 75, 60, 95, 40, 80, 50, 70, 35, 90, 55, 65, 45, 85, 60, 75, 50, 40][i] || 50;
-                          const progress = audioProgress / 100;
-                          const barProgress = i / 28;
-                          const isActive = barProgress < progress;
-                          return (
-                            <div
-                              key={i}
-                              className={`flex-1 rounded-full transition-all duration-150 ${isActive
-                                ? isMine ? 'bg-[#0a0a0a]/70' : 'bg-primary'
-                                : isMine ? 'bg-[#0a0a0a]/10' : 'bg-white/20'
-                                }`}
-                              style={{ height: `${barHeight}%` }}
-                            />
-                          );
-                        })}
-                      </div>
-                      <div className="flex justify-between items-center mt-0.5">
-                        <span className={`text-[10px] font-bold tabular-nums ${isMine ? 'text-[#0a0a0a]/60' : 'text-zinc-500'}`}>
-                          {isPlaying
-                            ? formatDuration(audioRef.current?.currentTime || 0)
-                            : (typeof audioMedia?.duration === 'number' 
-                                ? formatDuration(audioMedia.duration) 
-                                : (audioMedia?.duration || formatDuration(audioDuration || 0)))}
-                        </span>
-                        <div className="flex items-center gap-2">
-                           <span className={`text-[10px] font-black uppercase tracking-tighter ${isMine ? 'text-[#0a0a0a]/40' : 'text-zinc-500'}`}>{formatSize(audioMedia?.size)}</span>
                     <a
-                             href={getMediaUrl(audioMedia?.url)} 
-                             download={audioMedia?.filename || 'audio'}
+                      key={m.id}
+                      href={getMediaUrl(m.url)}
+                      download={m.filename || 'file'}
                       target="_blank"
                       rel="noopener noreferrer"
-                             className={`flex items-center justify-center p-1 rounded-md transition-all ${isMine ? 'hover:bg-[#0a0a0a]/10 text-[#0a0a0a]/40 hover:text-[#0a0a0a]' : 'hover:bg-white/10 text-zinc-500 hover:text-white'}`}
+                      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 ${hasImage || hasVideo || hasVoice || hasAudio || message.forwardedFrom || message.replyTo || message.storyId ? 'mt-3' : ''}`}
                     >
-                             <Download size={12} />
-                           </a>
-                        </div>
-                      </div>
-                    </div>
+                      <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`}>
+                        <FileText size={22} className={isMine ? 'text-[#0a0a0a]' : 'text-primary'} />
                       </div>
                     </div>
                   );
@@ -1034,7 +1057,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)}
@@ -1043,20 +1066,6 @@ function MessageBubble({
                     <div className="w-full mt-1 mb-1 relative overflow-hidden">
                       <LinkPreview url={firstUrl} />
                     </div>
-                  )}
-                </div>
-                <span className={`text-[10px] font-bold flex-shrink-0 flex items-center gap-0.5 self-end float-right leading-none ${isOnlyEmojis ? '-mb-1' : 'mb-0.5'} ${isMine ? 'text-[#0a0a0a]/50' : 'text-on-surface-variant/40'}`}>
-                  {message.isEdited && <span className="mr-0.5">{t('edited')}</span>}
-                  {message.scheduledAt && <span className="material-symbols-outlined text-[12px] text-amber-400 mr-0.5">schedule</span>}
-                  {isPinned && <Pin size={10} className={`rotate-45 ${isMine ? 'text-[#0a0a0a]/60 fill-[#0a0a0a]/20' : 'text-primary fill-primary/20'} mr-0.5`} />}
-                  {timeStr}
-                  {isMine && !message.scheduledAt && (
-                    <span className={`material-symbols-outlined text-[14px] ${isRead ? 'text-[#0a0a0a]/80 fill-1' : 'text-[#0a0a0a]/40'}`} style={{ fontVariationSettings: `'FILL' ${isRead ? 1 : 0}` }}>
-                      {isRead ? 'done_all' : 'done'}
-                    </span>
-                  )}
-                </span>
-              </div>
                   );
                 })()}
 
@@ -1071,8 +1080,7 @@ function MessageBubble({
                 <button
                   key={emoji}
                   onClick={(e) => { e.stopPropagation(); handleReaction(emoji); }}
-                  className={`flex items-center gap-2 px-2.5 py-1.5 rounded-[10px] transition-all border ${
-                    data.isMine
+                  className={`flex items-center gap-2 px-2.5 py-1.5 rounded-[10px] transition-all border ${data.isMine
                     ? 'bg-primary/20 border-primary text-white shadow-lg'
                     : 'bg-[#201F1F] border-white/5 text-zinc-300 hover:bg-[#2a2a2a]'
                     } shadow-md group/react`}
@@ -1088,7 +1096,7 @@ function MessageBubble({
           )}
         </div>
 
-        {isMine && (
+        {isMine && activeChat?.type !== 'personal' && activeChat?.type !== 'favorites' && (
           <div className="w-8 flex-shrink-0 ml-2 self-end">
             {showAvatar ? (
               <button onClick={() => onViewProfile?.(message.senderId)}>

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

@@ -331,9 +331,7 @@ export default function MessageInput({ chatId }: MessageInputProps) {
     });
   };
 
-  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const files = Array.from(e.target.files || []);
-    if (files.length > 0) {
+  const processFiles = useCallback((files: File[]) => {
     const { addNotification } = useNotificationStore.getState();
     const newAttachments: Attachment[] = [];
     
@@ -349,8 +347,15 @@ export default function MessageInput({ chatId }: MessageInputProps) {
         tooLarge = true;
         continue;
       }
+
+      const isVideo = file.type.startsWith('video/');
+      const isImage = file.type.startsWith('image/');
       const isAudio = file.type.startsWith('audio/') || AUDIO_EXTENSIONS.some(ext => file.name.toLowerCase().endsWith(ext));
-        newAttachments.push({ file, type: isAudio ? 'audio' : 'file' });
+
+      const type = isImage ? 'image' : isVideo ? 'video' : isAudio ? 'audio' : 'file';
+      const preview = isImage ? URL.createObjectURL(file) : undefined;
+
+      newAttachments.push({ file, type, preview });
     }
 
     if (tooLarge) addNotification('warning', t('fileTooLarge') || 'Some files are too large');
@@ -358,38 +363,38 @@ export default function MessageInput({ chatId }: MessageInputProps) {
     
     setAttachments(prev => [...prev, ...newAttachments]);
     inputRef.current?.focus();
-    }
+  }, [attachments, t]);
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const files = Array.from(e.target.files || []);
+    if (files.length > 0) processFiles(files);
     e.target.value = '';
     setShowAttachMenu(false);
   };
 
   const handleImageChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const files = Array.from(e.target.files || []);
-    if (files.length > 0) {
-      const { addNotification } = useNotificationStore.getState();
-      const newAttachments: Attachment[] = [];
-      
-      let limitExceeded = false;
-
-      for (const file of files) {
-        if (attachments.length + newAttachments.length >= 20) {
-          limitExceeded = true;
-          break;
-        }
-        const isVideo = file.type.startsWith('video/');
-        const preview = file.type.startsWith('image/') ? URL.createObjectURL(file) : undefined;
-        newAttachments.push({ file, preview, type: isVideo ? 'video' : 'image' });
-      }
-
-      if (limitExceeded) addNotification('warning', t('maxFilesLimit' as any) || 'Maximum 20 files');
-      
-      setAttachments(prev => [...prev, ...newAttachments]);
-      inputRef.current?.focus();
-    }
+    if (files.length > 0) processFiles(files);
     e.target.value = '';
     setShowAttachMenu(false);
   };
 
+  const handlePaste = (e: React.ClipboardEvent) => {
+    const items = Array.from(e.clipboardData.items);
+    const files = items
+      .filter(item => item.kind === 'file')
+      .map(item => item.getAsFile())
+      .filter((f): f is File => f !== null);
+
+    if (files.length > 0) {
+      processFiles(files);
+      // If we only pasted files, don't paste the filename/text representation in the textarea
+      if (items.every(item => item.kind === 'file')) {
+        e.preventDefault();
+      }
+    }
+  };
+
   // Запись голосового
   const startRecording = async () => {
     try {
@@ -569,41 +574,11 @@ export default function MessageInput({ chatId }: MessageInputProps) {
 
     if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
       const files = Array.from(e.dataTransfer.files);
-      const { addNotification } = useNotificationStore.getState();
-      const newAttachments: Attachment[] = [];
-      
-      let tooLarge = false;
-      let limitExceeded = false;
-
-      for (const file of files) {
-        if (attachments.length + newAttachments.length >= 20) {
-          limitExceeded = true;
-          break;
-        }
-        if (file.size > MAX_FILE_SIZE) {
-          tooLarge = true;
-          continue;
-        }
-
-        const isVideo = file.type.startsWith('video/');
-        const isImage = file.type.startsWith('image/');
-        const audioExts = ['.mp3', '.wav', '.ogg', '.m4a', '.aac', '.flac', '.wma', '.opus'];
-        const isAudio = file.type.startsWith('audio/') || audioExts.some(ext => file.name.toLowerCase().endsWith(ext));
-
-        const type = isImage ? 'image' : isVideo ? 'video' : isAudio ? 'audio' : 'file';
-        const preview = isImage ? URL.createObjectURL(file) : undefined;
-
-        newAttachments.push({ file, type, preview });
-      }
-
-      if (tooLarge) addNotification('warning', t('fileTooLarge') || 'Some files are too large');
-      if (limitExceeded) addNotification('warning', t('maxFilesLimit' as any) || 'Maximum 20 files');
-      
-      setAttachments(prev => [...prev, ...newAttachments]);
-      inputRef.current?.focus();
+      processFiles(files);
     }
   };
 
+
   const hasContent = text.trim() || attachments.length > 0;
 
   return (
@@ -856,6 +831,7 @@ export default function MessageInput({ chatId }: MessageInputProps) {
                 }}
                 onKeyDown={handleKeyDown}
                 onContextMenu={handleInputContextMenu}
+                onPaste={handlePaste}
                 rows={1}
                 className="w-full bg-transparent border-none focus:ring-0 text-[#efeff3] placeholder-on-surface-variant/30 text-[16px] leading-[1.3] resize-none max-h-[140px] custom-scrollbar outline-none py-1 px-0"
                 placeholder={attachments.length > 0 ? t('addCaption') : t('messagePlaceholder') || 'Сообщение...'}