Fix remaining activity tracker related bugs

pizzaboxer · Sep 4, 2024 · 2805263 · 2805263
1 parent f0ffdbc
commit 2805263
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs
@@ -125,7 +125,6 @@ public async void Start()
  }
  }
 
- // TODO: i need to double check how this handles failed game joins (connection error, invalid permissions, etc)
  private void ReadLogEntry(string entry)
  {
  const string LOG_IDENT = "ActivityWatcher::ReadLogEntry";
@@ -142,7 +141,17 @@ private void ReadLogEntry(string entry)
  App.Logger.WriteLine(LOG_IDENT, $"Read {_logEntriesRead} log entries");
 
  if (entry.Contains(GameLeavingEntry))
- OnAppClose?.Invoke(this, new EventArgs());
+ {
+ App.Logger.WriteLine(LOG_IDENT, "User is back into the desktop app");
+
+ OnAppClose?.Invoke(this, EventArgs.Empty);
+
+ if (Data.PlaceId != 0 && !InGame)
+ {
+ App.Logger.WriteLine(LOG_IDENT, "User appears to be leaving from a cancelled/errored join");
+ Data = new();
+ }
+ }
 
  if (!InGame && Data.PlaceId == 0)
  {

diff --git a/Bloxstrap/UI/ViewModels/ContextMenu/ServerHistoryViewModel.cs b/Bloxstrap/UI/ViewModels/ContextMenu/ServerHistoryViewModel.cs
@@ -36,8 +36,7 @@ private async void LoadData()
 
  if (entries.Any())
  {
- // TODO: this will duplicate universe ids
- string universeIds = String.Join(',', entries.Select(x => x.UniverseId));
+ string universeIds = String.Join(',', entries.GroupBy(x => x.UniverseId).Select(x => x.First()));
 
  try
  {

diff --git a/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs b/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs
@@ -1,6 +1,5 @@
 namespace Bloxstrap.UI.ViewModels.Installer
 {
- // TODO: administrator check?
  public class WelcomeViewModel : NotifyPropertyChangedViewModel
  {
  // formatting is done here instead of in xaml, it's just a bit easier