mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
115 lines
3.3 KiB
C#
115 lines
3.3 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
|
|
namespace API.SignalR.Presence;
|
|
|
|
public interface IPresenceTracker
|
|
{
|
|
Task UserConnected(int userId, string connectionId);
|
|
Task UserDisconnected(int userId, string connectionId);
|
|
Task<int[]> GetOnlineAdminIds();
|
|
Task<List<string>> GetConnectionsForUser(int userId);
|
|
|
|
}
|
|
|
|
internal class ConnectionDetail
|
|
{
|
|
public string UserName { get; set; }
|
|
public List<string> ConnectionIds { get; set; } = new List<string>();
|
|
public bool IsAdmin { get; set; }
|
|
}
|
|
|
|
// TODO: This can respond to UserRoleUpdate events to handle online users
|
|
/// <summary>
|
|
/// This is a singleton service for tracking what users have a SignalR connection and their difference connectionIds
|
|
/// </summary>
|
|
public class PresenceTracker : IPresenceTracker
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private static readonly Dictionary<int, ConnectionDetail> OnlineUsers = new Dictionary<int, ConnectionDetail>();
|
|
|
|
public PresenceTracker(IUnitOfWork unitOfWork)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
}
|
|
|
|
public async Task UserConnected(int userId, string connectionId)
|
|
{
|
|
var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId);
|
|
if (user == null) return;
|
|
var isAdmin = await _unitOfWork.UserRepository.IsUserAdminAsync(user);
|
|
lock (OnlineUsers)
|
|
{
|
|
if (OnlineUsers.TryGetValue(userId, out var detail))
|
|
{
|
|
detail.ConnectionIds.Add(connectionId);
|
|
}
|
|
else
|
|
{
|
|
OnlineUsers.Add(userId, new ConnectionDetail()
|
|
{
|
|
UserName = user.UserName,
|
|
ConnectionIds = new List<string>() {connectionId},
|
|
IsAdmin = isAdmin
|
|
});
|
|
}
|
|
}
|
|
|
|
// Update the last active for the user
|
|
user.UpdateLastActive();
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
public Task UserDisconnected(int userId, string connectionId)
|
|
{
|
|
lock (OnlineUsers)
|
|
{
|
|
if (!OnlineUsers.ContainsKey(userId)) return Task.CompletedTask;
|
|
|
|
OnlineUsers[userId].ConnectionIds.Remove(connectionId);
|
|
|
|
if (OnlineUsers[userId].ConnectionIds.Count == 0)
|
|
{
|
|
OnlineUsers.Remove(userId);
|
|
}
|
|
}
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public static Task<string[]> GetOnlineUsers()
|
|
{
|
|
string[] onlineUsers;
|
|
lock (OnlineUsers)
|
|
{
|
|
onlineUsers = OnlineUsers.OrderBy(k => k.Value.UserName).Select(k => k.Value.UserName).ToArray();
|
|
}
|
|
|
|
return Task.FromResult(onlineUsers);
|
|
}
|
|
|
|
public Task<int[]> GetOnlineAdminIds()
|
|
{
|
|
int[] onlineUsers;
|
|
lock (OnlineUsers)
|
|
{
|
|
onlineUsers = OnlineUsers.Where(pair => pair.Value.IsAdmin).OrderBy(k => k.Key).Select(k => k.Key).ToArray();
|
|
}
|
|
|
|
|
|
return Task.FromResult(onlineUsers);
|
|
}
|
|
|
|
public Task<List<string>> GetConnectionsForUser(int userId)
|
|
{
|
|
List<string>? connectionIds;
|
|
lock (OnlineUsers)
|
|
{
|
|
connectionIds = OnlineUsers.GetValueOrDefault(userId)?.ConnectionIds;
|
|
}
|
|
|
|
return Task.FromResult(connectionIds ?? new List<string>());
|
|
}
|
|
}
|