Удаление сообщений

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

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