Skip to content

Update AHelpUIController.cs #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Punkercelestial wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update AHelpUIController.cs #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 96 additions & 7 deletions Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,9 @@ private void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args, EntitySessionEv
private void OnBwoinkTextHistoryMessage(SharedBwoinkSystem.BwoinkTextHistoryMessage args, EntitySessionEventArgs session)
{
EnsureUIHelper();
UIHelper?.Clean(args.UserId);
foreach (var msg in args.Messages)
{
UIHelper?.Receive(msg);
}
UIHelper?.SetLoadDb(args.UserId);
// REMOVED: UIHelper?.Clean(args.UserId); // <-- removed to avoid clearing live messages
UIHelper?.LoadHistory(args.UserId, args.Messages);
UIHelper?.SetHistoryLoaded(args.UserId);
}
// Sunrise-End

Expand Down Expand Up @@ -360,8 +357,12 @@ public interface IAHelpUIHandler : IDisposable
// Sunrise-Start
public void SetLoadDb(NetUserId userId);
public void Clean(NetUserId userId);
// NEW: load history without discarding pending messages
public void LoadHistory(NetUserId userId, List<SharedBwoinkSystem.BwoinkTextMessage> messages);
public void SetHistoryLoaded(NetUserId userId);
// Sunrise-End
}

public sealed class AdminAHelpUIHandler : IAHelpUIHandler
{
private readonly NetUserId _ownerId;
Expand All @@ -372,6 +373,10 @@ public AdminAHelpUIHandler(NetUserId owner, BwoinkSystem? bwoinkSystem) // Sunri
_ownerId = owner;
}
private readonly Dictionary<NetUserId, BwoinkPanel> _activePanelMap = new();
// NEW: per-channel pending messages and history loaded flag
private readonly Dictionary<NetUserId, bool> _historyLoaded = new();
private readonly Dictionary<NetUserId, List<SharedBwoinkSystem.BwoinkTextMessage>> _pendingMessages = new();

public bool IsAdmin => true;
public bool IsOpen => Window is { Disposed: false, IsOpen: true } || ClydeWindow is { IsDisposed: false };
public bool EverOpened;
Expand All @@ -384,10 +389,48 @@ public AdminAHelpUIHandler(NetUserId owner, BwoinkSystem? bwoinkSystem) // Sunri
public void Receive(SharedBwoinkSystem.BwoinkTextMessage message)
{
var panel = EnsurePanel(message.UserId);

// If history hasn't been loaded for this user yet, buffer the message
if (!_historyLoaded.TryGetValue(message.UserId, out var loaded) || !loaded)
{
if (!_pendingMessages.ContainsKey(message.UserId))
_pendingMessages[message.UserId] = new List<SharedBwoinkSystem.BwoinkTextMessage>();
_pendingMessages[message.UserId].Add(message);
return;
}

panel.ReceiveLine(message);
Control?.OnBwoink(message.UserId);
}

public void LoadHistory(NetUserId userId, List<SharedBwoinkSystem.BwoinkTextMessage> messages)
{
var panel = EnsurePanel(userId);

// Clear the panel first (history overwrites what was there)
panel.TextOutput.Clear();

// Insert all historical messages
foreach (var msg in messages)
panel.ReceiveLine(msg);

// Append any messages that arrived while history was loading
if (_pendingMessages.TryGetValue(userId, out var pending))
{
foreach (var msg in pending)
panel.ReceiveLine(msg);
_pendingMessages.Remove(userId);
}

_historyLoaded[userId] = true;
Control?.OnBwoink(userId);
}

public void SetHistoryLoaded(NetUserId userId)
{
_historyLoaded[userId] = true;
}

private void OpenWindow()
{
if (Window == null)
Expand Down Expand Up @@ -468,6 +511,7 @@ public void Clean(NetUserId userId)
{
panel.TextOutput.Clear();
}
// Do NOT clear _historyLoaded or _pendingMessages here
}

public void LoadDbMessages(NetUserId userId)
Expand Down Expand Up @@ -560,6 +604,8 @@ public void Dispose()
}
// Sunrise-End
_activePanelMap.Clear();
_pendingMessages.Clear();
_historyLoaded.Clear();
EverOpened = false;
}
}
Expand All @@ -580,14 +626,53 @@ public UserAHelpUIHandler(NetUserId owner, BwoinkSystem? bwoinkSystem) // Sunris
private bool _discordRelayActive;
public bool LoadDb;

// NEW: buffer for messages arriving before history
private bool _historyLoaded;
private List<SharedBwoinkSystem.BwoinkTextMessage> _pendingMessages = new();

public void Receive(SharedBwoinkSystem.BwoinkTextMessage message)
{
DebugTools.Assert(message.UserId == _ownerId);
EnsureInit(_discordRelayActive);

// If history hasn't been loaded yet, buffer the message
if (!_historyLoaded)
{
_pendingMessages.Add(message);
return;
}

_chatPanel!.ReceiveLine(message);
_window!.OpenCentered();
}

public void LoadHistory(NetUserId userId, List<SharedBwoinkSystem.BwoinkTextMessage> messages)
{
if (userId != _ownerId) return;
EnsureInit(_discordRelayActive);

// Clear the panel first
_chatPanel!.TextOutput.Clear();

// Insert all historical messages
foreach (var msg in messages)
_chatPanel.ReceiveLine(msg);

// Append any messages that arrived while history was loading
foreach (var msg in _pendingMessages)
_chatPanel.ReceiveLine(msg);

_pendingMessages.Clear();
_historyLoaded = true;
_window!.OpenCentered();
}

public void SetHistoryLoaded(NetUserId userId)
{
if (userId == _ownerId)
_historyLoaded = true;
}

// Sunrise-Start
public void SetLoadDb(NetUserId userId)
{
Expand All @@ -596,7 +681,9 @@ public void SetLoadDb(NetUserId userId)

public void Clean(NetUserId userId)
{
_chatPanel!.TextOutput.Clear();
if (userId == _ownerId && _chatPanel != null)
_chatPanel.TextOutput.Clear();
// Do NOT clear _historyLoaded or _pendingMessages here
}

public bool IsLoadDb(NetUserId userId)
Expand Down Expand Up @@ -700,5 +787,7 @@ public void Dispose()
_window = null;
_chatPanel = null;
LoadDb = false; // Sunrise-Edit
_historyLoaded = false;
_pendingMessages.Clear();
}
}
Loading