mirror of
https://github.com/Govor-team/Govor.git
synced 2026-11-17 12:59:25 +00:00
Add reactions, reliable push & session checks
Implements message reactions and reaction packs (domain models, services, admin HTTP API, media processing via ImageSharp and limits) and adds reliable push delivery (ChatPushNotification, ChatPushDispatcher, ChatPushWorker, improved ChatNotificationService). Enhances message reading (ReadChat API, unread counts, concurrency-safe receipts) and tightens session security (access-token session validation in JWT, hub filter, SessionAuthorization). Improves SignalR behavior (session groups, reaction/channel events, hub/error mappings). Adds EF migrations, many controller fixes (Forbid handling, password API), tests (Govor.Server.Tests), docs, CI and tooling updates (Dockerfile → .NET 10, GH Actions matrix for sqlite/postgres, Govor.Server.slnx, global.json), and small infra changes (AutoMapper bump, NullPushProvider, storage/token handling).
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using Govor.Application.Messages.Parameters;
|
||||
using DeleteMessage = Govor.Application.Messages.Parameters.DeleteMessage;
|
||||
using Govor.Domain;
|
||||
using Govor.Domain.Common;
|
||||
using Govor.Domain.Models.Messages;
|
||||
@@ -13,75 +13,38 @@ public class MessageRemovingService : IMessageRemovingService
|
||||
private readonly GovorDbContext _govorDbContext;
|
||||
private readonly ILogger<MessageRemovingService> _logger;
|
||||
|
||||
public MessageRemovingService
|
||||
(GovorDbContext govorDbContext,
|
||||
ILogger<MessageRemovingService> logger)
|
||||
public MessageRemovingService(GovorDbContext govorDbContext, ILogger<MessageRemovingService> logger)
|
||||
{
|
||||
_govorDbContext = govorDbContext;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<Result<Message,Error>> DeleteMessageAsync(DeleteMessage deleteParams)
|
||||
public async Task<Result<Message, Error>> DeleteMessageAsync(DeleteMessage deleteParams)
|
||||
{
|
||||
var message = await _govorDbContext.Messages.FirstOrDefaultAsync(m => m.Id == deleteParams.MessageId);
|
||||
|
||||
if (message == null)
|
||||
return Result<Message, Error>.Failure(
|
||||
Error.NotFound(
|
||||
"MessageRemoving",
|
||||
"Message with given id doesn't exist")
|
||||
);
|
||||
var message = await _govorDbContext.Messages.FirstOrDefaultAsync(m => m.Id == deleteParams.MessageId);
|
||||
if (message is null)
|
||||
return Result.Failure<Message>(Error.NotFound("Message.NotFound", "Message not found."));
|
||||
|
||||
var result = message.RecipientType switch
|
||||
{
|
||||
RecipientType.Group => await ValidateGroupRecipientAsync(message, deleteParams),
|
||||
RecipientType.User => await ValidateUserRecipientAsync(message, deleteParams),
|
||||
|
||||
_ => Result<Message, Error>.Failure(Error.Failure(
|
||||
"MessageRemoving.ArgumentOutOfRangeException",
|
||||
$"Argument out of range: {nameof(message.RecipientType)}"
|
||||
)
|
||||
)
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
if (!await _govorDbContext.HasChatAccessAsync(deleteParams.DeleterId,
|
||||
message.RecipientId, message.RecipientType))
|
||||
return Result.Failure<Message>(Error.Forbidden("Chat.AccessDenied", "You are not a member of this chat."));
|
||||
|
||||
private async Task<Result<Message,Error>> ValidateGroupRecipientAsync(Message message, DeleteMessage deleteParams)
|
||||
{
|
||||
if (deleteParams.DeleterId == message.RecipientId)
|
||||
{
|
||||
return await ForceRemoveAsync(message);
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO made admin rules
|
||||
return Result<Message, Error>.Failure(Error.Failure("MessageRemoving.HaveNoPermission",
|
||||
$"You do not have permission to delete message {message.Id}"
|
||||
));
|
||||
}
|
||||
}
|
||||
// Do not silently turn a local hide into deletion for everyone.
|
||||
if (!deleteParams.ForceRemove)
|
||||
return Result.Failure<Message>(Error.Validation("Message.HideNotSupported",
|
||||
"HideForMe is not supported. Use ForceRemove to delete a message for everyone."));
|
||||
|
||||
private async Task<Result<Message,Error>> ValidateUserRecipientAsync(Message message, DeleteMessage deleteParams)
|
||||
{
|
||||
if (deleteParams.DeleterId == message.SenderId)
|
||||
{
|
||||
return await ForceRemoveAsync(message);
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO made hide rules
|
||||
return Result<Message, Error>.Failure(Error.Failure("MessageRemoving.HaveNoPermission",
|
||||
$"You do not have permission to delete message {message.Id}"
|
||||
));
|
||||
}
|
||||
}
|
||||
var canDelete = message.SenderId == deleteParams.DeleterId ||
|
||||
(message.RecipientType == RecipientType.Group &&
|
||||
await _govorDbContext.GroupAdmins.AnyAsync(a =>
|
||||
a.GroupId == message.RecipientId && a.UserId == deleteParams.DeleterId));
|
||||
if (!canDelete)
|
||||
return Result.Failure<Message>(Error.Forbidden("Message.Remove.AccessDenied",
|
||||
"Only the author or a group administrator can delete this message."));
|
||||
|
||||
private async Task<Result<Message, Error>> ForceRemoveAsync(Message message)
|
||||
{
|
||||
_govorDbContext.Messages.Remove(message);
|
||||
await _govorDbContext.SaveChangesAsync();
|
||||
|
||||
_logger.LogInformation("Message {MessageId} removed by {UserId}", message.Id, deleteParams.DeleterId);
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user