Структура

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

@@ -1,10 +1,10 @@
-using MediatR;
-using Microsoft.AspNetCore.SignalR;
+using global::Knot.Modules.Conversations.Application.Abstractions;
 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;
+using MediatR;
+using Microsoft.AspNetCore.SignalR;
+using MessagingMessageRepository = Knot.Contracts.Messaging.Application.Abstractions.IMessageRepository;
 
 namespace Knot.Modules.Conversations.Application.Messages.Delete;
 

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

@@ -1,16 +1,15 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediatR;
-using Knot.Shared.Kernel;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
 using Knot.Modules.Conversations.Domain;
-
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Shared.Kernel;
+using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.GetMessages;
 
@@ -74,7 +73,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
         }
 
         var senders = await _userProvider.GetUsersInfoAsync(userIdsToFetch, cancellationToken);
-        
+
         var messageIds = filteredMessages.Select(m => m.Id).ToList();
         var allReactions = await _reactionRepository.GetReactionsForMessagesAsync(messageIds, cancellationToken);
         var reactionsByMessage = allReactions.GroupBy(r => r.MessageId).ToDictionary(g => g.Key, g => g.ToList());

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

@@ -1,17 +1,16 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using MediatR;
-using Knot.Shared.Kernel;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.DTOs;
 using Knot.Modules.Conversations.Domain;
-
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Shared.Kernel;
+using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.GetSharedMedia;
 

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

@@ -1,12 +1,12 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
-using MediatR;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Shared.Kernel;
+using MediatR;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 
 namespace Knot.Modules.Conversations.Application.Messages.React;
 

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

@@ -1,12 +1,12 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
-using MediatR;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Domain;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Shared.Kernel;
+using MediatR;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 
 namespace Knot.Modules.Conversations.Application.Messages.React;
 

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

@@ -1,14 +1,14 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediatR;
-using Knot.Shared.Kernel;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.DTOs;
 using Knot.Modules.Conversations.Domain;
+using Knot.Shared.Kernel;
+using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.SearchMessages;
 
@@ -36,7 +36,7 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
         userIds.AddRange(messages.Where(message => message.ForwardedFromId.HasValue).Select(message => message.ForwardedFromId!.Value));
 
         var senders = await _userProvider.GetUsersInfoAsync(userIds.Distinct(), cancellationToken);
-        
+
         var messageIds = messages.Select(m => m.Id).ToList();
         var allReactions = await _reactionRepository.GetReactionsForMessagesAsync(messageIds, cancellationToken);
         var reactionsByMessage = allReactions.GroupBy(r => r.MessageId).ToDictionary(g => g.Key, g => g.ToList());
@@ -54,7 +54,7 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
                 message.CreatedAt,
                 message.SequenceId,
                 message.ForwardedFromId,
-                null, 
+                null,
                 message.StoryId,
                 message.StoryMediaUrl,
                 message.StoryMediaType,

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

@@ -1,14 +1,14 @@
-using Knot.Modules.Messaging.Application.Abstractions;
-using Knot.Modules.Messaging.Domain;
-using Knot.Modules.Conversations.Domain;
-using Knot.Shared.Kernel;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Settings.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Modules.Conversations.Domain;
+using Knot.Shared.Kernel;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
 
 /// <summary>
-/// Êîìàíäà äëÿ îòïðàâêè ñîîáùåíèÿ â ÷àò.
+/// ������� ��� �������� ��������� � ���.
 /// </summary>
 public record AttachmentRequest(string Type, string Url, string? FileName, long? FileSize);
 
