внедрил пресеты статусов и модульную архитектуру

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

backend/Tests/Users/UnitTests/UpdateProfileCommandHandlerTests.cs

@@ -1,13 +1,13 @@
 using FluentAssertions;
 using Knot.Modules.Profiles.Application.Profiles.UpdateProfile;
-using Knot.Modules.Profiles.Domain;
 using Knot.Shared.Kernel;
 using NSubstitute;
 using Xunit;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Knot.Modules.Profiles.Application.Abstractions;
+using Knot.Contracts.Profiles.Domain;
+using Knot.Contracts.Profiles.Application.DTOs;
 
 namespace Knot.Modules.Profiles.UnitTests;
 
@@ -25,14 +25,11 @@ public class UpdateProfileCommandHandlerTests
     [Fact]
     public async Task Handle_ShouldReturnError_WhenProfileNotFound()
     {
-        // Arrange
-        var command = new UpdateProfileCommand(Guid.NewGuid(), "FirstName", "Bio", null);
-        _profileRepository.GetByIdAsync(command.UserId, Arg.Any<CancellationToken>()).Returns((ProfileDocument?)null);
+        var command = new UpdateProfileCommand(Guid.NewGuid(), "FirstName", "Bio", null, null);
+        _profileRepository.GetAsync(command.UserId, Arg.Any<CancellationToken>()).Returns((UserProfileDto?)null);
 
-        // Act
         var result = await _handler.Handle(command, CancellationToken.None);
 
-        // Assert
         result.IsFailure.Should().BeTrue();
     }
 }

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

@@ -8,4 +8,7 @@ public static class AuthErrors
     public static Error IdentityRegistrationDisabled => new("Auth.RegistrationDisabled", "Registration is disabled");
     public static Error IdentityUsernameNotUnique => new("Auth.UsernameNotUnique", "Username is already taken");
     public static Error UserNotFound => new("Auth.UserNotFound", "User not found");
+    public static Error PasswordConfirmationMismatch => new("Auth.PasswordConfirmationMismatch", "Passwords do not match");
+    public static Error PasswordTooShort => new("Auth.PasswordTooShort", "Password must be at least 8 characters");
+    public static Error OldPasswordInvalid => new("Auth.OldPasswordInvalid", "Current password is incorrect");
 }

backend/src/Contracts/Profiles/Application/DTOs/ProfilesErrors.cs

@@ -9,4 +9,8 @@ public static class ProfilesErrors
     public static Error AvatarNotFound => new("Profiles.AvatarNotFound", "Avatar not found");
     public static Error InvalidAvatarFormat => new("Profiles.InvalidAvatarFormat", "Invalid avatar format");
     public static Error AvatarUploadFailed => new("Profiles.AvatarUploadFailed", "Avatar upload failed");
+    public static Error BioTooLong => new("Profiles.BioTooLong", "Bio must be 200 characters or less");
+    public static Error StatusTextTooLong => new("Profiles.StatusTextTooLong", "Status text must be 50 characters or less");
+    public static Error StatusEmpty => new("Statuses.Empty", "Status emoji or text is required");
+    public static Error InvalidPreset => new("Statuses.InvalidPreset", "Unknown status preset");
 }

backend/src/Contracts/Profiles/Application/DTOs/StatusPresetDto.cs

@@ -0,0 +1,9 @@
+namespace Knot.Contracts.Profiles.Application.DTOs;
+
+public sealed class StatusPresetDto
+{
+    public string Id { get; set; } = "";
+    public string Emoji { get; set; } = "";
+    public string TextRu { get; set; } = "";
+    public string TextEn { get; set; } = "";
+}

backend/src/Contracts/Profiles/Application/DTOs/UserProfileDto.cs

@@ -12,5 +12,13 @@ public class UserProfileDto
     public DateTime? LastSeen { get; set; }
     public DateTime? Birthday { get; set; }
     public bool IsPremium { get; set; }
+    public UserStatusDto? Status { get; set; }
+
+    public Guid? CurrentStatusId { get; set; }
+
+    public string? StatusText { get; set; }
+    public string? StatusEmoji { get; set; }
+    public DateTime? StatusExpiresAt { get; set; }
+    public bool IsInvisible { get; set; }
     public DateTime CreatedAt { get; set; }
 }

backend/src/Contracts/Profiles/Application/DTOs/UserStatusDto.cs

@@ -0,0 +1,11 @@
+namespace Knot.Contracts.Profiles.Application.DTOs;
+
+public sealed class UserStatusDto
+{
+    public Guid Id { get; set; }
+    public string Type { get; set; } = "Custom";
+    public string Emoji { get; set; } = "";
+    public string Text { get; set; } = "";
+    public DateTime CreatedAt { get; set; }
+    public DateTime? ExpiresAt { get; set; }
+}

backend/src/Contracts/Profiles/Domain/IProfileStatusWriter.cs

@@ -0,0 +1,11 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Shared.Kernel;
+
+namespace Knot.Contracts.Profiles.Domain;
+
+public interface IProfileStatusWriter
+{
+    Task<Result<UserProfileDto>> SetCustomAsync(Guid userId, string emoji, string text, DateTime? expiresAt, string? presetKey, CancellationToken cancellationToken = default);
+
+    Task<Result<UserProfileDto>> ClearAsync(Guid userId, CancellationToken cancellationToken = default);
+}

backend/src/Contracts/Profiles/Domain/IUserStatusRepository.cs

@@ -0,0 +1,14 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+
+namespace Knot.Contracts.Profiles.Domain;
+
+public interface IUserStatusRepository
+{
+    Task<UserStatusDto?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default);
+
+    Task<IReadOnlyDictionary<Guid, UserStatusDto>> GetByIdsAsync(IEnumerable<Guid> ids, CancellationToken cancellationToken = default);
+
+    Task InsertAsync(UserStatusDto dto, Guid userId, CancellationToken cancellationToken = default);
+
+    Task DeleteAsync(Guid id, CancellationToken cancellationToken = default);
+}

backend/src/Host/Program.cs

@@ -250,6 +250,7 @@ app.MapStoriesEndpoints();
 app.MapContactsEndpoints();
 app.MapSettingsEndpoints();
 app.MapProfilesEndpoints();
+app.MapStatusesEndpoints();
 app.MapFederationEndpoints();
 app.MapKlipyEndpoints();
 app.MapChatsEndpoints();

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

@@ -0,0 +1,48 @@
+using BCrypt.Net;
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Application.Auth.DTOs;
+using Knot.Modules.Auth.Domain;
+using Knot.Shared.Kernel;
+using Microsoft.EntityFrameworkCore;
+
+namespace Knot.Modules.Auth.Application.Users.ChangePassword;
+
+public sealed record ChangePasswordCommand(
+    Guid UserId,
+    string OldPassword,
+    string NewPassword,
+    string ConfirmPassword) : ICommand;
+
+internal sealed class ChangePasswordCommandHandler : ICommandHandler<ChangePasswordCommand>
+{
+    private readonly IAuthDbContext _dbContext;
+
+    public ChangePasswordCommandHandler(IAuthDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<Result> Handle(ChangePasswordCommand request, CancellationToken cancellationToken)
+    {
+        if (request.NewPassword != request.ConfirmPassword)
+            return Result.Failure(AuthErrors.PasswordConfirmationMismatch);
+
+        if (request.NewPassword.Length < 8)
+            return Result.Failure(AuthErrors.PasswordTooShort);
+
+        var user = await _dbContext.Set<User>()
+            .FirstOrDefaultAsync(u => u.Id == request.UserId, cancellationToken);
+
+        if (user is null)
+            return Result.Failure(AuthErrors.UserNotFound);
+
+        if (!BCrypt.Net.BCrypt.Verify(request.OldPassword, user.PasswordHash))
+            return Result.Failure(AuthErrors.OldPasswordInvalid);
+
+        user.ChangePassword(BCrypt.Net.BCrypt.HashPassword(request.NewPassword));
+        user.SetRefreshToken(null);
+
+        await _dbContext.SaveChangesAsync(cancellationToken);
+        return Result.Success();
+    }
+}

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

@@ -2,6 +2,7 @@ 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.ChangePassword;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
@@ -12,6 +13,8 @@ namespace Knot.Modules.Auth.Presentation.Endpoints;
 
 public static class AuthEndpoints
 {
+    public sealed record ChangePasswordRequest(string OldPassword, string NewPassword, string ConfirmPassword);
+
     public static void MapAuthEndpoints(this WebApplication app)
     {
         var group = app.MapGroup("api/auth");
@@ -33,5 +36,19 @@ public static class AuthEndpoints
             var result = await sender.Send(new GetMeQuery(userContext.UserId), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound();
         }).RequireAuthorization();
+
+        group.MapPost("change-password", async ([FromBody] ChangePasswordRequest request, ISender sender, IUserContext userContext, CancellationToken ct) =>
+        {
+            var result = await sender.Send(
+                new ChangePasswordCommand(userContext.UserId, request.OldPassword, request.NewPassword, request.ConfirmPassword),
+                ct);
+
+            if (result.IsSuccess) return Results.Ok();
+
+            if (result.Error.Code == "Auth.OldPasswordInvalid")
+                return Results.StatusCode(StatusCodes.Status403Forbidden);
+
+            return Results.BadRequest(new { error = result.Error.Code ?? result.Error.Description });
+        }).RequireAuthorization();
     }
 }

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

@@ -21,6 +21,7 @@ using Knot.Modules.Conversations.Application.DTOs;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Profiles.Domain;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -51,6 +52,7 @@ public sealed class ChatHub : Hub
     private readonly ILogger<ChatHub> _logger;
     private readonly IMemoryCache _cache;
     private readonly IUserDisplayNameProvider _userProvider;
+    private readonly IProfileRepository _profileRepository;
 
     public ChatHub(
         ISender sender, 
@@ -60,7 +62,8 @@ public sealed class ChatHub : Hub
         IMessageRepository messageRepository,
         ILogger<ChatHub> logger, 
         IMemoryCache cache,
-        IUserDisplayNameProvider userProvider)
+        IUserDisplayNameProvider userProvider,
+        IProfileRepository profileRepository)
     {
         _sender = sender;
         _userContext = userContext;
@@ -70,6 +73,7 @@ public sealed class ChatHub : Hub
         _logger = logger;
         _cache = cache;
         _userProvider = userProvider;
+        _profileRepository = profileRepository;
     }
 
     public override async Task OnConnectedAsync()
@@ -95,7 +99,15 @@ public sealed class ChatHub : Hub
 
                 userId, Context.ConnectionId, userChats.Count);
 
-            await Clients.Others.SendAsync("user_online", new { userId });
+            var isInvisible = await IsUserInvisibleAsync(_userContext.UserId, Context.ConnectionAborted);
+            if (!isInvisible)
+            {
+                await BroadcastPresenceToVisibleUsersAsync(
+                    "user_online",
+                    new { userId },
+                    _userContext.UserId,
+                    Context.ConnectionAborted);
+            }
         }
         await base.OnConnectedAsync();
     }
@@ -111,7 +123,22 @@ public sealed class ChatHub : Hub
                 if (set.Count == 0)
                 {
                     _userConnections.TryRemove(userId, out _);
-                    await Clients.Others.SendAsync("user_offline", new { userId, lastSeen = DateTime.UtcNow });
+                    try
+                    {
+                        var isInvisible = await IsUserInvisibleAsync(_userContext.UserId, CancellationToken.None);
+                        if (!isInvisible)
+                        {
+                            await BroadcastPresenceToVisibleUsersAsync(
+                                "user_offline",
+                                new { userId, lastSeen = DateTime.UtcNow },
+                                _userContext.UserId,
+                                CancellationToken.None);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Presence broadcast on disconnect failed for {UserId}", userId);
+                    }
                 }
             }
             _cache.Set("Global_OnlineUsersCount", _userConnections.Count);
@@ -120,6 +147,56 @@ public sealed class ChatHub : Hub
         await base.OnDisconnectedAsync(exception);
     }
 
+    private async Task<bool> IsUserInvisibleAsync(Guid userId, CancellationToken ct)
+    {
+        var profile = await _profileRepository.GetAsync(userId, ct);
+        return profile?.IsInvisible ?? false;
+    }
+
+    private async Task BroadcastPresenceToVisibleUsersAsync(
+        string eventName,
+        object payload,
+        Guid sourceUserId,
+        CancellationToken cancellationToken)
+    {
+        var recipients = _userConnections.Keys
+            .Where(id => id != sourceUserId.ToString())
+            .Select(id => Guid.TryParse(id, out var parsed) ? parsed : Guid.Empty)
+            .Where(id => id != Guid.Empty)
+            .Distinct()
+            .ToList();
+
+        if (recipients.Count == 0)
+            return;
+
+        var recipientProfiles = await _profileRepository.GetAsync(recipients, cancellationToken);
+        var invisibleRecipientIds = recipientProfiles
+            .Where(p => p.IsInvisible)
+            .Select(p => p.UserId)
+            .ToHashSet();
+
+        foreach (var kvp in _userConnections)
+        {
+            if (!Guid.TryParse(kvp.Key, out var recipientId))
+                continue;
+            if (recipientId == sourceUserId)
+                continue;
+            if (invisibleRecipientIds.Contains(recipientId))
+                continue;
+
+            string[] connectionIds;
+            lock (kvp.Value)
+            {
+                connectionIds = kvp.Value.ToArray();
+            }
+
+            foreach (var connectionId in connectionIds)
+            {
+                await Clients.Client(connectionId).SendAsync(eventName, payload);
+            }
+        }
+    }
+
     // ────────────────────────────────────────────────────────────────
     // Chat methods
     // ────────────────────────────────────────────────────────────────

backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj

