From 8e141ab43d920b1a954c77536e3ff861265fe35c Mon Sep 17 00:00:00 2001
From: Spirtix <michal.prazak1@gmail.com>
Date: Fri, 18 Apr 2025 15:18:13 +0200
Subject: [PATCH] better upcoming mission filtering

---
 src/Controllers/Common/ContentController.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Controllers/Common/ContentController.cs b/src/Controllers/Common/ContentController.cs
index 75d7143..52dea2b 100644
--- a/src/Controllers/Common/ContentController.cs
+++ b/src/Controllers/Common/ContentController.cs
@@ -971,19 +971,18 @@ public class ContentController : Controller {
         HashSet<int> upcomingMissionsSet = new(missionStore.GetUpcomingMissions(gameVersion));
         var toDiscardIds = new HashSet<int>(
             viking.MissionStates
-                  .Where(x => x.MissionStatus == MissionStatus.Active ||
-                              x.MissionStatus == MissionStatus.Completed)
+                  .Where(x => x.MissionStatus != MissionStatus.Upcoming)
                   .Select(x => x.MissionId)
         );
-        upcomingMissionsSet.ExceptWith(toDiscardIds);
 
         var toAddIds = new HashSet<int>(
             viking.MissionStates
                   .Where(x => x.MissionStatus == MissionStatus.Upcoming)
                   .Select(x => x.MissionId)
         );
-        toAddIds.ExceptWith(upcomingMissionsSet);
+
         upcomingMissionsSet.UnionWith(toAddIds);
+        upcomingMissionsSet.ExceptWith(toDiscardIds);
 
         foreach (var missionId in upcomingMissionsSet)
             result.Missions.Add(missionService.GetMissionWithProgress(missionId, viking.Id, gameVersion));