@@ -53,37 +53,47 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
 
     public async Task<Result<Guid>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
     {
-        // 1. Ïðîâåðÿåì ñóùåñòâîâàíèå ÷àòà
+        // 1. ��������� ������������� ����
         var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
         if (chat is null)
         {
             return Result.Failure<Guid>(ChatErrors.ChatsNotFound);
         }
 
-        // 2. Ïðîâåðÿåì, ÿâëÿåòñÿ ëè îòïðàâèòåëü ó÷àñòíèêîì
+        // 2. ���������, �������� �� ����������� ����������
         if (!chat.Members.Any(m => m.UserId == request.SenderId))
         {
             return Result.Failure<Guid>(ChatErrors.ChatsForbidden);
         }
 
-        // 3. Ñîçäàåì ñîîáùåíèå
+        // 3. ������� ���������
         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(), 
-                request.ChatId, 
-                request.SenderId, 
-                request.StoryId ?? Guid.Empty, 
-                request.StoryMediaUrl ?? string.Empty, 
-                parsedStoryMediaType, 
-                request.Content, 
-                request.ReplyToId, 
-                request.ForwardedFromId, 
-                DateTime.UtcNow, 
+                Guid.NewGuid(),
+
+                request.ChatId,
+
+                request.SenderId,
+
+                request.StoryId ?? Guid.Empty,
+
+                request.StoryMediaUrl ?? string.Empty,
+                request.StoryMediaType,
+
+                request.Content,
+
+                request.ReplyToId,
+
+                request.ForwardedFromId,
+
+                DateTime.UtcNow,
+
                 false);
         }
         else if (request.Attachments != null && request.Attachments.Any())
@@ -92,22 +102,31 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
 
             var firstAtt = request.Attachments.First();
             var parsedType = Enum.TryParse<MediaType>(firstAtt.Type, true, out var mTypeEnum) ? mTypeEnum : MediaType.File;
-            
+
+
             message = new MediaMessage(
-                Guid.NewGuid(), 
-                request.ChatId, 
-                request.SenderId, 
-                parsedType, 
-                request.Content, 
-                request.ReplyToId, 
-                request.ForwardedFromId, 
-                DateTime.UtcNow, 
+                Guid.NewGuid(),
+
+                request.ChatId,
+
+                request.SenderId,
+                parsedType,
+
+                request.Content,
+
+                request.ReplyToId,
+
+                request.ForwardedFromId,
+
+                DateTime.UtcNow,
+
                 false);
-            
+
+
             foreach (var att in request.Attachments)
             {
                 var pType = Enum.TryParse<MediaType>(att.Type, true, out var tEnum) ? tEnum : MediaType.File;
-                ((MediaMessage)message).AddMedia(pType, att.Url, att.FileName, att.FileSize);
+                ((MediaMessage)message).AddMedia(pType.ToString().ToLower(), att.Url, att.FileName, att.FileSize);
             }
         }
         else if (request.Type == "poll")
@@ -131,18 +150,26 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         else
         {
             message = new TextMessage(
-                Guid.NewGuid(), 
-                request.ChatId, 
-                request.SenderId, 
-                request.Content ?? string.Empty, 
-                request.ReplyToId, 
-                request.Quote, 
-                request.ForwardedFromId, 
-                DateTime.UtcNow, 
+                Guid.NewGuid(),
+
+                request.ChatId,
+
+                request.SenderId,
+
+                request.Content ?? string.Empty,
+
+                request.ReplyToId,
+
+                request.Quote,
+
+                request.ForwardedFromId,
+
+                DateTime.UtcNow,
+
                 false);
         }
 
-        // 4. Ïîñëåäîâàòåëüíîñòü ñîîáùåíèé High-Water Mark
+        // 4. ������������������ ��������� High-Water Mark
         chat.IncrementSequenceId();
         message.SetSequenceId(chat.LastMessageSequenceId);
 
@@ -150,15 +177,19 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         senderMember.UpdateReadCursor(message.Id, message.SequenceId);
         senderMember.UpdateDeliveredCursor(message.Id);
 
-        // 5. Ñîõðàíÿåì
+        // 5. ���������
         _messageRepository.Add(message);
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
         await _mediator.Publish(new MessageSentDomainEvent(
-            message.Id, 
-            message.ChatId, 
-            message.SenderId, 
-            message.Content), 
+            message.Id,
+
+            message.ChatId,
+
+            message.SenderId,
+
+            message.Content),
+
             cancellationToken);
 
         return Result.Success(message.Id);