@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\Contracts\Messaging\Knot.Contracts.Messaging.csproj" />
     <ProjectReference Include="..\..\Contracts\Conversations\Knot.Contracts.Conversations.csproj" />
     <ProjectReference Include="..\..\Contracts\Auth\Knot.Contracts.Auth.csproj" />
+    <ProjectReference Include="..\..\Contracts\Profiles\Knot.Contracts.Profiles.csproj" />
   </ItemGroup>
 
   <ItemGroup>

backend/src/Modules/Profiles/Application/Profiles/DTOs/ProfilesRequests.cs

@@ -2,5 +2,9 @@ using System;
 
 namespace Knot.Modules.Profiles.Application.Profiles.DTOs;
 
-public record UpdateProfileRequest(string? DisplayName, string? Bio, DateTime? Birthday);
+public record UpdateProfileRequest(
+    string? DisplayName,
+    string? Bio,
+    DateTime? Birthday,
+    bool? IsInvisible);
 public record UpdateSettingsRequest(bool? HideStoryViews);

backend/src/Modules/Profiles/Application/Profiles/UpdateProfile/UpdateProfile.cs

@@ -11,7 +11,8 @@ public sealed record UpdateProfileCommand(
     Guid UserId,
     string? DisplayName,
     string? Bio,
-    DateTime? Birthday) : ICommand<UserProfileDto>;
+    DateTime? Birthday,
+    bool? IsInvisible) : ICommand<UserProfileDto>;
 
 internal sealed class UpdateProfileCommandHandler : ICommandHandler<UpdateProfileCommand, UserProfileDto>
 {
@@ -28,9 +29,13 @@ internal sealed class UpdateProfileCommandHandler : ICommandHandler<UpdateProfil
         if (profile is null)
             return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
 
+        if ((request.Bio?.Length ?? 0) > 200)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.BioTooLong);
+
         profile.DisplayName = request.DisplayName ?? profile.DisplayName;
         profile.About = request.Bio;
         profile.Birthday = request.Birthday;
+        profile.IsInvisible = request.IsInvisible ?? profile.IsInvisible;
 
         var result = await _repository.UpdateAsync(profile, cancellationToken);
         if (result.IsFailure)

backend/src/Modules/Profiles/Application/Statuses/ClearUserStatusCommand.cs

@@ -0,0 +1,21 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Contracts.Profiles.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Profiles.Application.Statuses;
+
+public sealed record ClearUserStatusCommand(Guid UserId) : IRequest<Result<UserProfileDto>>;
+
+public sealed class ClearUserStatusCommandHandler : IRequestHandler<ClearUserStatusCommand, Result<UserProfileDto>>
+{
+    private readonly IProfileStatusWriter _writer;
+
+    public ClearUserStatusCommandHandler(IProfileStatusWriter writer)
+    {
+        _writer = writer;
+    }
+
+    public Task<Result<UserProfileDto>> Handle(ClearUserStatusCommand request, CancellationToken cancellationToken)
+        => _writer.ClearAsync(request.UserId, cancellationToken);
+}

backend/src/Modules/Profiles/Application/Statuses/GetStatusPresetsQuery.cs

@@ -0,0 +1,12 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using MediatR;
+
+namespace Knot.Modules.Profiles.Application.Statuses;
+
+public sealed record GetStatusPresetsQuery : IRequest<IReadOnlyList<StatusPresetDto>>;
+
+public sealed class GetStatusPresetsQueryHandler : IRequestHandler<GetStatusPresetsQuery, IReadOnlyList<StatusPresetDto>>
+{
+    public Task<IReadOnlyList<StatusPresetDto>> Handle(GetStatusPresetsQuery request, CancellationToken cancellationToken)
+        => Task.FromResult(StatusPresetCatalog.All);
+}

backend/src/Modules/Profiles/Application/Statuses/SetCustomUserStatusCommand.cs

@@ -0,0 +1,53 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Contracts.Profiles.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
+
+namespace Knot.Modules.Profiles.Application.Statuses;
+
+public sealed record SetCustomUserStatusCommand(
+    Guid UserId,
+    string? Emoji,
+    string? Text,
+    DateTime? ExpiresAt,
+    string? PresetKey) : IRequest<Result<UserProfileDto>>;
+
+public sealed class SetCustomUserStatusCommandHandler : IRequestHandler<SetCustomUserStatusCommand, Result<UserProfileDto>>
+{
+    private readonly IProfileStatusWriter _writer;
+
+    public SetCustomUserStatusCommandHandler(IProfileStatusWriter writer)
+    {
+        _writer = writer;
+    }
+
+    public async Task<Result<UserProfileDto>> Handle(SetCustomUserStatusCommand request, CancellationToken cancellationToken)
+    {
+        var key = request.PresetKey?.Trim();
+        if (!string.IsNullOrEmpty(key) && key.Equals("online", StringComparison.OrdinalIgnoreCase))
+            return await _writer.ClearAsync(request.UserId, cancellationToken);
+
+        var emoji = request.Emoji?.Trim() ?? string.Empty;
+        var text = request.Text?.Trim() ?? string.Empty;
+
+        if (!string.IsNullOrEmpty(key))
+        {
+            var preset = StatusPresetCatalog.Find(key);
+            if (preset is null)
+                return Result.Failure<UserProfileDto>(ProfilesErrors.InvalidPreset);
+            if (string.IsNullOrEmpty(emoji))
+                emoji = preset.Emoji;
+            if (string.IsNullOrEmpty(text))
+                text = preset.TextRu;
+        }
+
+        if (string.IsNullOrEmpty(emoji) && string.IsNullOrEmpty(text))
+            return Result.Failure<UserProfileDto>(ProfilesErrors.StatusEmpty);
+
+        if (text.Length > 50)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.StatusTextTooLong);
+
+        var presetForWriter = string.IsNullOrWhiteSpace(key) ? null : key;
+        return await _writer.SetCustomAsync(request.UserId, emoji, text, request.ExpiresAt, presetForWriter, cancellationToken);
+    }
+}

backend/src/Modules/Profiles/Application/Statuses/StatusPresetCatalog.cs

@@ -0,0 +1,24 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+
+namespace Knot.Modules.Profiles.Application.Statuses;
+
+public static class StatusPresetCatalog
+{
+    private static readonly StatusPresetDto[] Items =
+    [
+        new() { Id = "online", Emoji = "", TextRu = "Онлайн (стандарт)", TextEn = "Online (standard)" },
+        new() { Id = "away", Emoji = "🕒", TextRu = "В отъезде", TextEn = "Away" },
+        new() { Id = "dnd", Emoji = "⛔", TextRu = "Не беспокоить", TextEn = "Do not disturb" },
+        new() { Id = "sick", Emoji = "🤒", TextRu = "Болен", TextEn = "Sick" },
+        new() { Id = "angry", Emoji = "💢", TextRu = "Злой", TextEn = "Angry" }
+    ];
+
+    public static IReadOnlyList<StatusPresetDto> All => Items;
+
+    public static StatusPresetDto? Find(string presetKey)
+    {
+        if (string.IsNullOrWhiteSpace(presetKey))
+            return null;
+        return Items.FirstOrDefault(x => x.Id.Equals(presetKey.Trim(), StringComparison.OrdinalIgnoreCase));
+    }
+}

backend/src/Modules/Profiles/DependencyInjection.cs

@@ -11,10 +11,11 @@ public static class DependencyInjection
     public static IServiceCollection AddProfilesModule(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddScoped<Knot.Contracts.Profiles.Domain.IProfileRepository, ProfileRepository>();
+        services.AddScoped<Knot.Contracts.Profiles.Domain.IUserStatusRepository, UserStatusMongoRepository>();
+        services.AddScoped<Knot.Contracts.Profiles.Domain.IProfileStatusWriter, ProfileStatusWriter>();
         services.AddScoped<Knot.Contracts.Profiles.Domain.IProfilesUnitOfWork, ProfilesUnitOfWork>();
         services.AddScoped<Knot.Contracts.Profiles.Domain.IAvatarStorageService, AvatarStorageService>();
 
-        // MongoDB Registration
         var mongoConnection = configuration.GetConnectionString("MongoConnection")
                              ?? configuration["MONGO_URL"]
                              ?? "mongodb://mongo:27017";

backend/src/Modules/Profiles/Domain/ProfileDocument.cs

@@ -3,10 +3,6 @@ using MongoDB.Bson.Serialization.Attributes;
 
 namespace Knot.Modules.Profiles.Domain;
 
-/// <summary>
-/// MongoDB-документ профиля пользователя.
-/// Id совпадает с UserId из модуля Auth (Postgres).
-/// </summary>
 public sealed class ProfileDocument
 {
     [BsonId]
@@ -19,12 +15,23 @@ public sealed class ProfileDocument
 
     public string? Bio { get; private set; }
 
+    public string? StatusText { get; private set; }
+
+    public string? StatusEmoji { get; private set; }
+
+    public DateTime? StatusExpiresAt { get; private set; }
+
+    [BsonRepresentation(BsonType.String)]
+    public Guid? CurrentStatusId { get; private set; }
+
     public string? AvatarUrl { get; private set; }
 
     public DateTime? Birthday { get; private set; }
 
     public bool HideStoryViews { get; private set; }
 
+    public bool IsInvisible { get; private set; }
+
     public bool IsBanned { get; private set; }
 
     public bool IsDeleted { get; private set; }
@@ -65,6 +72,26 @@ public sealed class ProfileDocument
     public void UpdateSettings(bool hideStoryViews)
         => HideStoryViews = hideStoryViews;
 
+    public void UpdateInvisible(bool isInvisible)
+        => IsInvisible = isInvisible;
+
+    public void UpdateStatus(string? statusText, string? statusEmoji, DateTime? statusExpiresAt)
+    {
+        StatusText = statusText;
+        StatusEmoji = statusEmoji;
+        StatusExpiresAt = statusExpiresAt;
+    }
+
+    public void SetCurrentStatusId(Guid? statusId)
+        => CurrentStatusId = statusId;
+
+    public void ClearMoodStatusFields()
+    {
+        StatusText = null;
+        StatusEmoji = null;
+        StatusExpiresAt = null;
+    }
+
     public void UpdateStatus(bool isBanned, bool isDeleted)
     {
         IsBanned = isBanned;

backend/src/Modules/Profiles/Domain/UserStatusDocument.cs

@@ -0,0 +1,26 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Knot.Modules.Profiles.Domain;
+
+public sealed class UserStatusDocument
+{
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    [BsonRepresentation(BsonType.String)]
+    public Guid UserId { get; set; }
+
+    public string Type { get; set; } = "Custom";
+
+    public string Emoji { get; set; } = "";
+
+    public string Text { get; set; } = "";
+
+    public DateTime CreatedAt { get; set; }
+
+    public DateTime? ExpiresAt { get; set; }
+
+    public BsonDocument Metadata { get; set; } = new();
+}

backend/src/Modules/Profiles/Infrastructure/Database/ProfileRepository.cs

@@ -10,29 +10,39 @@ namespace Knot.Modules.Profiles.Infrastructure.Database;
 internal class ProfileRepository : IProfileRepository
 {
     private readonly IMongoCollection<ProfileDocument> _profiles;
+    private readonly IUserStatusRepository _statuses;
 
-    public ProfileRepository(IMongoDatabase database)
+    public ProfileRepository(IMongoDatabase database, IUserStatusRepository statuses)
     {
         _profiles = database.GetCollection<ProfileDocument>("profiles");
+        _statuses = statuses;
     }
 
     public async Task<UserProfileDto?> GetAsync(Guid userId, CancellationToken ct = default)
     {
         var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(ct);
-        return profile?.ToDto();
+        return profile is null ? null : await profile.ToDtoAsync(_statuses, ct);
     }
 
     public async Task<UserProfileDto?> GetByUsernameAsync(string username, CancellationToken ct = default)
     {
         var profile = await _profiles.Find(p => p.Username == username).FirstOrDefaultAsync(ct);
-        return profile?.ToDto();
+        return profile is null ? null : await profile.ToDtoAsync(_statuses, ct);
     }
 
     public async Task<List<UserProfileDto>> GetAsync(IEnumerable<Guid> userIds, CancellationToken ct = default)
     {
         var ids = userIds.ToList();
         var profiles = await _profiles.Find(p => ids.Contains(p.Id)).ToListAsync(ct);
-        return profiles.Select(p => p.ToDto()).ToList();
+        var statusIds = profiles
+            .Where(p => p.CurrentStatusId.HasValue)
+            .Select(p => p.CurrentStatusId!.Value)
+            .Distinct()
+            .ToList();
+        var map = statusIds.Count > 0
+            ? await _statuses.GetByIdsAsync(statusIds, ct)
+            : new Dictionary<Guid, UserStatusDto>();
+        return profiles.Select(p => ProfileMappings.ToDtoWithStatusMap(p, map)).ToList();
     }
 
     public async Task<List<UserProfileDto>> SearchAsync(string query, int limit = 20, CancellationToken ct = default)
@@ -57,7 +67,16 @@ internal class ProfileRepository : IProfileRepository
             var combinedFilter = Builders<ProfileDocument>.Filter.And(baseFilter, searchFilter);
             docs = await _profiles.Find(combinedFilter).Limit(limit).ToListAsync(ct);
         }
-        return docs.Select(p => p.ToDto()).ToList();
+
+        var statusIds = docs
+            .Where(p => p.CurrentStatusId.HasValue)
+            .Select(p => p.CurrentStatusId!.Value)
+            .Distinct()
+            .ToList();
+        var map = statusIds.Count > 0
+            ? await _statuses.GetByIdsAsync(statusIds, ct)
+            : new Dictionary<Guid, UserStatusDto>();
+        return docs.Select(p => ProfileMappings.ToDtoWithStatusMap(p, map)).ToList();
     }
 
     public async Task<Result<UserProfileDto>> CreateAsync(UserProfileDto dto, CancellationToken ct = default)
@@ -65,7 +84,7 @@ internal class ProfileRepository : IProfileRepository
         var profile = ProfileDocument.Create(dto.UserId, dto.Username ?? string.Empty, dto.DisplayName ?? string.Empty, dto.About);
 
         await _profiles.InsertOneAsync(profile, null, ct);
-        return Result.Success(profile.ToDto());
+        return Result.Success(await profile.ToDtoAsync(_statuses, ct));
     }
 
     public async Task<Result<UserProfileDto>> UpdateAsync(UserProfileDto dto, CancellationToken ct = default)
@@ -80,9 +99,13 @@ internal class ProfileRepository : IProfileRepository
             dto.Birthday);
 
         document.UpdateAvatar(dto.Avatar);
