Структура, доп модули, федерация, документация

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

@@ -1,11 +1,10 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
 using MediatR;
 using Microsoft.AspNetCore.SignalR;
 using global::Knot.Modules.Conversations.Domain;
 using global::Knot.Modules.Conversations.Infrastructure.SignalR;
 using global::Knot.Shared.Kernel;
 using global::Knot.Modules.Conversations.Application.Abstractions;
+using MessagingMessageRepository = Knot.Modules.Messaging.Domain.IMessageRepository;
 
 namespace Knot.Modules.Conversations.Application.Messages.Delete;
 
@@ -17,12 +16,12 @@ public sealed record DeleteMessagesCommand(
 
 public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessagesCommand>
 {
-    private readonly IMessageRepository _messageRepository;
+    private readonly MessagingMessageRepository _messageRepository;
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly IHubContext<ChatHub> _hubContext;
 
     public DeleteMessagesCommandHandler(
-        IMessageRepository messageRepository,
+        MessagingMessageRepository messageRepository,
         IChatsUnitOfWork unitOfWork,
         IHubContext<ChatHub> hubContext)
     {
@@ -67,7 +66,6 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
         }
         else
         {
-            // Уведомляем только самого пользователя (все его текущие сессии)
             await _hubContext.Clients.User(request.UserId.ToString()).SendAsync("messages_deleted", new
             {
                 chatId = request.ChatId,
@@ -79,5 +77,3 @@ public sealed class DeleteMessagesCommandHandler : ICommandHandler<DeleteMessage
         return global::Knot.Shared.Kernel.Result.Success();
     }
 }
-
-

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

@@ -2,6 +2,7 @@ using Knot.Modules.Messaging.Application.Abstractions;
 using Knot.Modules.Messaging.Domain;
 using Knot.Modules.Conversations.Domain;
 using Knot.Shared.Kernel;
+using Knot.Shared.Kernel.Configuration;
 using Knot.Modules.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
@@ -22,7 +23,11 @@ public sealed record SendMessageCommand(
     Guid? ForwardedFromId = null,
     Guid? StoryId = null,
     string? StoryMediaUrl = null,
-    string? StoryMediaType = null) : ICommand<Guid>;
+    string? StoryMediaType = null,
+    List<string>? PollOptions = null,
+    bool? PollIsAnonymous = null,
+    bool? PollAllowMultipleAnswers = null,
+    DateTime? PollExpiresAt = null) : ICommand<Guid>;
 
 public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageCommand, Guid>
 {
@@ -30,17 +35,20 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
     private readonly IMessageRepository _messageRepository;
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly MediatR.IMediator _mediator;
+    private readonly IMessagesSettings _messagesSettings;
 
     public SendMessageCommandHandler(
         IChatRepository chatRepository,
         IMessageRepository messageRepository,
         IChatsUnitOfWork unitOfWork,
-        MediatR.IMediator mediator)
+        MediatR.IMediator mediator,
+        IMessagesSettings messagesSettings)
     {
         _chatRepository = chatRepository;
         _messageRepository = messageRepository;
         _unitOfWork = unitOfWork;
         _mediator = mediator;
+        _messagesSettings = messagesSettings;
     }
 
     public async Task<Result<Guid>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
@@ -62,6 +70,8 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         Message message;
         if (request.Type == "story_reply" || request.Type == "story_reaction")
         {
+            if (!_messagesSettings.Current.AllowMedia) return Result.Failure<Guid>(ChatErrors.MediaDisabled);
+            
             var parsedStoryMediaType = Enum.TryParse<MediaType>(request.StoryMediaType, true, out var sTypeEnum) ? sTypeEnum : MediaType.Image;
             message = new StoryMessage(
                 Guid.NewGuid(), 
@@ -78,6 +88,8 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         }
         else if (request.Attachments != null && request.Attachments.Any())
         {
+            if (!_messagesSettings.Current.AllowMedia) return Result.Failure<Guid>(ChatErrors.MediaDisabled);
+
             var firstAtt = request.Attachments.First();
             var parsedType = Enum.TryParse<MediaType>(firstAtt.Type, true, out var mTypeEnum) ? mTypeEnum : MediaType.File;
             
@@ -98,6 +110,24 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
                 ((MediaMessage)message).AddMedia(pType, att.Url, att.FileName, att.FileSize);
             }
         }
+        else if (request.Type == "poll")
+        {
+            if (!_messagesSettings.Current.AllowPolls) return Result.Failure<Guid>(ChatErrors.PollsDisabled);
+
+            message = new PollMessage(
+                Guid.NewGuid(),
+                request.ChatId,
+                request.SenderId,
+                request.Content ?? "Poll",
+                request.PollOptions ?? new List<string>(),
+                request.PollIsAnonymous ?? true,
+                request.PollAllowMultipleAnswers ?? false,
+                request.PollExpiresAt,
+                request.ReplyToId,
+                request.ForwardedFromId,
+                DateTime.UtcNow,
+                false);
+        }
         else
         {
             message = new TextMessage(

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

@@ -16,9 +16,9 @@ public record UploadFileCommand(string FileName, string ContentType, long Length
 internal sealed class UploadFileCommandHandler : ICommandHandler<UploadFileCommand, UploadFileResponseDto>
 {
     private readonly IFileStorageService _fileStorage;
-    private readonly ISettingsService _settingsService;
+    private readonly IMessagesSettings _settingsService;
 
-    public UploadFileCommandHandler(IFileStorageService fileStorage, ISettingsService settingsService)
+    public UploadFileCommandHandler(IFileStorageService fileStorage, IMessagesSettings settingsService)
     {
         _fileStorage = fileStorage;
         _settingsService = settingsService;
@@ -31,8 +31,10 @@ internal sealed class UploadFileCommandHandler : ICommandHandler<UploadFileComma
             return Result.Failure<UploadFileResponseDto>(ChatErrors.FileEmpty);
         }
 
-        var maxMb = _settingsService.Current.MaxFileSizeMb;
-        if (request.Length > maxMb * 1024 * 1024)
+        var maxBytes = _settingsService.Current.MaxMediaSizeBytes;
+        var maxMb = maxBytes / (1024 * 1024);
+
+        if (request.Length > maxBytes)
         {
             return Result.Failure<UploadFileResponseDto>(ChatErrors.FileTooLarge(maxMb));
         }