Govor-team/Govor
2
2
Fork 0
mirror of https://github.com/Govor-team/Govor.git synced 2026-07-21 11:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Artemy
2025-07-24 13:43:51 +07:00
parent d5299f2b79
commit caefcd5827
3 changed files with 116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Govor.API/Hubs/FriendsHub.cs
-1
View File
@@ -49,7 +49,6 @@ public class FriendsHub : Hub
var userId = _userAccessor.GetUserId(Context, true);
if (userId != Guid.Empty)
{
// Remove user from their own group
await Groups.RemoveFromGroupAsync(Context.ConnectionId, userId.ToString());
_logger.LogInformation(
"User {UserId} disconnected with ConnectionId {ConnectionId} and removed from their group", userId,
Govor.API/Hubs/PresenceHub.cs
+36 -13
View File
@@ -1,5 +1,6 @@
using Govor.API.Common.SignalR.Helpers;
using Govor.Application.Interfaces.UserOnlineStatus;
using Govor.Core.Repositories.Users;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.SignalR;
@@ -11,18 +12,21 @@ namespace Govor.API.Hubs;
public class PresenceHub : Hub
{
private readonly ILogger<PresenceHub> _logger;
private readonly IUserNotificationScopeService _notificationScopeService;
private readonly IUserNotificationScopeService _scopeService;
private readonly IOnlineUserStore _onlineUserStore;
private readonly IHubUserAccessor _userAccessor;
private readonly IUsersRepository _users;
public PresenceHub(
ILogger<PresenceHub> logger,
IUserNotificationScopeService notificationScopeService,
IUserNotificationScopeService scopeService,
IOnlineUserStore onlineUserStore,
IHubUserAccessor userAccessor)
IHubUserAccessor userAccessor,
IUsersRepository users)
{
_logger = logger;
_notificationScopeService = notificationScopeService;
_users = users;
_scopeService = scopeService;
_onlineUserStore = onlineUserStore;
_userAccessor = userAccessor;
}
@@ -30,9 +34,9 @@ public class PresenceHub : Hub
public override async Task OnConnectedAsync()
{
var userId = _userAccessor.GetUserId(Context);
if (userId == Guid.Empty)
if (userId == Guid.Empty || await _users.ExistsByIdAsync(userId) == false)
{
_logger.LogWarning("User connected with invalid UserID claim.");
_logger.LogWarning("User connected with invalid UserId claim.");
Context.Abort();
return;
}
@@ -40,7 +44,7 @@ public class PresenceHub : Hub
_onlineUserStore.SetOnlineUser(userId);
await Groups.AddToGroupAsync(Context.ConnectionId, userId.ToString());
var friends = await _notificationScopeService.GetNotifiedUsers(userId);
var friends = await _scopeService.GetNotifiedUsers(userId);
foreach (var recipient in friends)
{
@@ -51,14 +55,33 @@ public class PresenceHub : Hub
await base.OnConnectedAsync();
}
public override async Task OnDisconnectedAsync(Exception? exception)
public override async Task OnDisconnectedAsync(Exception exception)
{
var userId = _userAccessor.GetUserId(Context, true);
if (userId == Guid.Empty) return;
if (userId != Guid.Empty)
{
await Groups.RemoveFromGroupAsync(Context.ConnectionId, userId.ToString());
_logger.LogInformation(
"User {UserId} disconnected with ConnectionId {ConnectionId} and removed from their group", userId,
Context.ConnectionId);
}
else
{
_logger.LogInformation(
"User disconnected with no exception and invalid UserID claim. ConnectionId: {ConnectionId}",
Context.ConnectionId);
return;
}
_onlineUserStore.SetOfflineUser(userId);
var friends = await _notificationScopeService.GetNotifiedUsers(userId);
// Updating was online
var user = await _users.FindByIdAsync(userId);
user.WasOnline = DateTime.UtcNow;
await _users.UpdateAsync(user);
var friends = await _scopeService.GetNotifiedUsers(userId);
foreach (var recipient in friends)
{