+        document.UpdateInvisible(dto.IsInvisible);
 
         await _profiles.ReplaceOneAsync(p => p.Id == dto.UserId, document, cancellationToken: ct);
-        return Result.Success(document.ToDto());
+        var fresh = await _profiles.Find(p => p.Id == dto.UserId).FirstOrDefaultAsync(ct);
+        if (fresh is null)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
+        return Result.Success(await fresh.ToDtoAsync(_statuses, ct));
     }
 
     public async Task<Result> UpdateStatusAsync(Guid userId, bool isBanned, bool isDeleted, CancellationToken ct = default)

backend/src/Modules/Profiles/Infrastructure/Database/ProfileStatusWriter.cs

@@ -0,0 +1,73 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Contracts.Profiles.Domain;
+using Knot.Modules.Profiles.Domain;
+using Knot.Modules.Profiles.Infrastructure.Mappings;
+using Knot.Shared.Kernel;
+using MongoDB.Driver;
+
+namespace Knot.Modules.Profiles.Infrastructure.Database;
+
+internal sealed class ProfileStatusWriter : IProfileStatusWriter
+{
+    private readonly IMongoCollection<ProfileDocument> _profiles;
+    private readonly IUserStatusRepository _statuses;
+
+    public ProfileStatusWriter(IMongoDatabase database, IUserStatusRepository statuses)
+    {
+        _profiles = database.GetCollection<ProfileDocument>("profiles");
+        _statuses = statuses;
+    }
+
+    public async Task<Result<UserProfileDto>> SetCustomAsync(Guid userId, string emoji, string text, DateTime? expiresAt, string? presetKey, CancellationToken cancellationToken = default)
+    {
+        var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
+        if (profile is null)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
+
+        if (profile.CurrentStatusId is Guid oldId)
+            await _statuses.DeleteAsync(oldId, cancellationToken);
+
+        var newId = Guid.NewGuid();
+        var type = string.IsNullOrWhiteSpace(presetKey) ? "Custom" : "Preset";
+        var dto = new UserStatusDto
+        {
+            Id = newId,
+            Type = type,
+            Emoji = emoji,
+            Text = text,
+            CreatedAt = DateTime.UtcNow,
+            ExpiresAt = expiresAt
+        };
+        await _statuses.InsertAsync(dto, userId, cancellationToken);
+
+        profile.SetCurrentStatusId(newId);
+        profile.ClearMoodStatusFields();
+        await _profiles.ReplaceOneAsync(p => p.Id == userId, profile, cancellationToken: cancellationToken);
+
+        var fresh = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
+        if (fresh is null)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
+
+        return Result.Success(await fresh.ToDtoAsync(_statuses, cancellationToken));
+    }
+
+    public async Task<Result<UserProfileDto>> ClearAsync(Guid userId, CancellationToken cancellationToken = default)
+    {
+        var profile = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
+        if (profile is null)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
+
+        if (profile.CurrentStatusId is Guid oldId)
+            await _statuses.DeleteAsync(oldId, cancellationToken);
+
+        profile.SetCurrentStatusId(null);
+        profile.ClearMoodStatusFields();
+        await _profiles.ReplaceOneAsync(p => p.Id == userId, profile, cancellationToken: cancellationToken);
+
+        var fresh = await _profiles.Find(p => p.Id == userId).FirstOrDefaultAsync(cancellationToken);
+        if (fresh is null)
+            return Result.Failure<UserProfileDto>(ProfilesErrors.ProfileNotFound);
+
+        return Result.Success(await fresh.ToDtoAsync(_statuses, cancellationToken));
+    }
+}

backend/src/Modules/Profiles/Infrastructure/Database/UserStatusMongoRepository.cs

@@ -0,0 +1,62 @@
+using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Contracts.Profiles.Domain;
+using Knot.Modules.Profiles.Domain;
+using MongoDB.Bson;
+using MongoDB.Driver;
+
+namespace Knot.Modules.Profiles.Infrastructure.Database;
+
+internal sealed class UserStatusMongoRepository : IUserStatusRepository
+{
+    private readonly IMongoCollection<UserStatusDocument> _collection;
+
+    public UserStatusMongoRepository(IMongoDatabase database)
+    {
+        _collection = database.GetCollection<UserStatusDocument>("user_statuses");
+    }
+
+    public async Task<UserStatusDto?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default)
+    {
+        var doc = await _collection.Find(x => x.Id == id).FirstOrDefaultAsync(cancellationToken);
+        return doc is null ? null : ToDto(doc);
+    }
+
+    public async Task<IReadOnlyDictionary<Guid, UserStatusDto>> GetByIdsAsync(IEnumerable<Guid> ids, CancellationToken cancellationToken = default)
+    {
+        var idList = ids.Distinct().ToList();
+        if (idList.Count == 0)
+            return new Dictionary<Guid, UserStatusDto>();
+
+        var docs = await _collection.Find(x => idList.Contains(x.Id)).ToListAsync(cancellationToken);
+        return docs.ToDictionary(d => d.Id, ToDto);
+    }
+
+    public async Task InsertAsync(UserStatusDto dto, Guid userId, CancellationToken cancellationToken = default)
+    {
+        var doc = new UserStatusDocument
+        {
+            Id = dto.Id,
+            UserId = userId,
+            Type = dto.Type,
+            Emoji = dto.Emoji,
+            Text = dto.Text,
+            CreatedAt = dto.CreatedAt,
+            ExpiresAt = dto.ExpiresAt,
+            Metadata = new BsonDocument()
+        };
+        await _collection.InsertOneAsync(doc, cancellationToken: cancellationToken);
+    }
+
+    public Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
+        => _collection.DeleteOneAsync(x => x.Id == id, cancellationToken);
+
+    private static UserStatusDto ToDto(UserStatusDocument d) => new()
+    {
+        Id = d.Id,
+        Type = d.Type,
+        Emoji = d.Emoji,
+        Text = d.Text,
+        CreatedAt = d.CreatedAt,
+        ExpiresAt = d.ExpiresAt
+    };
+}

backend/src/Modules/Profiles/Infrastructure/Mappings/ProfileMappings.cs

@@ -1,13 +1,14 @@
 using Knot.Contracts.Profiles.Application.DTOs;
+using Knot.Contracts.Profiles.Domain;
 using Knot.Modules.Profiles.Domain;
 
 namespace Knot.Modules.Profiles.Infrastructure.Mappings;
 
 public static class ProfileMappings
 {
-    public static UserProfileDto ToDto(this ProfileDocument document)
+    public static UserProfileDto ToDtoWithStatusMap(ProfileDocument document, IReadOnlyDictionary<Guid, UserStatusDto> statusMap)
     {
-        return new UserProfileDto
+        var dto = new UserProfileDto
         {
             UserId = document.Id,
             DisplayName = document.DisplayName,
@@ -18,7 +19,59 @@ public static class ProfileMappings
             LastSeen = null,
             Birthday = document.Birthday,
             IsPremium = false,
-            CreatedAt = document.CreatedAt
+            IsInvisible = document.IsInvisible,
+            CreatedAt = document.CreatedAt,
+            Status = null,
+            StatusText = null,
+            StatusEmoji = null,
+            StatusExpiresAt = null,
+            CurrentStatusId = null
         };
+
+        UserStatusDto? active = null;
+        if (document.CurrentStatusId is Guid sid && statusMap.TryGetValue(sid, out var loaded) && loaded is not null)
+        {
+            var exp = loaded.ExpiresAt;
+            if (!exp.HasValue || exp.Value > DateTime.UtcNow)
+                active = loaded;
+        }
+
+        if (active is not null)
+        {
+            dto.Status = active;
+            dto.StatusText = active.Text;
+            dto.StatusEmoji = active.Emoji;
+            dto.StatusExpiresAt = active.ExpiresAt;
+            dto.CurrentStatusId = active.Id;
+            return dto;
+        }
+
+        var legacyExpired = document.StatusExpiresAt.HasValue && document.StatusExpiresAt.Value <= DateTime.UtcNow;
+        if (!legacyExpired && (!string.IsNullOrEmpty(document.StatusText) || !string.IsNullOrEmpty(document.StatusEmoji)))
+        {
+            dto.StatusText = document.StatusText;
+            dto.StatusEmoji = document.StatusEmoji;
+            dto.StatusExpiresAt = document.StatusExpiresAt;
+            dto.Status = new UserStatusDto
+            {
+                Id = Guid.Empty,
+                Type = "Custom",
+                Emoji = document.StatusEmoji ?? string.Empty,
+                Text = document.StatusText ?? string.Empty,
+                CreatedAt = document.CreatedAt,
+                ExpiresAt = document.StatusExpiresAt
+            };
+            return dto;
+        }
+
+        return dto;
+    }
+
+    public static async Task<UserProfileDto> ToDtoAsync(this ProfileDocument document, IUserStatusRepository statuses, CancellationToken cancellationToken)
+    {
+        if (document.CurrentStatusId is not Guid sid)
+            return ToDtoWithStatusMap(document, new Dictionary<Guid, UserStatusDto>());
+        var map = await statuses.GetByIdsAsync(new[] { sid }, cancellationToken);
+        return ToDtoWithStatusMap(document, map);
     }
 }

backend/src/Modules/Profiles/Presentation/Endpoints/ProfilesEndpoints.cs

@@ -17,6 +17,8 @@ public static class ProfilesEndpoints
     public static void MapProfilesEndpoints(this WebApplication app)
     {
         var group = app.MapGroup("api/profiles").RequireAuthorization();
+        var userGroup = app.MapGroup("api/user").RequireAuthorization();
+        var usersGroup = app.MapGroup("api/users").RequireAuthorization();
 
         group.MapGet("search", async ([FromQuery] string q, ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
@@ -67,16 +69,37 @@ public static class ProfilesEndpoints
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
         });
 
-        group.MapPut("profile", async ([FromBody] Knot.Modules.Profiles.Application.Profiles.DTOs.UpdateProfileRequest request, ISender sender, IUserContext userContext, CancellationToken ct) =>
+        async Task<IResult> UpdateProfileHandler(
+            [FromBody] Knot.Modules.Profiles.Application.Profiles.DTOs.UpdateProfileRequest request,
+            ISender sender,
+            IUserContext userContext,
+            CancellationToken ct)
         {
-            var result = await sender.Send(new UpdateProfileCommand(userContext.UserId, request.DisplayName, request.Bio, request.Birthday), ct);
+            var result = await sender.Send(
+                new UpdateProfileCommand(
+                    userContext.UserId,
+                    request.DisplayName,
+                    request.Bio,
+                    request.Birthday,
+                    request.IsInvisible),
+                ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
-        });
+        }
+
+        group.MapPut("profile", UpdateProfileHandler);
+        group.MapPatch("profile", UpdateProfileHandler);
+        userGroup.MapPatch("profile", UpdateProfileHandler);
 
         group.MapGet("{id:guid}", async (Guid id, ISender sender, CancellationToken ct) =>
         {
             var result = await sender.Send(new GetProfileQuery(id), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
         });
+
+        usersGroup.MapGet("{id:guid}", async (Guid id, ISender sender, CancellationToken ct) =>
+        {
+            var result = await sender.Send(new GetProfileQuery(id), ct);
+            return result.IsSuccess ? Results.Ok(result.Value) : Results.NotFound(result.Error);
+        });
     }
 }

backend/src/Modules/Profiles/Presentation/Endpoints/StatusesEndpoints.cs

@@ -0,0 +1,45 @@
+using Knot.Modules.Profiles.Application.Statuses;
+using Knot.Shared.Kernel;
+using MediatR;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+
+namespace Knot.Modules.Profiles.Presentation.Endpoints;
+
+public static class StatusesEndpoints
+{
+    public static void MapStatusesEndpoints(this WebApplication app)
+    {
+        var g = app.MapGroup("api/statuses").RequireAuthorization();
+
+        g.MapGet("presets", async (ISender sender, CancellationToken ct) =>
+        {
+            var list = await sender.Send(new GetStatusPresetsQuery(), ct);
+            return Results.Ok(list);
+        });
+
+        g.MapPost("custom", async ([FromBody] SetCustomStatusBody body, ISender sender, IUserContext ctx, CancellationToken ct) =>
+        {
+            var result = await sender.Send(
+                new SetCustomUserStatusCommand(ctx.UserId, body.Emoji, body.Text, body.ExpiresAt, body.PresetKey),
+                ct);
+            return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error);
+        });
+
+        g.MapDelete("/", async (ISender sender, IUserContext ctx, CancellationToken ct) =>
+        {
+            var result = await sender.Send(new ClearUserStatusCommand(ctx.UserId), ct);
+            return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error);
+        });
+    }
+
+    public sealed class SetCustomStatusBody
+    {
+        public string? Emoji { get; set; }
+        public string? Text { get; set; }
+        public DateTime? ExpiresAt { get; set; }
+        public string? PresetKey { get; set; }
+    }
+}

client-mobile/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Apr 14 00:27:15 MSK 2026
-gradle.version=8.5

