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:
+80
-13
@@ -1,8 +1,12 @@
|
||||
using Govor.API.Common.SignalR.Helpers;
|
||||
using Govor.API.Common.Extensions;
|
||||
using Govor.Contracts.Requests;
|
||||
using Govor.API.Hubs.Infrastructure;
|
||||
using Govor.Application.Exceptions.VerifyFriendship;
|
||||
using Govor.Application.Infrastructure.Common;
|
||||
using Govor.Application.Messages;
|
||||
using Govor.Application.Reactions;
|
||||
using AutoMapper;
|
||||
using Govor.Application.Messages.Parameters;
|
||||
using Govor.Contracts.Requests.SignalR;
|
||||
using Govor.Contracts.Responses.SignalR;
|
||||
@@ -24,6 +28,8 @@ public class ChatsHub : Hub
|
||||
private readonly IChatNotificationService _notifier;
|
||||
private readonly IConnectionManager _connectionManager;
|
||||
private readonly INowDateTimeProvider _nowDateTimeProvider;
|
||||
private readonly IMessageReactionService _reactions;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public ChatsHub(ILogger<ChatsHub> logger,
|
||||
IMessageReadingService messageReadingService,
|
||||
@@ -33,7 +39,9 @@ public class ChatsHub : Hub
|
||||
IHubUserAccessor userAccessor,
|
||||
IChatNotificationService notifier,
|
||||
INowDateTimeProvider nowDateTimeProvider,
|
||||
IConnectionManager connectionManager)
|
||||
IConnectionManager connectionManager,
|
||||
IMessageReactionService reactions,
|
||||
IMapper mapper)
|
||||
{
|
||||
_logger = logger;
|
||||
_nowDateTimeProvider = nowDateTimeProvider;
|
||||
@@ -44,6 +52,8 @@ public class ChatsHub : Hub
|
||||
_userAccessor = userAccessor;
|
||||
_notifier = notifier;
|
||||
_connectionManager = connectionManager;
|
||||
_reactions = reactions;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public override async Task OnConnectedAsync()
|
||||
@@ -56,6 +66,12 @@ public class ChatsHub : Hub
|
||||
}
|
||||
|
||||
await _connectionManager.OnConnectedAsync(Context.ConnectionId, userId);
|
||||
if (!Guid.TryParse(Context.User?.FindFirst("sid")?.Value, out var sessionId))
|
||||
{
|
||||
Context.Abort();
|
||||
return;
|
||||
}
|
||||
await Groups.AddToGroupAsync(Context.ConnectionId, ChatHubConstants.GetSessionGroup(sessionId));
|
||||
_logger.LogInformation("User {UserId} connected", userId);
|
||||
await base.OnConnectedAsync();
|
||||
}
|
||||
@@ -84,23 +100,25 @@ public class ChatsHub : Hub
|
||||
var result = await _messageSendingService.SendMessageAsync(sendParams);
|
||||
|
||||
if (!result.IsSuccess)
|
||||
throw new InvalidOperationException(result.Exception.Message ?? "Failed to send message");
|
||||
throw result.Exception ?? new InvalidOperationException("Failed to send message");
|
||||
|
||||
var response = MapToResponse(result.Message, request.ReplyToMessageId);
|
||||
|
||||
await _notifier.NotifyMessageSentAsync(response);
|
||||
|
||||
return HubResult<UserMessageResponse>.Ok(response);
|
||||
}, request.RecipientId);
|
||||
}, request?.RecipientId ?? Guid.Empty);
|
||||
}
|
||||
|
||||
// --- Read ---
|
||||
public async Task<HubResult<MessageReadResponse>> Read(ReadMessageRequest request)
|
||||
{
|
||||
return await SafeExecute(async (userId) =>
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(request);
|
||||
var result = await _messageReadingService.ReadMessageAsync(userId, request.MessageId);
|
||||
if(!result.IsSuccess)
|
||||
throw new InvalidOperationException(result.Error.ToString());
|
||||
return result.Error.ToHubResult<MessageReadResponse>();
|
||||
|
||||
var message = result.Value;
|
||||
|
||||
@@ -119,13 +137,36 @@ public class ChatsHub : Hub
|
||||
await _notifier.NotifyMessageWasReadAsync(response);
|
||||
|
||||
return HubResult<MessageReadResponse>.Ok(response);
|
||||
}, request.MessageId);
|
||||
}, request?.MessageId ?? Guid.Empty);
|
||||
}
|
||||
// --- REMOVE ---
|
||||
public async Task<HubResult<ChatReadResponse>> ReadChat(Guid chatId, ReadChatRequest request)
|
||||
{
|
||||
return await SafeExecute(async userId =>
|
||||
{
|
||||
if (request is null)
|
||||
return HubResult<ChatReadResponse>.BadRequest("Request is required.");
|
||||
var result = await _messageReadingService.ReadChatAsync(userId, chatId,
|
||||
request.RecipientType, request.MessageIds, request.UpToMessageId);
|
||||
if (result.IsFailure)
|
||||
return result.Error.ToHubResult<ChatReadResponse>();
|
||||
var read = result.Value;
|
||||
var response = new ChatReadResponse
|
||||
{
|
||||
ChatId = read.ChatId, RecipientType = read.RecipientType, ReaderId = read.ReaderId,
|
||||
ReadAt = read.ReadAt, UpToMessageId = read.UpToMessageId, UpToSentAt = read.UpToSentAt,
|
||||
MessageIds = read.MessageIds, ReadCount = read.ReadCount, UnreadCount = read.UnreadCount
|
||||
};
|
||||
await _notifier.NotifyChatReadAsync(response);
|
||||
return HubResult<ChatReadResponse>.Ok(response);
|
||||
}, chatId);
|
||||
}
|
||||
|
||||
public async Task<HubResult<MessageRemovedResponse>> Remove(RemoveMessageRequest request)
|
||||
{
|
||||
return await SafeExecute(async (userId) =>
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(request);
|
||||
var deletemessage = new DeleteMessage(
|
||||
userId,
|
||||
request.MessageId,
|
||||
@@ -140,7 +181,7 @@ public class ChatsHub : Hub
|
||||
var result = await _messageRemovingService.DeleteMessageAsync(deletemessage);
|
||||
|
||||
if (!result.IsSuccess)
|
||||
throw new InvalidOperationException(result.Error.ToString());
|
||||
return result.Error.ToHubResult<MessageRemovedResponse>();
|
||||
|
||||
var notification = new MessageRemovedResponse
|
||||
{
|
||||
@@ -154,7 +195,26 @@ public class ChatsHub : Hub
|
||||
await _notifier.NotifyMessageRemovedAsync(notification);
|
||||
|
||||
return HubResult<MessageRemovedResponse>.Ok(notification);
|
||||
}, request.MessageId);
|
||||
}, request?.MessageId ?? Guid.Empty);
|
||||
}
|
||||
|
||||
public Task<HubResult<MessageReactionsChangedResponse>> React(Guid messageId, SetReactionRequest request) =>
|
||||
SafeExecute(async userId =>
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(request);
|
||||
return await ChangeReactionAsync(userId, messageId, request.ReactionId);
|
||||
}, messageId);
|
||||
|
||||
public Task<HubResult<MessageReactionsChangedResponse>> RemoveReaction(Guid messageId) =>
|
||||
SafeExecute(userId => ChangeReactionAsync(userId, messageId, null), messageId);
|
||||
|
||||
private async Task<HubResult<MessageReactionsChangedResponse>> ChangeReactionAsync(Guid userId, Guid messageId, Guid? reactionId)
|
||||
{
|
||||
var result = await _reactions.SetAsync(userId, messageId, reactionId);
|
||||
if (result.IsFailure) return result.Error.ToHubResult<MessageReactionsChangedResponse>();
|
||||
var response = _mapper.Map<MessageReactionsChangedResponse>(result.Value);
|
||||
if (result.Value.Changed) await _notifier.NotifyMessageReactionsChangedAsync(response);
|
||||
return HubResult<MessageReactionsChangedResponse>.Ok(response);
|
||||
}
|
||||
|
||||
// --- EDIT ---
|
||||
@@ -162,6 +222,7 @@ public class ChatsHub : Hub
|
||||
{
|
||||
return await SafeExecute(async (userId) =>
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(request);
|
||||
var editParams = new EditMessage(
|
||||
userId,
|
||||
request.MessageId,
|
||||
@@ -171,7 +232,7 @@ public class ChatsHub : Hub
|
||||
var result = await _messageEditingService.EditMessageAsync(editParams);
|
||||
|
||||
if (!result.IsSuccess || result.OriginalMessage == null)
|
||||
throw new InvalidOperationException("Edit message error");
|
||||
throw result.Exception ?? new InvalidOperationException("Edit message error");
|
||||
|
||||
var response = new MessageEditResponse
|
||||
{
|
||||
@@ -186,20 +247,21 @@ public class ChatsHub : Hub
|
||||
await _notifier.NotifyMessageEditedAsync(response);
|
||||
|
||||
return HubResult<MessageEditResponse>.Ok(response);
|
||||
}, request.MessageId);
|
||||
}, request?.MessageId ?? Guid.Empty);
|
||||
}
|
||||
|
||||
private async Task<HubResult<T>> SafeExecute<T>(Func<Guid, Task<HubResult<T>>> action, Guid targetIdForLog)
|
||||
{
|
||||
var userId = _userAccessor.GetUserId(Context);
|
||||
var userId = Guid.Empty;
|
||||
try
|
||||
{
|
||||
userId = _userAccessor.GetUserId(Context);
|
||||
return await action(userId);
|
||||
}
|
||||
catch (UnauthorizedAccessException ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Unauthorized: {UserId} -> {TargetId}", userId, targetIdForLog);
|
||||
return HubResult<T>.Unauthorized("You are not authorized.");
|
||||
return HubResult<T>.Forbidden("You do not have permission to perform this action.");
|
||||
}
|
||||
catch (FriendshipException)
|
||||
{
|
||||
@@ -213,6 +275,10 @@ public class ChatsHub : Hub
|
||||
{
|
||||
return HubResult<T>.NotFound("Resource not found.");
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return HubResult<T>.BadRequest(ex.Message);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error executing hub method for {UserId}", userId);
|
||||
@@ -222,12 +288,13 @@ public class ChatsHub : Hub
|
||||
|
||||
private void ValidateMessageRequest(MessageRequest request)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(request);
|
||||
if (string.IsNullOrWhiteSpace(request.EncryptedContent) &&
|
||||
(request.MediaAttachments == null || !request.MediaAttachments.Any()))
|
||||
{
|
||||
throw new ArgumentException("Message must contain content or media.");
|
||||
}
|
||||
if (request.EncryptedContent.Length > 50_000)
|
||||
if ((request.EncryptedContent?.Length ?? 0) > 50_000)
|
||||
{
|
||||
throw new ArgumentException("Message is too long.");
|
||||
}
|
||||
@@ -262,4 +329,4 @@ public class ChatsHub : Hub
|
||||
ReplyToMessageId = replyToId
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user