
* Took care of some notes in the code * Fixed an issue where Extra might get flagged as special too early, if in a word like Extraordinary * Moved Tag cleanup code into Scanner service. Added a SplitQuery to another heavy API. Refactored Scan loop to remove parallelism and use async instead. * Lots of rework on the codebase to support detailed messages and easier management of message sending. Need to take a break on this work. * Progress is being made, but slowly. Code is broken in this commit. * Progress is being made, but slowly. Code is broken in this commit. * Fixed merge issue * Fixed unit tests * CoverUpdate is now hooked into new ProgressEvent structure * Refactored code to remove custom observables and have everything use standard messages$ * Refactored a ton of instances to NotificationProgressEvent style and tons of the UI to respect that too. UI is still a bit buggy, but wholistically the work is done. * Working much better. Sometimes events come in too fast. Currently cover update progress doesn't display on UI * Fixed unit tests * Removed SignalREvent to minimize internal event types. Updated the UI to use progress bars. Finished SiteThemeService. * Merged metadata refresh progress events and changed library scan events to merge cleaner in the UI * Changed RefreshMetadataProgress to CoverUpdateProgress to reflect the event better. * Theme Cleanup (#1089) * Fixed e-ink theme not properly applying correctly * Fixed some seed changes. Changed card checkboxes to use our themed ones * Fixed recently added carousel not going to recently-added page * Fixed an issue where no results found would show when searching for a library name * Cleaned up list a bit, typeahead dropdown still needs work * Added a TODO to streamline series-card component * Removed ng-lazyload-image module since we don't use it. We use lazysizes * Darken card on hover * Fixing accordion focus style * ux pass updates - Fixed typeahead width - Fixed changelog download buttons - Fixed a select - Fixed various input box-shadows - Fixed all anchors to only have underline on hover - Added navtab hover and active effects * more ux pass - Fixed spacing on theme cards - Fixed some light theme issues - Exposed text-muted-color for theme card subtitle color * UX pass fixes - Changed back to bright green for primary on dark theme - Changed fa icon to black on e-ink * Merged changelog component * Fixed anchor buttons text decoration * Changed nav tabs to have a background color instead of open active state * When user is not authenticated, make sure we set default theme (dark) * Cleanup on carousel * Updated Users tab to use small buttons with icons to align with Library tab * Cleaned up brand to not underline, removed default link underline on hover in dropdown and pill tabs * Fixed collection detail posters not rendering Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> * Bump versions by dotnet-bump-version. * Tweaked some of the emitting code * Some css, but pretty bad. Robbie please save me * Removed a todo * styling update * Only send filename on FileScanProgress * Some console.log spam cleanup * Various updates * Show events widget activity based on activeEvents * progress bar color updates * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
113 lines
3.5 KiB
C#
113 lines
3.5 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
|
|
namespace API.SignalR.Presence
|
|
{
|
|
public interface IPresenceTracker
|
|
{
|
|
Task UserConnected(string username, string connectionId);
|
|
Task UserDisconnected(string username, string connectionId);
|
|
Task<string[]> GetOnlineAdmins();
|
|
Task<List<string>> GetConnectionsForUser(string username);
|
|
|
|
}
|
|
|
|
internal class ConnectionDetail
|
|
{
|
|
public List<string> ConnectionIds { get; set; }
|
|
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<string, ConnectionDetail> OnlineUsers = new Dictionary<string, ConnectionDetail>();
|
|
|
|
public PresenceTracker(IUnitOfWork unitOfWork)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
}
|
|
|
|
public async Task UserConnected(string username, string connectionId)
|
|
{
|
|
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(username);
|
|
var isAdmin = await _unitOfWork.UserRepository.IsUserAdminAsync(user);
|
|
lock (OnlineUsers)
|
|
{
|
|
if (OnlineUsers.ContainsKey(username))
|
|
{
|
|
OnlineUsers[username].ConnectionIds.Add(connectionId);
|
|
}
|
|
else
|
|
{
|
|
OnlineUsers.Add(username, new ConnectionDetail()
|
|
{
|
|
ConnectionIds = new List<string>() {connectionId},
|
|
IsAdmin = isAdmin
|
|
});
|
|
}
|
|
}
|
|
|
|
// Update the last active for the user
|
|
user.LastActive = DateTime.Now;
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
public Task UserDisconnected(string username, string connectionId)
|
|
{
|
|
lock (OnlineUsers)
|
|
{
|
|
if (!OnlineUsers.ContainsKey(username)) return Task.CompletedTask;
|
|
|
|
OnlineUsers[username].ConnectionIds.Remove(connectionId);
|
|
|
|
if (OnlineUsers[username].ConnectionIds.Count == 0)
|
|
{
|
|
OnlineUsers.Remove(username);
|
|
}
|
|
}
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public static Task<string[]> GetOnlineUsers()
|
|
{
|
|
string[] onlineUsers;
|
|
lock (OnlineUsers)
|
|
{
|
|
onlineUsers = OnlineUsers.OrderBy(k => k.Key).Select(k => k.Key).ToArray();
|
|
}
|
|
|
|
return Task.FromResult(onlineUsers);
|
|
}
|
|
|
|
public Task<string[]> GetOnlineAdmins()
|
|
{
|
|
string[] 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(string username)
|
|
{
|
|
List<string> connectionIds;
|
|
lock (OnlineUsers)
|
|
{
|
|
connectionIds = OnlineUsers.GetValueOrDefault(username)?.ConnectionIds;
|
|
}
|
|
|
|
return Task.FromResult(connectionIds);
|
|
}
|
|
}
|
|
}
|