client-mobile/.gradle/config.properties

@@ -1,2 +0,0 @@
-#Tue Apr 14 00:13:58 MSK 2026
-java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

client-mobile/app/build.gradle.kts

@@ -1,124 +0,0 @@
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.dagger.hilt.android")
-    id("com.google.gms.google-services")
-    kotlin("kapt")
-}
-
-android {
-    namespace = "ru.knot.messager"
-    compileSdk = 34
-
-    defaultConfig {
-        applicationId = "ru.knot.messager"
-        minSdk = 26
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-    }
-    
-    // Подключаем все наши папки с кодом как sourceSets
-    sourceSets {
-        getByName("main") {
-            java.srcDirs(
-                "src/main/kotlin",
-                "../auth",
-                "../chats",
-                "../core",
-                "../calls",
-                "../stories",
-                "../contacts",
-                "../profiles",
-                "../settings",
-                "../navigation"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-}
-
-dependencies {
-    // AndroidX & UI
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation(platform("androidx.compose:compose-bom:2023.10.01"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3")
-    implementation("com.google.android.material:material:1.11.0")
-    implementation("androidx.navigation:navigation-compose:2.7.5")
-    implementation("androidx.compose.material:material-icons-extended")
-
-    // Hilt
-    implementation("com.google.dagger:hilt-android:2.48")
-    kapt("com.google.dagger:hilt-android-compiler:2.48")
-    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
-
-    // Network & SignalR
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
-    implementation("com.microsoft.signalr:signalr:7.0.0")
-
-    // WebRTC
-    implementation("com.github.webrtc-sdk:android:104.5112.01")
-
-    // Media3 (ExoPlayer)
-    implementation("androidx.media3:media3-exoplayer:1.2.0")
-    implementation("androidx.media3:media3-ui:1.2.0")
-    implementation("androidx.media3:media3-common:1.2.0")
-
-    // Images & GIF
-    implementation("io.coil-kt:coil-compose:2.5.0")
-    implementation("io.coil-kt:coil-gif:2.5.0")
-    implementation("io.coil-kt:coil-svg:2.5.0")
-
-    // Security
-    implementation("androidx.security:security-crypto:1.1.0-alpha06")
-
-    // UCrop (Image Cropping)
-    implementation("com.github.yalantis:ucrop:2.2.8")
-
-    // Firebase (Push Notifications)
-    implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
-    implementation("com.google.firebase:firebase-messaging-ktx")
-    implementation("com.google.firebase:firebase-analytics-ktx")
-
-    // Testing
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-}

client-mobile/app/google-services.json

@@ -1,29 +0,0 @@
-{
-  "project_info": {
-    "project_number": "483917912506",
-    "project_id": "knot-bad1a",
-    "storage_bucket": "knot-bad1a.firebasestorage.app"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:483917912506:android:cd39213364869ef9e82583",
-        "android_client_info": {
-          "package_name": "ru.knot.messager"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBAL_bZJYaa7rGERLX63LeFXz-__JXRWQY"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

client-mobile/app/src/main/AndroidManifest.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ru.knot.messager">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
-    <application
-        android:name="com.knot.messenger.MainApplication"
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.KnotMessenger">
-
-        <activity
-            android:name="com.knot.messenger.MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.KnotMessenger">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name="core.notifications.data.ForkFirebaseMessagingService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
-    </application>
-</manifest>

client-mobile/app/src/main/kotlin/com/knot/messenger/MainActivity.kt

@@ -1,29 +0,0 @@
-package com.knot.messenger
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import dagger.hilt.android.AndroidEntryPoint
-import navigation.AppNavigation
-import core.presentation.theme.ForkMessengerTheme
-
-@AndroidEntryPoint
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            ForkMessengerTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    AppNavigation()
-                }
-            }
-        }
-    }
-}

client-mobile/app/src/main/kotlin/com/knot/messenger/MainApplication.kt

@@ -1,7 +0,0 @@
-package com.knot.messenger
-
-import android.app.Application
-import dagger.hilt.android.HiltAndroidApp
-
-@HiltAndroidApp
-class MainApplication : Application()

client-mobile/app/src/main/res/values-en/strings.xml

@@ -1,56 +0,0 @@
-<resources>
-    <string name="app_name">ForkMessenger</string>
-    <string name="login">Login</string>
-    <string name="register">Register</string>
-    <string name="username">Username</string>
-    <string name="password">Password</string>
-    <string name="display_name">Display Name</string>
-    <string name="settings">Settings</string>
-    <string name="save">Save</string>
-    <string name="back">Back</string>
-    <string name="server_connection">Server Connection</string>
-    <string name="api_base_url">API Base URL</string>
-    <string name="server_features">Server Features</string>
-    <string name="stories">Stories</string>
-    <string name="polls">Polls</string>
-    <string name="calls">Calls</string>
-    <string name="groups">Groups</string>
-    <string name="enabled">Enabled</string>
-    <string name="disabled">Disabled</string>
-    <string name="limits">Limits</string>
-    <string name="max_file_size">Max File Size</string>
-    <string name="max_group_members">Max Group Members</string>
-    <string name="message">Message</string>
-    <string name="call">Call</string>
-    <string name="block">Block</string>
-    <string name="profile">Profile</string>
-    <string name="confirm_password">Confirm Password</string>
-    <string name="passwords_not_match">Passwords do not match</string>
-    <string name="no_account_register">Don\'t have an account? Register</string>
-    <string name="already_have_account">Already have an account? Login</string>
-    <string name="error_occurred">An error occurred</string>
-    <string name="loading">Loading...</string>
-    <string name="chats_title">Chats</string>
-    <string name="contacts_title">Contacts</string>
-    <string name="stories_title">Stories</string>
-    <string name="create_story">Create Story</string>
-    <string name="send_message_hint">Type a message...</string>
-    <string name="reply_to_user">Reply to %1$s...</string>
-    <string name="story_editor">STORY EDITOR</string>
-    <string name="publish">PUBLISH</string>
-    <string name="start_creation">START CREATION</string>
-    <string name="text_tool">TEXT</string>
-    <string name="crop_tool">CROP</string>
-    <string name="stickers_tool">STICKERS</string>
-    <string name="brush_tool">BRUSH</string>
-    <string name="filters_tool">FILTERS</string>
-    <string name="remove">Remove</string>
-    <string name="no_chats_found">No chats found</string>
-    <string name="typing">typing...</string>
-    <string name="video_call">Video Call</string>
-    <string name="emoji">Emoji</string>
-    <string name="attach">Attach</string>
-    <string name="message_placeholder">Message...</string>
-    <string name="voice_message">Voice Message</string>
-    <string name="send">Send</string>
-</resources>

client-mobile/app/src/main/res/values/strings.xml

@@ -1,77 +0,0 @@
-<resources>
-    <string name="app_name">ForkMessenger</string>
-    <string name="login">Войти</string>
-    <string name="register">Регистрация</string>
-    <string name="username">Имя пользователя</string>
-    <string name="password">Пароль</string>
-    <string name="display_name">Отображаемое имя</string>
-    <string name="settings">Настройки</string>
-    <string name="save">Сохранить</string>
-    <string name="back">Назад</string>
-    <string name="server_connection">Подключение к серверу</string>
-    <string name="api_base_url">API Base URL</string>
-    <string name="server_features">Функции сервера</string>
-    <string name="stories">Истории</string>
-    <string name="polls">Опросы</string>
-    <string name="calls">Звонки</string>
-    <string name="groups">Группы</string>
-    <string name="enabled">Включено</string>
-    <string name="disabled">Отключено</string>
-    <string name="limits">Лимиты</string>
-    <string name="max_file_size">Макс. размер файла</string>
-    <string name="max_group_members">Макс. участников в группе</string>
-    <string name="message">Сообщение</string>
-    <string name="call">Позвонить</string>
-    <string name="block">Заблокировать</string>
-    <string name="profile">Профиль</string>
-    <string name="confirm_password">Подтвердите пароль</string>
-    <string name="passwords_not_match">Пароли не совпадают</string>
-    <string name="no_account_register">Нет аккаунта? Зарегистрироваться</string>
-    <string name="already_have_account">Уже есть аккаунт? Войти</string>
-    <string name="error_occurred">Произошла ошибка</string>
-    <string name="loading">Загрузка...</string>
-    <string name="chats_title">Чаты</string>
-    <string name="contacts_title">Контакты</string>
-    <string name="stories_title">Истории</string>
-    <string name="create_story">Создать историю</string>
-    <string name="send_message_hint">Напишите сообщение...</string>
-    <string name="reply_to_user">Ответить %1$s...</string>
-    <string name="story_editor">РЕДАКТОР ИСТОРИЙ</string>
-    <string name="publish">ОПУБЛИКОВАТЬ</string>
-    <string name="start_creation">НАЧАТЬ СОЗДАНИЕ</string>
-    <string name="text_tool">ТЕКСТ</string>
-    <string name="crop_tool">ОБРЕЗКА</string>
-    <string name="stickers_tool">СТИКЕРЫ</string>
-    <string name="brush_tool">КИСТЬ</string>
-    <string name="filters_tool">ФИЛЬТРЫ</string>
-    <string name="remove">Удалить</string>
-    <string name="no_chats_found">Чаты не найдены</string>
-    <string name="typing">печатает...</string>
-    <string name="video_call">Видеозвонок</string>
-    <string name="emoji">Эмодзи</string>
-    <string name="attach">Прикрепить</string>
-    <string name="message_placeholder">Сообщение...</string>
-    <string name="voice_message">Голосовое сообщение</string>
-    <string name="send">Отправить</string>
-    <string name="search_hint">Поиск...</string>
-    <string name="online">В сети</string>
-    <string name="last_seen">Был(а): %1$s</string>
-    <string name="last_seen_recently">недавно</string>
-    <string name="all">Все</string>
-    <string name="online_tab">Онлайн</string>
-    <string name="blocked">Заблокированные</string>
-    <string name="media">Медиа</string>
-    <string name="notifications">Уведомления</string>
-    <string name="mute">Без звука</string>
-    <string name="unmute">Включить звук</string>
-    <string name="log_out">Выйти из аккаунта</string>
-    <string name="bio">О себе</string>
-    <string name="edit_profile">Редактировать профиль</string>
-    <string name="username_label">Имя пользователя</string>
-    <string name="change_photo">Изменить фото</string>
-    <string name="cancel">Отмена</string>
-    <string name="crop">Обрезать</string>
-    <string name="chats">Чаты</string>
-    <string name="contacts_tab">Контакты</string>
-    <string name="profile_tab">Профиль</string>
-</resources>

client-mobile/app/src/main/res/values/styles.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.KnotMessenger" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="android:statusBarColor">#0F0F10</item>
-        <item name="android:windowBackground">#0F0F10</item>
-    </style>
-</resources>

client-mobile/auth/data/remote/api/AuthApi.kt

@@ -1,27 +0,0 @@
-package auth.data.remote.api
-
-import auth.data.remote.dto.AuthRequest
-import auth.data.remote.dto.AuthResponse
-import core.domain.model.ServerConfigModel
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Headers
-import retrofit2.http.POST
-
-interface AuthApi {
-    @POST("auth/login")
-    @Headers("Cache-Control: no-cache")
-    suspend fun login(@Body request: AuthRequest): AuthResponse
-
-    @POST("auth/register")
-    @Headers("Cache-Control: no-cache")
-    suspend fun register(@Body request: AuthRequest): AuthResponse
-
-    @GET("config")
-    @Headers("Cache-Control: no-cache")
-    suspend fun getConfig(): ServerConfigModel
-
-    @POST("auth/push-token")
-    @Headers("Cache-Control: no-cache")
-    suspend fun updatePushToken(@Body token: String): Unit
-}

client-mobile/auth/data/remote/dto/AuthDtos.kt

@@ -1,23 +0,0 @@
-package auth.data.remote.dto
-
-import com.google.gson.annotations.SerializedName
-
-data class AuthRequest(
-    @SerializedName("userName") val userName: String,
-    @SerializedName("password") val password: String
-)
-
-data class AuthResponse(
-    @SerializedName("accessToken") val accessToken: String?,
-    @SerializedName("user") val user: UserDto?,
-    @SerializedName("userId") val userId: String?,
-    @SerializedName("username") val username: String?,
-    @SerializedName("displayName") val displayName: String?
-)
-
-data class UserDto(
-    @SerializedName("id") val id: String,
-    @SerializedName("userName") val userName: String,
-    @SerializedName("displayName") val displayName: String?,
-    @SerializedName("avatarUrl") val avatarUrl: String?
-)

client-mobile/auth/data/repository/AuthRepositoryImpl.kt

@@ -1,78 +0,0 @@
-package auth.data.repository
-
-import auth.data.remote.api.AuthApi
-import auth.data.remote.dto.AuthRequest
-import auth.domain.model.AuthResult
-import auth.domain.repository.AuthRepository
-import core.network.ServerConfig
-import core.security.TokenManager
-import javax.inject.Inject
-
-class AuthRepositoryImpl @Inject constructor(
-    private val api: AuthApi,
-    private val tokenManager: TokenManager,
-    private val serverConfig: ServerConfig
-) : AuthRepository {
-
-    override suspend fun login(userName: String, password: String): Result<AuthResult> {
-        return try {
-            val response = api.login(AuthRequest(userName, password))
-            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
-            val userId = response.userId ?: ""
-            
-            tokenManager.saveToken(token, userId)
-            fetchConfig()
-            Result.success(
-                AuthResult(
-                    token = token,
-                    userId = userId,
-                    userName = response.username ?: userName,
-                    displayName = response.displayName ?: response.username ?: userName,
-                    avatarUrl = null
-                )
-            )
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    override suspend fun register(userName: String, password: String): Result<AuthResult> {
-        return try {
-            val response = api.register(AuthRequest(userName, password))
-            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
-            val userId = response.userId ?: ""
-
-            tokenManager.saveToken(token, userId)
-            fetchConfig()
-            Result.success(
-                AuthResult(
-                    token = token,
-                    userId = userId,
-                    userName = response.username ?: userName,
-                    displayName = response.displayName ?: response.username ?: userName,
-                    avatarUrl = null
-                )
-            )
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    override suspend fun logout() {
-        tokenManager.deleteToken()
-    }
-
-    override fun isAuthenticated(): Boolean {
-        return tokenManager.getToken() != null
-    }
-
-    override suspend fun fetchConfig(): Result<Unit> {
-        return try {
-            val config = api.getConfig()
-            serverConfig.saveServerConfig(config)
-            Result.success(Unit)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-}

client-mobile/auth/di/AuthModule.kt

@@ -1,34 +0,0 @@
-package auth.di
-
-import auth.data.remote.api.AuthApi
-import auth.data.repository.AuthRepositoryImpl
-import auth.domain.repository.AuthRepository
-import core.network.ServerConfig
-import core.security.TokenManager
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object AuthModule {
-
-    @Provides
-    @Singleton
-    fun provideAuthApi(retrofit: Retrofit): AuthApi {
-        return retrofit.create(AuthApi::class.java)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAuthRepository(
-        api: AuthApi,
-        tokenManager: TokenManager,
-        serverConfig: ServerConfig
-    ): AuthRepository {
-        return AuthRepositoryImpl(api, tokenManager, serverConfig)
-    }
-}

client-mobile/auth/domain/model/AuthModels.kt

@@ -1,9 +0,0 @@
-package auth.domain.model
-
-data class AuthResult(
-    val token: String,
-    val userId: String,
-    val userName: String,
-    val displayName: String,
-    val avatarUrl: String?
-)

client-mobile/auth/domain/repository/AuthRepository.kt

@@ -1,11 +0,0 @@
-package auth.domain.repository
-
-import auth.domain.model.AuthResult
-
-interface AuthRepository {
-    suspend fun login(userName: String, password: String): Result<AuthResult>
-    suspend fun register(userName: String, password: String): Result<AuthResult>
-    suspend fun logout()
-    suspend fun fetchConfig(): Result<Unit>
-    fun isAuthenticated(): Boolean
-}

client-mobile/auth/presentation/AuthViewModel.kt

@@ -1,57 +0,0 @@
-package auth.presentation
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import auth.domain.repository.AuthRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-data class AuthState(
-    val isLoading: Boolean = false,
-    val error: String? = null,
-    val isAuthenticated: Boolean = false
-)
-
-@HiltViewModel
-class AuthViewModel @Inject constructor(
-    private val repository: AuthRepository
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(AuthState(isAuthenticated = repository.isAuthenticated()))
-    val state: StateFlow<AuthState> = _state.asStateFlow()
-
-    fun checkAuth() {
-        _state.update { it.copy(isAuthenticated = repository.isAuthenticated()) }
-    }
-
-    fun login(userName: String, password: String) {
-        viewModelScope.launch {
-            _state.update { it.copy(isLoading = true, error = null) }
-            repository.login(userName, password)
-                .onSuccess {
-                    _state.update { it.copy(isLoading = false, isAuthenticated = true) }
-                }
-                .onFailure { e ->
-                    _state.update { it.copy(isLoading = false, error = e.message) }
-                }
-        }
-    }
-
-    fun register(userName: String, password: String) {
-        viewModelScope.launch {
-            _state.update { it.copy(isLoading = true, error = null) }
-            repository.register(userName, password)
-                .onSuccess {
-                    _state.update { it.copy(isLoading = false, isAuthenticated = true) }
-                }
-                .onFailure { e ->
-                    _state.update { it.copy(isLoading = false, error = e.message) }
-                }
-        }
-    }
-}

client-mobile/auth/presentation/LoginScreen.kt

@@ -1,95 +0,0 @@
-package auth.presentation
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.unit.dp
-import ru.knot.messager.R
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LoginScreen(
-    viewModel: AuthViewModel,
-    onNavigateToRegister: () -> Unit,
-    onNavigateToSettings: () -> Unit,
-    onLoginSuccess: () -> Unit
-) {
-    val state by viewModel.state.collectAsState()
-    var userName by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
-
-    LaunchedEffect(state.isAuthenticated) {
-        if (state.isAuthenticated) {
-            onLoginSuccess()
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text(stringResource(R.string.login)) },
-                actions = {
-                    IconButton(onClick = onNavigateToSettings) {
-                        Icon(Icons.Default.Settings, contentDescription = stringResource(R.string.settings))
-                    }
-                }
-            )
-        }
-    ) { paddingValues ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-                .padding(16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
-        ) {
-            OutlinedTextField(
-                value = userName,
-                onValueChange = { userName = it },
-                label = { Text(stringResource(R.string.username)) },
-                modifier = Modifier.fillMaxWidth(),
-                singleLine = true
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            OutlinedTextField(
-                value = password,
-                onValueChange = { password = it },
-                label = { Text(stringResource(R.string.password)) },
-                modifier = Modifier.fillMaxWidth(),
-                visualTransformation = PasswordVisualTransformation(),
-                singleLine = true
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            
-            if (state.isLoading) {
-                CircularProgressIndicator()
-            } else {
-                Button(
-                    onClick = { viewModel.login(userName, password) },
-                    modifier = Modifier.fillMaxWidth(),
-                    enabled = userName.isNotBlank() && password.isNotBlank()
-                ) {
-                    Text(stringResource(R.string.login))
-                }
-                TextButton(onClick = onNavigateToRegister) {
-                    Text(stringResource(R.string.no_account_register))
-                }
-            }
-
-            if (state.error != null) {
-                Text(
-                    text = state.error!!,
-                    color = MaterialTheme.colorScheme.error,
-                    modifier = Modifier.padding(top = 8.dp)
-                )
-            }
-        }
-    }
-}

client-mobile/auth/presentation/RegisterScreen.kt

@@ -1,106 +0,0 @@
-package auth.presentation
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.unit.dp
-import ru.knot.messager.R
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun RegisterScreen(
-    viewModel: AuthViewModel,
-    onNavigateToLogin: () -> Unit,
-    onRegisterSuccess: () -> Unit
-) {
-    val state by viewModel.state.collectAsState()
-    var userName by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
-    var confirmPassword by remember { mutableStateOf("") }
-    var errorMessage by remember { mutableStateOf<String?>(null) }
-    
-    val passwordsNotMatchMsg = stringResource(R.string.passwords_not_match)
-
-    LaunchedEffect(state.isAuthenticated) {
-        if (state.isAuthenticated) {
-            onRegisterSuccess()
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(title = { Text(stringResource(R.string.register)) })
-        }
-    ) { paddingValues ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-                .padding(16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
-        ) {
-            OutlinedTextField(
-                value = userName,
-                onValueChange = { userName = it },
-                label = { Text(stringResource(R.string.username)) },
-                modifier = Modifier.fillMaxWidth(),
-                singleLine = true
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            OutlinedTextField(
-                value = password,
-                onValueChange = { password = it },
-                label = { Text(stringResource(R.string.password)) },
-                modifier = Modifier.fillMaxWidth(),
-                visualTransformation = PasswordVisualTransformation(),
-                singleLine = true
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            OutlinedTextField(
-                value = confirmPassword,
-                onValueChange = { confirmPassword = it },
-                label = { Text(stringResource(R.string.confirm_password)) },
-                modifier = Modifier.fillMaxWidth(),
-                visualTransformation = PasswordVisualTransformation(),
-                singleLine = true
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-
-            if (state.isLoading) {
-                CircularProgressIndicator()
-            } else {
-                Button(
-                    onClick = {
-                        if (password == confirmPassword) {
-                            errorMessage = null
-                            viewModel.register(userName, password)
-                        } else {
-                            errorMessage = passwordsNotMatchMsg
-                        }
-                    },
-                    modifier = Modifier.fillMaxWidth(),
-                    enabled = userName.isNotBlank() && password.isNotBlank() && confirmPassword.isNotBlank()
-                ) {
-                    Text(stringResource(R.string.register))
-                }
-                TextButton(onClick = onNavigateToLogin) {
-                    Text(stringResource(R.string.already_have_account))
-                }
-            }
-
-            val displayError = state.error ?: errorMessage
-            if (displayError != null) {
-                Text(
-                    text = displayError,
-                    color = MaterialTheme.colorScheme.error,
-                    modifier = Modifier.padding(top = 8.dp)
-                )
-            }
-        }
-    }
-}

client-mobile/build.gradle.kts

@@ -1,8 +0,0 @@
-// Top-level build file
-plugins {
-    id("com.android.application") version "8.2.0" apply false
-    id("com.android.library") version "8.2.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("com.google.dagger.hilt.android") version "2.48" apply false
-    id("com.google.gms.google-services") version "4.4.0" apply false
-}

client-mobile/calls/data/remote/CallAudioManager.kt

@@ -1,43 +0,0 @@
-package calls.data.remote
-
-import android.content.Context
-import android.media.AudioAttributes
-import android.media.AudioFocusRequest
-import android.media.AudioManager
-import android.os.Build
-
-class CallAudioManager(private val context: Context) {
-    private val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-    private var originalMode: Int = AudioManager.MODE_NORMAL
-    private var originalIsSpeakerphoneOn: Boolean = false
-
-    fun startCallMode(isVideoCall: Boolean) {
-        originalMode = audioManager.mode
-        originalIsSpeakerphoneOn = audioManager.isSpeakerphoneOn
-
-        audioManager.mode = AudioManager.MODE_IN_COMMUNICATION
-        setSpeakerphoneOn(isVideoCall)
-
-        // Запрашиваем фокус аудио
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val playbackAttributes = AudioAttributes.Builder()
-                .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                .build()
-            val focusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
-                .setAudioAttributes(playbackAttributes)
-                .build()
-            audioManager.requestAudioFocus(focusRequest)
-        }
-    }
-
-    fun setSpeakerphoneOn(on: Boolean) {
-        audioManager.isSpeakerphoneOn = on
-    }
-
-    fun stopCallMode() {
-        audioManager.mode = originalMode
-        audioManager.isSpeakerphoneOn = originalIsSpeakerphoneOn
-        audioManager.abandonAudioFocus(null)
-    }
-}

client-mobile/calls/data/remote/GroupWebRtcManager.kt

@@ -1,46 +0,0 @@
-package calls.data.remote
-
-import android.content.Context
-import org.webrtc.*
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GroupWebRtcManager @Inject constructor(private val context: Context) {
-    private val peerConnections = ConcurrentHashMap<String, PeerConnection>()
-    private val factory: PeerConnectionFactory by lazy { createFactory() }
-    
-    private fun createFactory(): PeerConnectionFactory {
-        PeerConnectionFactory.initialize(
-            PeerConnectionFactory.InitializationOptions.builder(context).createInitializationOptions()
-        )
-        return PeerConnectionFactory.builder()
-            .setVideoEncoderFactory(DefaultVideoEncoderFactory(EglBase.create().eglBaseContext, true, true))
-            .setVideoDecoderFactory(DefaultVideoDecoderFactory(EglBase.create().eglBaseContext))
-            .createPeerConnectionFactory()
-    }
-
-    fun addParticipant(userId: String, observer: PeerConnection.Observer): PeerConnection? {
-        val iceServers = listOf(
-            PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()
-        )
-        val pc = factory.createPeerConnection(iceServers, observer)
-        if (pc != null) {
-            peerConnections[userId] = pc
-        }
-        return pc
-    }
-
-    fun removeParticipant(userId: String) {
-        peerConnections[userId]?.dispose()
-        peerConnections.remove(userId)
-    }
-
-    fun getPeerConnection(userId: String): PeerConnection? = peerConnections[userId]
-
-    fun closeAll() {
-        peerConnections.values.forEach { it.dispose() }
-        peerConnections.clear()
-    }
-}

client-mobile/calls/data/remote/WebRtcManager.kt

@@ -1,50 +0,0 @@
-package calls.data.remote
-
-import android.content.Context
-import org.webrtc.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class WebRtcManager @Inject constructor(private val context: Context) {
-    private var peerConnection: PeerConnection? = null
-    private val factory: PeerConnectionFactory by lazy { createFactory() }
-    
-    // Аудио и видео источники
-    private val videoSource by lazy { factory.createVideoSource(false) }
-    private val audioSource by lazy { factory.createAudioSource(MediaConstraints()) }
-
-    private fun createFactory(): PeerConnectionFactory {
-        PeerConnectionFactory.initialize(
-            PeerConnectionFactory.InitializationOptions.builder(context).createInitializationOptions()
-        )
-        return PeerConnectionFactory.builder()
-            .setVideoEncoderFactory(DefaultVideoEncoderFactory(EglBase.create().eglBaseContext, true, true))
-            .setVideoDecoderFactory(DefaultVideoDecoderFactory(EglBase.create().eglBaseContext))
-            .createPeerConnectionFactory()
-    }
-
-    fun initializePeerConnection(observer: PeerConnection.Observer) {
-        val iceServers = listOf(
-            PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()
-        )
-        peerConnection = factory.createPeerConnection(iceServers, observer)
-    }
-
-    fun createOffer(observer: SdpObserver) {
-        peerConnection?.createOffer(observer, MediaConstraints())
-    }
-
-    fun setRemoteDescription(sdp: String, type: SessionDescription.Type, observer: SdpObserver) {
-        peerConnection?.setRemoteDescription(observer, SessionDescription(type, sdp))
-    }
-
-    fun addIceCandidate(candidate: IceCandidate) {
-        peerConnection?.addIceCandidate(candidate)
-    }
-
-    fun close() {
-        peerConnection?.dispose()
-        peerConnection = null
-    }
-}

client-mobile/calls/presentation/CallScreen.kt

@@ -1,148 +0,0 @@
-package calls.presentation
-
-import androidx.compose.animation.*
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import core.presentation.components.AppAvatar
-import ru.knot.messager.R
-
-@Composable
-fun CallScreen(
-    viewModel: CallViewModel,
-    onBack: () -> Unit
-) {
-    val state by viewModel.state.collectAsState()
-
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(
-                Brush.verticalGradient(
-                    colors = listOf(
-                        Color(0xFF0F0F10),
-                        Color(0xFF161618),
-                        Color(0xFF6366F1).copy(alpha = 0.2f)
-                    )
-                )
-            )
-    ) {
-        // Контент звонка (Аватар или Видео)
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(top = 100.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            AppAvatar(
-                url = state.callerAvatar,
-                name = state.callerName,
-                size = 140.dp
-            )
-            
-            Spacer(modifier = Modifier.height(24.dp))
-            
-            Text(
-                text = state.callerName,
-                style = MaterialTheme.typography.headlineMedium,
-                color = Color.White,
-                fontWeight = FontWeight.Bold
-            )
-            
-            Text(
-                text = when (state.status) {
-                    CallStatus.INCOMING -> "Входящий звонок..."
-                    CallStatus.OUTGOING -> "Вызов..."
-                    CallStatus.CONNECTED -> "00:00" // TODO: Timer
-                    CallStatus.ENDED -> "Звонок завершен"
-                    else -> ""
-                },
-                style = MaterialTheme.typography.bodyLarge,
-                color = Color.White.copy(alpha = 0.7f)
-            )
-        }
-
-        // Кнопки управления (Внизу)
-        Box(
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .padding(bottom = 60.dp)
-                .fillMaxWidth(),
-            contentAlignment = Alignment.Center
-        ) {
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(32.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                if (state.status == CallStatus.INCOMING) {
-                    // Кнопка отклонить
-                    CallActionButton(
-                        icon = Icons.Default.CallEnd,
-                        backgroundColor = Color.Red,
-                        onClick = { viewModel.endCall(); onBack() }
-                    )
-                    // Кнопка принять
-                    CallActionButton(
-                        icon = Icons.Default.Call,
-                        backgroundColor = Color(0xFF10B981), // Green
-                        onClick = { viewModel.acceptCall() }
-                    )
-                } else {
-                    // Стандартные кнопки во время разговора
-                    IconButton(
-                        onClick = { /* viewModel.toggleMic() */ },
-                        modifier = Modifier.size(56.dp).clip(CircleShape).background(Color.White.copy(alpha = 0.1f))
-                    ) {
-                        Icon(Icons.Default.Mic, contentDescription = null, tint = Color.White)
-                    }
-
-                    CallActionButton(
-                        icon = Icons.Default.CallEnd,
-                        backgroundColor = Color.Red,
-                        onClick = { viewModel.endCall(); onBack() }
-                    )
-
-                    IconButton(
-                        onClick = { /* viewModel.toggleSpeaker() */ },
-                        modifier = Modifier.size(56.dp).clip(CircleShape).background(Color.White.copy(alpha = 0.1f))
-                    ) {
-                        Icon(Icons.Default.VolumeUp, contentDescription = null, tint = Color.White)
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun CallActionButton(
-    icon: androidx.compose.ui.graphics.vector.ImageVector,
-    backgroundColor: Color,
-    onClick: () -> Unit
-) {
-    FloatingActionButton(
-        onClick = onClick,
-        containerColor = backgroundColor,
-        contentColor = Color.White,
-        shape = CircleShape,
-        modifier = Modifier.size(64.dp)
-    ) {
-        Icon(icon, contentDescription = null, modifier = Modifier.size(32.dp))
-    }
-}

client-mobile/calls/presentation/CallViewModel.kt

@@ -1,99 +0,0 @@
-package calls.presentation
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import calls.data.remote.WebRtcManager
-import chats.data.remote.signalr.ChatEvent
-import chats.data.remote.signalr.ChatHubClient
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import org.webrtc.*
-import javax.inject.Inject
-
-enum class CallStatus { IDLE, INCOMING, OUTGOING, CONNECTED, ENDED }
-
-data class CallState(
-    val status: CallStatus = CallStatus.IDLE,
-    val chatId: String? = null,
-    val callerName: String = "",
-    val callerAvatar: String? = null,
-    val isMuted: Boolean = false,
-    val isSpeakerOn: Boolean = false,
-    val localVideoTrack: VideoTrack? = null,
-    val remoteVideoTrack: VideoTrack? = null
-)
-
-@HiltViewModel
-class CallViewModel @Inject constructor(
-    private val webRtcManager: WebRtcManager,
-    private val signalrClient: ChatHubClient
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(CallState())
-    val state: StateFlow<CallState> = _state.asStateFlow()
-
-    init {
-        observeSignaling()
-    }
-
-    private fun observeSignaling() {
-        signalrClient.events
-            .onEach { event ->
-                when (event) {
-                    is ChatEvent.CallIncoming -> onIncomingCall(event)
-                    is ChatEvent.CallAnswered -> onCallAnswered(event)
-                    is ChatEvent.IceCandidateReceived -> onIceCandidate(event)
-                    is ChatEvent.CallEnded -> onCallEnded()
-                    else -> Unit
-                }
-            }
-            .launchIn(viewModelScope)
-    }
-
-    private fun onIncomingCall(event: ChatEvent.CallIncoming) {
-        _state.update { it.copy(
-            status = CallStatus.INCOMING,
-            chatId = event.chatId,
-            callerName = "User ${event.from}" // TODO: Load actual user info
-        ) }
-        // Set remote description from offer
-        webRtcManager.setRemoteDescription(event.offer, SessionDescription.Type.OFFER, object : SdpObserver {
-            override fun onCreateSuccess(p0: SessionDescription?) {}
-            override fun onSetSuccess() {}
-            override fun onCreateFailure(p0: String?) {}
-            override fun onSetFailure(p0: String?) {}
-        })
-    }
-
-    private fun onCallAnswered(event: ChatEvent.CallAnswered) {
-        _state.update { it.copy(status = CallStatus.CONNECTED) }
-        webRtcManager.setRemoteDescription(event.answer, SessionDescription.Type.ANSWER, object : SdpObserver {
-            override fun onCreateSuccess(p0: SessionDescription?) {}
-            override fun onSetSuccess() {}
-            override fun onCreateFailure(p0: String?) {}
-            override fun onSetFailure(p0: String?) {}
-        })
-    }
-
-    private fun onIceCandidate(event: ChatEvent.IceCandidateReceived) {
-        // Parse candidate JSON and add to peer connection
-        // webRtcManager.addIceCandidate(...)
-    }
-
-    private fun onCallEnded() {
-        _state.update { it.copy(status = CallStatus.ENDED) }
-        webRtcManager.close()
-    }
-
-    fun acceptCall() {
-        val chatId = _state.value.chatId ?: return
-        // Create answer and send via SignalR
-    }
-
-    fun endCall() {
-        val chatId = _state.value.chatId ?: return
-        // Send call_end via SignalR
-        onCallEnded()
-    }
-}

client-mobile/calls/presentation/GroupCallViewModel.kt

@@ -1,87 +0,0 @@
-package calls.presentation
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import chats.data.remote.signalr.ChatHubClient
-import chats.data.remote.signalr.ChatEvent
-import calls.data.remote.GroupWebRtcManager
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import org.webrtc.*
-import javax.inject.Inject
-
-data class ParticipantState(
-    val userId: String,
-    val videoTrack: VideoTrack? = null,
-    val isAudioMuted: Boolean = false,
-    val isVideoDisabled: Boolean = false
-)
-
-data class GroupCallState(
-    val chatId: String? = null,
-    val participants: Map<String, ParticipantState> = emptyMap(),
-    val isMicEnabled: Boolean = true,
-    val isCameraEnabled: Boolean = true
-)
-
-@HiltViewModel
-class GroupCallViewModel @Inject constructor(
-    private val webRtcManager: GroupWebRtcManager,
-    private val signalrClient: ChatHubClient
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(GroupCallState())
-    val state: StateFlow<GroupCallState> = _state.asStateFlow()
-
-    init {
-        observeSignalREvents()
-    }
-
-    private fun observeSignalREvents() {
-        signalrClient.events.onEach { event ->
-            when (event) {
-                is ChatEvent.GroupCallUserJoined -> handleUserJoined(event.userId)
-                is ChatEvent.GroupCallUserLeft -> handleUserLeft(event.userId)
-                is ChatEvent.GroupCallOffer -> handleOffer(event.from, event.offer)
-                is ChatEvent.GroupCallAnswer -> handleAnswer(event.from, event.answer)
-                // Дополнительные обработчики ICE кандидатов и т.д.
-                else -> Unit
-            }
-        }.launchIn(viewModelScope)
-    }
-
-    private fun handleUserJoined(userId: String) {
-        // Создаем PeerConnection для нового участника
-        // Логика идентична портированному CallModal.tsx
-        _state.update { it.copy(participants = it.participants + (userId to ParticipantState(userId))) }
-    }
-
-    private fun handleUserLeft(userId: String) {
-        webRtcManager.removeParticipant(userId)
-        _state.update { it.copy(participants = it.participants - userId) }
-    }
-
-    private fun handleOffer(from: String, sdp: String) {
-        // Установка RemoteDescription и создание Answer
-    }
-
-    private fun handleAnswer(from: String, sdp: String) {
-        // Установка RemoteDescription
-    }
-
-    fun toggleMic() {
-        _state.update { it.copy(isMicEnabled = !it.isMicEnabled) }
-        // Логика управления AudioTrack
-    }
-
-    fun toggleCamera() {
-        _state.update { it.copy(isCameraEnabled = !it.isCameraEnabled) }
-        // Логика управления VideoTrack
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        webRtcManager.closeAll()
-    }
-}

client-mobile/calls/presentation/components/VideoGrid.kt

@@ -1,67 +0,0 @@
-package calls.presentation.components
-
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import org.webrtc.EglBase
-import org.webrtc.SurfaceViewRenderer
-import org.webrtc.VideoTrack
-
-@Composable
-fun VideoGrid(
-    participants: Map<String, VideoTrack?>,
-    localVideoTrack: VideoTrack?
-) {
-    val eglBaseContext = remember { EglBase.create().eglBaseContext }
-    val allVideoTracks = remember(participants, localVideoTrack) {
-        listOfNotNull(localVideoTrack) + participants.values.filterNotNull()
-    }
-
-    LazyVerticalGrid(
-        columns = GridCells.Fixed(if (allVideoTracks.size <= 2) 1 else 2),
-        modifier = Modifier.fillMaxSize(),
-        contentPadding = PaddingValues(8.dp)
-    ) {
-        items(allVideoTracks) { track ->
-            Box(
-                modifier = Modifier
-                    .padding(4.dp)
-                    .fillMaxWidth()
-                    .aspectRatio(if (allVideoTracks.size == 1) 0.6f else 1f)
-            ) {
-                VideoRenderer(videoTrack = track, eglBaseContext = eglBaseContext)
-            }
-        }
-    }
-}
-
-@Composable
-fun VideoRenderer(
-    videoTrack: VideoTrack,
-    eglBaseContext: EglBase.Context
-) {
-    AndroidView(
-        factory = { context ->
-            SurfaceViewRenderer(context).apply {
-                init(eglBaseContext, null)
-                layoutParams = ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT
-                )
-            }
-        },
-        update = { view ->
-            videoTrack.addSink(view)
-        },
-        onRelease = { view ->
-            videoTrack.removeSink(view)
-            view.release()
-        }
-    )
-}

client-mobile/chats/data/remote/api/ChatApi.kt

@@ -1,108 +0,0 @@
-package chats.data.remote.api
-
-import chats.data.remote.dto.ChatDto
-import chats.data.remote.dto.MessageDto
-import retrofit2.http.*
-
-data class SendMessageRequest(
-    val content: String?,
-    val type: String = "text",
-    val attachments: List<AttachmentRequest>? = null,
-    val replyToId: String? = null,
-    val quote: String? = null
-)
-
-data class AttachmentRequest(
-    val type: String,
-    val url: String,
-    val fileName: String,
-    val fileSize: Long
-)
-
-interface ChatApi {
-    @GET("chats")
-    suspend fun getChats(): List<ChatDto>
-
-    @GET("messages/chat/{chatId}")
-    suspend fun getMessages(
-        @Path("chatId") chatId: String,
-        @Query("cursor") cursor: String? = null,
-        @Query("limit") limit: Int? = 50
-    ): List<MessageDto>
-
-    @POST("messages/chat/{chatId}")
-    suspend fun sendMessage(@Path("chatId") chatId: String, @Body request: SendMessageRequest): MessageDto
-
-    @Multipart
-    @POST("messages/upload")
-    suspend fun uploadFile(@Part file: okhttp3.MultipartBody.Part): FileUploadResponse
-
-    // Klipy GIF API
-    @GET("klipy/trending")
-    suspend fun getTrendingGifs(@Query("page") page: Int): KlipyResponse
-
-    @GET("klipy/search")
-    suspend fun searchGifs(@Query("q") query: String, @Query("page") page: Int): KlipyResponse
-
-    @GET("klipy/categories")
-    suspend fun getGifCategories(): GifCategoriesResponse
-
-    @POST("klipy/shared/{id}")
-    suspend fun markGifShared(@Path("id") id: String, @Body query: String)
-
-    @POST("messages/{messageId}/reactions")
-    suspend fun addReaction(@Path("messageId") messageId: String, @Query("emoji") emoji: String)
-
-    @POST("chats/{chatId}/typing")
-    suspend fun sendTypingStatus(@Path("chatId") chatId: String)
-
-    @POST("chats/{chatId}/read")
-    suspend fun markMessagesAsRead(@Path("chatId") chatId: String, @Body lastMessageId: String)
-}
-
-data class KlipyResponse(
-    val data: KlipyDataWrapper
-)
-
-data class KlipyDataWrapper(
-    val data: List<KlipyGifDto>
-)
-
-data class KlipyGifDto(
-    val id: String,
-    val images: GifImagesDto? = null,
-    val files: Map<String, Map<String, GifImageSourceDto>>? = null,
-    val file: Map<String, Map<String, GifImageSourceDto>>? = null,
-    val media_formats: Map<String, GifImageSourceDto>? = null,
-    val title: String? = null
-)
-
-data class GifImagesDto(
-    val fixed_height: GifImageSourceDto? = null,
-    val original: GifImageSourceDto? = null,
-    val fixed_height_small: GifImageSourceDto? = null
-)
-
-data class GifImageSourceDto(
-    val url: String
-)
-
-data class GifCategoryDto(
-    val category: String,
-    val preview_url: String,
-    val query: String
-)
-
-data class FileUploadResponse(
-    val url: String,
-    val filename: String,
-    val size: Long
-)
-
-data class GifCategoriesResponse(
-    val data: GifCategoriesData
-)
-
-data class GifCategoriesData(
-    val categories: List<GifCategoryDto>
-)

client-mobile/chats/data/remote/dto/ChatDtos.kt

@@ -1,54 +0,0 @@
-package chats.data.remote.dto
-
-import com.google.gson.annotations.SerializedName
-
-data class UserBasicDto(
-    @SerializedName("id") val id: String,
-    @SerializedName("username") val username: String? = null,
-    @SerializedName("displayName") val displayName: String? = null,
-    @SerializedName("avatarUrl") val avatarUrl: String? = null
-)
-
-data class MessageDto(
-    @SerializedName("id") val id: String,
-    @SerializedName("chatId") val chatId: String? = null,
-    @SerializedName("senderId") val senderId: String? = null,
-    @SerializedName("content") val content: String? = null,
-    @SerializedName("type") val type: String? = null,
-    @SerializedName("sequenceId") val sequenceId: Int? = null,
-    @SerializedName("createdAt") val createdAt: String? = null,
-    @SerializedName("sender") val sender: UserBasicDto? = null,
-    @SerializedName("media") val media: List<MediaItemDto> = emptyList(),
-    @SerializedName("reactions") val reactions: List<ReactionDto>? = emptyList(),
-    @SerializedName("replyTo") val replyTo: MessageDto? = null
-)
-
-data class ReactionDto(
-    @SerializedName("emoji") val emoji: String,
-    @SerializedName("count") val count: Int,
-    @SerializedName("isSetByMe") val isSetByMe: Boolean
-)
-
-data class MediaItemDto(
-    @SerializedName("id") val id: String,
-    @SerializedName("type") val type: String,
-    @SerializedName("url") val url: String,
-    @SerializedName("filename") val filename: String? = null,
-    @SerializedName("size") val size: Long? = null,
-    @SerializedName("duration") val duration: Double? = null
-)
-
-data class ChatDto(
-    @SerializedName("id") val id: String,
-    @SerializedName("type") val type: String,
-    @SerializedName("name") val name: String? = null,
-    @SerializedName("avatar") val avatar: String? = null,
-    @SerializedName("unreadCount") val unreadCount: Int = 0,
-    @SerializedName("messages") val messages: List<MessageDto> = emptyList(),
-    @SerializedName("members") val members: List<ChatMemberDto> = emptyList()
-)
-
-data class ChatMemberDto(
-    @SerializedName("userId") val userId: String,
-    @SerializedName("user") val user: UserBasicDto? = null
-)

client-mobile/chats/data/remote/signalr/ChatEvent.kt

@@ -1,31 +0,0 @@
-package chats.data.remote.signalr
-
-import chats.data.remote.dto.ChatDto
-import chats.data.remote.dto.MessageDto
-
-sealed class ChatEvent {
-    data class NewMessage(val message: MessageDto) : ChatEvent()
-    data class MessageEdited(val messageId: String, val chatId: String, val content: String) : ChatEvent()
-    data class MessageDeleted(val messageId: String, val chatId: String) : ChatEvent()
-    data class MessagesRead(val chatId: String, val userId: String, val lastReadSequenceId: Int) : ChatEvent()
-    data class UserTyping(val chatId: String, val userId: String) : ChatEvent()
-    data class UserStoppedTyping(val chatId: String, val userId: String) : ChatEvent()
-    data class UserOnline(val userId: String) : ChatEvent()
-    data class UserOffline(val userId: String, val lastSeen: String?) : ChatEvent()
-    data class NewChat(val chat: ChatDto) : ChatEvent()
-    data class ReactionUpdated(val messageId: String, val chatId: String, val userId: String, val emoji: String) : ChatEvent()
-
-    // Call Events (WebRTC Signaling)
-    data class CallIncoming(val chatId: String, val from: String, val offer: String, val callType: String) : ChatEvent()
-    data class CallAnswered(val chatId: String, val answer: String) : ChatEvent()
-    data class IceCandidateReceived(val chatId: String, val candidate: String) : ChatEvent()
-    data class CallEnded(val chatId: String) : ChatEvent()
-
-    // Group Call Events
-    data class GroupCallIncoming(val chatId: String, val from: String, val callerInfo: Any) : ChatEvent()
-    data class GroupCallParticipants(val chatId: String, val participants: List<String>) : ChatEvent()
-    data class GroupCallUserJoined(val chatId: String, val userId: String) : ChatEvent()
-    data class GroupCallUserLeft(val chatId: String, val userId: String) : ChatEvent()
-    data class GroupCallOffer(val chatId: String, val from: String, val offer: String) : ChatEvent()
-    data class GroupCallAnswer(val chatId: String, val from: String, val answer: String) : ChatEvent()
-}

client-mobile/chats/data/remote/signalr/ChatHubClient.kt

@@ -1,98 +0,0 @@
-package chats.data.remote.signalr
-
-import android.util.Log
-import io.reactivex.rxjava3.core.Single
-import com.microsoft.signalr.HubConnection
-import com.microsoft.signalr.HubConnectionBuilder
-import com.microsoft.signalr.HubConnectionState
-import chats.data.remote.dto.ChatDto
-import chats.data.remote.dto.MessageDto
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ChatHubClient @Inject constructor() {
-    private var hubConnection: HubConnection? = null
-    private val _events = MutableSharedFlow<ChatEvent>(extraBufferCapacity = 64)
-    val events: SharedFlow<ChatEvent> = _events.asSharedFlow()
-    private val scope = CoroutineScope(Dispatchers.IO)
-
-    fun connect(baseUrl: String, accessToken: String) {
-        if (hubConnection?.connectionState == HubConnectionState.CONNECTED) return
-
-        hubConnection = HubConnectionBuilder.create("${baseUrl}/chatHub")
-            .withAccessTokenProvider(Single.just(accessToken))
-            .build()
-
-        setupHandlers()
-
-        hubConnection?.onClosed { exception ->
-            Log.e("ChatHubClient", "Connection closed", exception)
-            // Optional: Reconnect logic
-        }
-
-        scope.launch {
-            try {
-                hubConnection?.start()?.blockingAwait()
-                Log.d("ChatHubClient", "SignalR Connected")
-            } catch (e: Exception) {
-                Log.e("ChatHubClient", "SignalR Connection Error", e)
-            }
-        }
-    }
-
-    private fun setupHandlers() {
-        hubConnection?.let { conn ->
-            conn.on("new_message", { message: MessageDto ->
-                _events.tryEmit(ChatEvent.NewMessage(message))
-            }, MessageDto::class.java)
-
-            conn.on("messages_read", { chatId: String, userId: String, lastReadSequenceId: Int ->
-                _events.tryEmit(ChatEvent.MessagesRead(chatId, userId, lastReadSequenceId))
-            }, String::class.java, String::class.java, Int::class.java)
-
-            conn.on("user_typing", { chatId: String, userId: String ->
-                _events.tryEmit(ChatEvent.UserTyping(chatId, userId))
-            }, String::class.java, String::class.java)
-
-            conn.on("user_online", { userId: String ->
-                _events.tryEmit(ChatEvent.UserOnline(userId))
-            }, String::class.java)
-
-            conn.on("new_chat", { chat: ChatDto ->
-                _events.tryEmit(ChatEvent.NewChat(chat))
-            }, ChatDto::class.java)
-
-            conn.on("reaction_updated", { messageId: String, chatId: String, userId: String, emoji: String ->
-                _events.tryEmit(ChatEvent.ReactionUpdated(messageId, chatId, userId, emoji))
-            }, String::class.java, String::class.java, String::class.java, String::class.java)
-
-            // WebRTC Signaling Handlers
-            conn.on("call_incoming", { chatId: String, from: String, offer: String, callType: String ->
-                _events.tryEmit(ChatEvent.CallIncoming(chatId, from, offer, callType))
-            }, String::class.java, String::class.java, String::class.java, String::class.java)
-
-            conn.on("call_answered", { chatId: String, answer: String ->
-                _events.tryEmit(ChatEvent.CallAnswered(chatId, answer))
-            }, String::class.java, String::class.java)
-
-            conn.on("ice_candidate", { chatId: String, candidate: String ->
-                _events.tryEmit(ChatEvent.IceCandidateReceived(chatId, candidate))
-            }, String::class.java, String::class.java)
-
-            conn.on("call_ended", { chatId: String ->
-                _events.tryEmit(ChatEvent.CallEnded(chatId))
-            }, String::class.java)
-        }
-    }
-
-    fun disconnect() {
-        hubConnection?.stop()
-    }
-}

client-mobile/chats/data/repository/ChatRepositoryImpl.kt

@@ -1,140 +0,0 @@
-package chats.data.repository
-
-import chats.data.remote.api.ChatApi
-import chats.data.remote.api.SendMessageRequest
-import chats.data.remote.dto.ChatDto
-import chats.data.remote.dto.MessageDto
-import chats.domain.model.Chat
-import chats.domain.model.Message
-import chats.domain.model.MediaType
-import chats.domain.repository.ChatRepository
-import core.network.ServerConfig
-import core.security.TokenManager
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import javax.inject.Inject
-
-class ChatRepositoryImpl @Inject constructor(
-    private val api: ChatApi,
-    private val tokenManager: TokenManager,
-    private val serverConfig: ServerConfig
-) : ChatRepository {
-
-    override suspend fun getChats(): List<Chat> {
-        val currentUserId = tokenManager.getUserId() ?: ""
-        val baseUrl = serverConfig.getBaseUrl().removeSuffix("/api/")
-        return api.getChats().map { it.toDomain(currentUserId, baseUrl) }
-    }
-
-    override suspend fun getMessages(chatId: String): List<Message> {
-        val baseUrl = serverConfig.getBaseUrl().removeSuffix("/api/")
-        return api.getMessages(chatId).map { it.toDomain(baseUrl) }
-    }
-
-    override suspend fun sendMessage(chatId: String, content: String): Message {
-        val request = SendMessageRequest(content = content, type = "text")
-        val baseUrl = serverConfig.getBaseUrl().removeSuffix("/api/")
-        return api.sendMessage(chatId, request).toDomain(baseUrl)
-    }
-
-    override suspend fun addReaction(messageId: String, emoji: String) {
-        api.addReaction(messageId, emoji)
-    }
-
-    override suspend fun sendTypingStatus(chatId: String) {
-        api.sendTypingStatus(chatId)
-    }
-
-    override suspend fun markMessagesAsRead(chatId: String, lastMessageId: String) {
-        api.markMessagesAsRead(chatId, lastMessageId)
-    }
-
-    override suspend fun uploadMedia(file: java.io.File): String {
-        val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
-        val body = MultipartBody.Part.createFormData("file", file.name, requestFile)
-        return api.uploadFile(body).url
-    }
-
-    override suspend fun getTrendingGifs(page: Int): List<chats.data.remote.api.KlipyGifDto> {
-        return api.getTrendingGifs(page).data.data
-    }
-
-    override suspend fun searchGifs(query: String, page: Int): List<chats.data.remote.api.KlipyGifDto> {
-        return api.searchGifs(query, page).data.data
-    }
-
-    override suspend fun getGifCategories(): List<chats.data.remote.api.GifCategoryDto> {
-        return api.getGifCategories().data.categories
-    }
-}
-
-// Mappers
-fun ChatDto.toDomain(currentUserId: String, baseUrl: String): Chat {
-    val chatName = name ?: if (type == "personal") {
-        members.firstOrNull { it.userId != currentUserId }?.user?.displayName ?: "Unknown Chat"
-    } else "Group Chat"
-
-    val chatAvatar = (avatar ?: if (type == "personal") {
-        members.firstOrNull { it.userId != currentUserId }?.user?.avatarUrl
-    } else null)?.ensureAbsoluteUrl(baseUrl)
-
-    return Chat(
-        id = id,
-        type = type,
-        name = chatName,
-        avatar = chatAvatar,
-        unreadCount = unreadCount,
-        lastMessage = messages.firstOrNull()?.toDomain(baseUrl)
-    )
-}
-
-fun MessageDto.toDomain(baseUrl: String): Message {
-    val domainMediaType = when (type) {
-        "image", "photo" -> MediaType.IMAGE
-        "video" -> MediaType.VIDEO
-        "audio", "voice" -> MediaType.AUDIO
-        "file" -> MediaType.FILE
-        else -> when (media.firstOrNull()?.type) {
-            "image", "photo" -> MediaType.IMAGE
-            "video" -> MediaType.VIDEO
-            "audio", "voice" -> MediaType.AUDIO
-            "file" -> MediaType.FILE
-            else -> MediaType.TEXT
-        }
-    }
-
-    return Message(
-        id = id,
-        chatId = chatId ?: "",
-        senderId = senderId ?: "",
-        senderName = sender?.displayName ?: "Unknown",
-        senderAvatar = sender?.avatarUrl?.ensureAbsoluteUrl(baseUrl),
-        content = content,
-        sequenceId = sequenceId ?: 0,
-        createdAt = createdAt ?: "",
-        media = media.map { 
-            chats.domain.model.Media(
-                id = it.id,
-                type = it.type,
-                url = it.url.ensureAbsoluteUrl(baseUrl),
-                filename = it.filename,
-                size = it.size,
-                duration = it.duration
-            )
-        },
-        mediaType = domainMediaType,
-        reactions = reactions?.associate { it.emoji to it.count } ?: emptyMap(),
-        replyTo = replyTo?.toDomain(baseUrl)
-    )
-}
-
-fun String.ensureAbsoluteUrl(baseUrl: String): String {
-    return if (this.startsWith("http")) {
-        this
-    } else {
-        val base = baseUrl.removeSuffix("/")
-        val path = if (this.startsWith("/")) this else "/$this"
-        "$base$path"
-    }
-}

client-mobile/chats/di/ChatModule.kt

@@ -1,37 +0,0 @@
-package chats.di
-
-import chats.data.remote.api.ChatApi
-import chats.data.remote.signalr.ChatHubClient
-import chats.data.repository.ChatRepositoryImpl
-import chats.domain.repository.ChatRepository
-import core.network.ServerConfig
-import core.security.TokenManager
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object ChatModule {
-
-    @Provides
-    @Singleton
-    fun provideChatApi(retrofit: Retrofit): ChatApi {
-        return retrofit.create(ChatApi::class.java)
-    }
-
-    @Provides
-    @Singleton
-    fun provideChatRepository(api: ChatApi, tokenManager: TokenManager, serverConfig: ServerConfig): ChatRepository {
-        return ChatRepositoryImpl(api, tokenManager, serverConfig)
-    }
-
-    @Provides
-    @Singleton
-    fun provideChatHubClient(): ChatHubClient {
-        return ChatHubClient()
-    }
-}

client-mobile/chats/domain/model/ChatModels.kt

@@ -1,10 +0,0 @@
-package chats.domain.model
-
-data class Chat(
-    val id: String,
-    val type: String,
-    val name: String,
-    val avatar: String?,
-    val unreadCount: Int,
-    val lastMessage: Message?
-)

client-mobile/chats/domain/model/Message.kt

@@ -1,30 +0,0 @@
-package chats.domain.model
-
-data class Message(
-    val id: String,
-    val chatId: String,
-    val senderId: String,
-    val senderName: String,
-    val senderAvatar: String? = null,
-    val content: String?,
-    val sequenceId: Int,
-    val createdAt: String,
-    val media: List<Media> = emptyList(),
-    val mediaType: MediaType = MediaType.TEXT,
-    val reactions: Map<String, Int> = emptyMap(),
-    val isRead: Boolean = false,
-    val replyTo: Message? = null
-)
-
-data class Media(
-    val id: String,
-    val type: String,
-    val url: String,
-    val filename: String? = null,
-    val size: Long? = null,
-    val duration: Double? = null
-)
-
-enum class MediaType {
-    TEXT, IMAGE, VIDEO, AUDIO, FILE, STORY_REPLY
-}

client-mobile/chats/domain/repository/ChatRepository.kt

@@ -1,18 +0,0 @@
-package chats.domain.repository
-
-import chats.domain.model.Chat
-import chats.domain.model.Message
-
-interface ChatRepository {
-    suspend fun getChats(): List<Chat>
-    suspend fun getMessages(chatId: String): List<Message>
-    suspend fun sendMessage(chatId: String, content: String): Message
-    suspend fun addReaction(messageId: String, emoji: String)
-    suspend fun sendTypingStatus(chatId: String)
-    suspend fun markMessagesAsRead(chatId: String, lastMessageId: String)
-    suspend fun uploadMedia(file: java.io.File): String
-    suspend fun getTrendingGifs(page: Int = 0): List<chats.data.remote.api.KlipyGifDto>
-    suspend fun searchGifs(query: String, page: Int = 0): List<chats.data.remote.api.KlipyGifDto>
-    suspend fun getGifCategories(): List<chats.data.remote.api.GifCategoryDto>
-}
-

client-mobile/chats/domain/usecase/UploadMediaUseCase.kt

@@ -1,24 +0,0 @@
-package chats.domain.usecase
-
-import chats.data.remote.api.ChatApi
-import chats.data.remote.api.FileUploadResponse
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import java.io.File
-import javax.inject.Inject
-
-class UploadMediaUseCase @Inject constructor(
-    private val api: ChatApi
-) {
-    suspend operator fun invoke(file: File): Result<FileUploadResponse> {
-        return try {
-            val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
-            val body = MultipartBody.Part.createFormData("file", file.name, requestFile)
-            val response = api.uploadFile(body)
-            Result.success(response)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-}

client-mobile/chats/presentation/chat_detail/ChatDetailScreen.kt

@@ -1,286 +0,0 @@
-package chats.presentation.chat_detail
-
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chats.presentation.components.MediaPicker
-import chats.presentation.components.MessageBubble
-import core.presentation.components.AppAvatar
-import core.presentation.components.AppMediaLightbox
-import core.utils.VoiceRecorder
-import core.utils.copyUriToFile
-import java.io.File
-import ru.knot.messager.R
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ChatDetailScreen(
-    chatId: String,
-    chatName: String,
-    viewModel: ChatDetailViewModel,
-    onBack: () -> Unit
-) {
-    val state by viewModel.state.collectAsState()
-    val context = LocalContext.current
-    val listState = rememberLazyListState()
-    val scope = rememberCoroutineScope()
-    val voiceRecorder = remember { VoiceRecorder(context) }
-    var textInput by remember { mutableStateOf("") }
-    var isEmojiPickerVisible by remember { mutableStateOf(false) }
-    var isRecording by remember { mutableStateOf(false) }
-    
-    var autoPlayingMessageId by remember { mutableStateOf<String?>(null) }
-    var currentPlaybackSpeed by remember { mutableFloatStateOf(1.0f) }
-    
-    var selectedMediaList by remember { mutableStateOf<List<chats.domain.model.Media>?>(null) }
-    var initialMediaIndex by remember { mutableIntStateOf(0) }
-
-    val playNextVoiceMessage = { currentId: String, speed: Float ->
-        val currentIndex = state.messages.indexOfFirst { it.id == currentId }
-        if (currentIndex != -1 && currentIndex < state.messages.size - 1) {
-            val nextVoiceIndexInSublist = state.messages.subList(currentIndex + 1, state.messages.size)
-                .indexOfFirst { it.mediaType == chats.domain.model.MediaType.AUDIO && it.content.isNullOrEmpty() }
-            
-            if (nextVoiceIndexInSublist != -1) {
-                val actualNextIndex = currentIndex + 1 + nextVoiceIndexInSublist
-                autoPlayingMessageId = state.messages[actualNextIndex].id
-                currentPlaybackSpeed = speed
-                
-                // Прокручиваем к следующему сообщению, иначе оно не распарсится LazyColumn
-                scope.launch {
-                    listState.animateScrollToItem(actualNextIndex)
-                }
-            } else {
-                autoPlayingMessageId = null
-            }
-        } else {
-            autoPlayingMessageId = null
-        }
-    }
-
-    // Пикер галереи
-    val galleryLauncher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.GetContent()
-    ) { uri: Uri? ->
-        uri?.let {
-            val file = copyUriToFile(context, it)
-            file?.let { viewModel.uploadMedia(it) }
-        }
-    }
-
-    // Загрузка данных чата при входе
-    LaunchedEffect(chatId) {
-        viewModel.setChatId(chatId)
-    }
-
-    // Автопрокрутка к последнему сообщению
-    LaunchedEffect(state.messages.size) {
-        if (state.messages.isNotEmpty()) {
-            listState.animateScrollToItem(state.messages.size - 1)
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        AppAvatar(
-                            url = state.chatAvatar,
-                            name = state.chatName ?: chatName,
-                            size = 36.dp,
-                            modifier = Modifier.padding(end = 8.dp)
-                        )
-                        Column {
-                            Text(state.chatName ?: chatName, style = MaterialTheme.typography.titleMedium)
-                            if (state.isTyping) {
-                                Text(
-                                    stringResource(R.string.typing),
-                                    style = MaterialTheme.typography.labelSmall,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
-                            }
-                        }
-                    }
-                },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = stringResource(R.string.back))
-                    }
-                },
-                actions = {
-                    if (state.canCall) {
-                        IconButton(onClick = { /* Вызов (WebRTC) */ }) {
-                            Icon(Icons.Default.Call, contentDescription = stringResource(R.string.call))
-                        }
-                        IconButton(onClick = { /* Видеозвонок (WebRTC) */ }) {
-                            Icon(Icons.Default.VideoCall, contentDescription = stringResource(R.string.video_call))
-                        }
-                    }
-                }
-            )
-        }
-    ) { paddingValues ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-        ) {
-            // Список сообщений
-            Box(
-                modifier = Modifier
-                    .weight(1f)
-                    .background(MaterialTheme.colorScheme.background)
-            ) {
-                LazyColumn(
-                    state = listState,
-                    modifier = Modifier.fillMaxSize(),
-                    contentPadding = PaddingValues(16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    val allChatMedia = state.messages.flatMap { msg -> 
-                        msg.media.filter { 
-                            it.type.startsWith("image") || 
-                            it.type.startsWith("video") || 
-                            it.filename?.endsWith(".gif", true) == true
-                        }.map { it to msg.id } 
-                    }.reversed()
-
-                    items(state.messages, key = { it.id }) { message ->
-                        MessageBubble(
-                            message = message,
-                            isCurrentUser = message.senderId == viewModel.getCurrentUserId(),
-                            autoPlay = message.id == autoPlayingMessageId,
-                            initialPlaybackSpeed = if (message.id == autoPlayingMessageId) currentPlaybackSpeed else 1.0f,
-                            onVoiceFinished = { speed -> playNextVoiceMessage(message.id, speed) },
-                            onReactionClick = { emoji -> viewModel.addReaction(message.id, emoji) },
-                            onMediaClick = { clickedMedia ->
-                                val initialIndex = allChatMedia.indexOfFirst { it.first.url == clickedMedia.url }
-                                selectedMediaList = allChatMedia.map { it.first }
-                                initialMediaIndex = if (initialIndex != -1) initialIndex else 0
-                            }
-                        )
-                    }
-
-                }
-                
-                if (state.isLoading) {
-                    CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
-                }
-            }
-
-            // Панель ввода
-            Column {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(8.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    IconButton(onClick = { isEmojiPickerVisible = !isEmojiPickerVisible }) {
-                        Icon(
-                            Icons.Default.EmojiEmotions, 
-                            contentDescription = stringResource(R.string.emoji),
-                            tint = if (isEmojiPickerVisible) MaterialTheme.colorScheme.primary else Color.Gray
-                        )
-                    }
-                    IconButton(onClick = { galleryLauncher.launch("*/*") }) {
-                        Icon(Icons.Default.AttachFile, contentDescription = stringResource(R.string.attach))
-                    }
-                    
-                    TextField(
-                        value = textInput,
-                        onValueChange = { textInput = it },
-                        modifier = Modifier.weight(1f),
-                        placeholder = { Text(stringResource(R.string.message_placeholder)) },
-                        maxLines = 4,
-                        colors = TextFieldDefaults.colors(
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent
-                        )
-                    )
-
-                    if (textInput.isBlank()) {
-                        IconButton(
-                            onClick = {
-                                if (!isRecording) {
-                                    val file = File(context.cacheDir, "voice_${System.currentTimeMillis()}.mp3")
-                                    voiceRecorder.startRecording(file)
-                                    isRecording = true
-                                } else {
-                                    voiceRecorder.stopRecording()
-                                    isRecording = false
-                                }
-                            }
-                        ) {
-                            Icon(
-                                if (isRecording) Icons.Default.Stop else Icons.Default.Mic,
-                                contentDescription = stringResource(R.string.voice_message),
-                                tint = if (isRecording) Color.Red else Color.Gray
-                            )
-                        }
-                    } else {
-                        IconButton(onClick = {
-                            viewModel.sendMessage(textInput)
-                            textInput = ""
-                        }) {
-                            Icon(Icons.Default.Send, contentDescription = stringResource(R.string.send))
-                        }
-                    }
-                }
-                
-                if (isEmojiPickerVisible) {
-                    LaunchedEffect(Unit) {
-                        viewModel.loadTrendingGifs()
-                    }
-                    MediaPicker(
-                        trendingGifs = state.trendingGifs,
-                        searchedGifs = state.searchedGifs,
-                        recentGifs = state.recentGifs,
-                        gifCategories = state.gifCategories,
-                        isGifsLoading = state.isGifsLoading,
-                        error = state.error,
-                        onEmojiSelected = { textInput += it },
-                        onGifSelected = { url ->
-                            viewModel.sendGif(url)
-                            isEmojiPickerVisible = false
-                        },
-                        onGifSearch = { query ->
-                            viewModel.searchGifs(query)
-                        }
-                    )
-                    
-                    LaunchedEffect(Unit) {
-                        viewModel.loadTrendingGifs()
-                        viewModel.loadGifCategories()
-                    }
-                }
-            }
-        }
-
-        // Просмотрщик медиа
-        selectedMediaList?.let { list ->
-            AppMediaLightbox(
-                mediaList = list,
-                initialIndex = initialMediaIndex,
-                onClose = { selectedMediaList = null }
-            )
-        }
-    }
-}