mirror of
https://github.com/RedWizardsLab/EchoHub.git
synced 2026-09-04 08:36:11 +02:00
feat: Manage joined channels in AppOrchestrator and update channel history handling
This commit is contained in:
@@ -112,12 +112,14 @@ public class ChatHub(EchoHubDbContext db, ILogger<ChatHub> logger, PresenceTrack
|
||||
return [];
|
||||
}
|
||||
|
||||
presenceTracker.JoinChannel(CurrentUsername, channelName);
|
||||
var isNewJoin = presenceTracker.JoinChannel(CurrentUsername, channelName);
|
||||
|
||||
await Groups.AddToGroupAsync(Context.ConnectionId, channelName);
|
||||
await Clients.OthersInGroup(channelName).UserJoined(channelName, CurrentUsername);
|
||||
|
||||
logger.LogInformation("{User} joined channel '{Channel}'", CurrentUsername, channelName);
|
||||
if (isNewJoin)
|
||||
{
|
||||
await Groups.AddToGroupAsync(Context.ConnectionId, channelName);
|
||||
await Clients.OthersInGroup(channelName).UserJoined(channelName, CurrentUsername);
|
||||
logger.LogInformation("{User} joined channel '{Channel}'", CurrentUsername, channelName);
|
||||
}
|
||||
|
||||
var history = await GetChannelHistory(channelName, HubConstants.DefaultHistoryCount);
|
||||
return history;
|
||||
@@ -293,11 +295,10 @@ public class ChatHub(EchoHubDbContext db, ILogger<ChatHub> logger, PresenceTrack
|
||||
statusMessage);
|
||||
|
||||
var channels = presenceTracker.GetChannelsForUser(CurrentUsername);
|
||||
var connections = presenceTracker.GetConnectionsInChannels(channels);
|
||||
|
||||
foreach (var channel in channels)
|
||||
{
|
||||
await Clients.Group(channel).UserStatusChanged(presence);
|
||||
}
|
||||
if (connections.Count > 0)
|
||||
await Clients.Clients(connections).UserStatusChanged(presence);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -50,7 +50,10 @@ public class PresenceTracker
|
||||
return username;
|
||||
}
|
||||
|
||||
public void JoinChannel(string username, string channelName)
|
||||
/// <summary>
|
||||
/// Returns true if this is a new join, false if the user was already in the channel.
|
||||
/// </summary>
|
||||
public bool JoinChannel(string username, string channelName)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
@@ -60,7 +63,7 @@ public class PresenceTracker
|
||||
_userChannels[username] = channels;
|
||||
}
|
||||
|
||||
channels.Add(channelName);
|
||||
return channels.Add(channelName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +109,34 @@ public class PresenceTracker
|
||||
return [];
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get all unique connection IDs for users who share any of the given channels.
|
||||
/// </summary>
|
||||
public List<string> GetConnectionsInChannels(List<string> channels)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
var usernames = new HashSet<string>();
|
||||
foreach (var channel in channels)
|
||||
{
|
||||
foreach (var (username, userChannels) in _userChannels)
|
||||
{
|
||||
if (userChannels.Contains(channel))
|
||||
usernames.Add(username);
|
||||
}
|
||||
}
|
||||
|
||||
var connections = new List<string>();
|
||||
foreach (var username in usernames)
|
||||
{
|
||||
if (_userConnections.TryGetValue(username, out var conns))
|
||||
connections.AddRange(conns);
|
||||
}
|
||||
|
||||
return connections;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsOnline(string username)
|
||||
{
|
||||
return _userConnections.TryGetValue(username, out var connections) && connections.Count > 0;
|
||||
|
||||
Reference in New Issue
Block a user