From bc14bb12bcb6d62271e443f2c9fab96bd8dec64f Mon Sep 17 00:00:00 2001
From: Casper Sparre <reptail@gmail.com>
Date: Wed, 21 May 2025 18:21:01 +0200
Subject: [PATCH] sub

---
 OF DL/Helpers/APIHelper.cs |  3 ---
 OF DL/Program.cs           | 13 ++++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OF DL/Helpers/APIHelper.cs b/OF DL/Helpers/APIHelper.cs
index 40be575..ceeb7b6 100644
--- a/OF DL/Helpers/APIHelper.cs	
+++ b/OF DL/Helpers/APIHelper.cs	
@@ -396,7 +396,6 @@ public class APIHelper : IAPIHelper
         };
 
         Log.Debug("Calling GetActiveSubscriptions");
-        AnsiConsole.Markup($"[red]Getting Active Subscriptions (Include Restricted: {includeRestricted})\n[/]");
 
         return await GetAllSubscriptions(getParams, endpoint, includeRestricted, config);
     }
@@ -411,7 +410,6 @@ public class APIHelper : IAPIHelper
         };
 
         Log.Debug("Calling GetExpiredSubscriptions");
-        AnsiConsole.Markup($"[red]Getting Expired Subscriptions (Include Restricted: {includeRestricted})\n[/]");
 
         return await GetAllSubscriptions(getParams, endpoint, includeRestricted, config);
     }
@@ -425,7 +423,6 @@ public class APIHelper : IAPIHelper
         };
 
         Log.Debug("Calling GetBlockedUsers");
-        AnsiConsole.Markup($"[red]Getting Blocked Users\n[/]");
 
         return await GetAllSubscriptions(getParams, endpoint, true, config);
     }
diff --git a/OF DL/Program.cs b/OF DL/Program.cs
index 49d6e79..4d05d87 100644
--- a/OF DL/Program.cs	
+++ b/OF DL/Program.cs	
@@ -897,11 +897,11 @@ public class Program
 
         if (blockedUsers is null || blockedUsers.Count == 0)
         {
-            AnsiConsole.Markup($"[red]No Blocked Users found.\n[/]");
+            AnsiConsole.Markup($"[green]No Blocked Users found.\n[/]");
         }
         else
         {
-            AnsiConsole.Markup($"[red]Found {blockedUsers.Count} Blocked Users, saving to '{OUTPUT_FILE}'\n[/]");
+            AnsiConsole.Markup($"[green]Found {blockedUsers.Count} Blocked Users, saving to '{OUTPUT_FILE}'\n[/]");
             string json = JsonConvert.SerializeObject(blockedUsers, Formatting.Indented);
             await File.WriteAllTextAsync(OUTPUT_FILE, json);
         }
@@ -918,10 +918,8 @@ public class Program
 			DateTime startTime = DateTime.Now;
             Dictionary<string, int> users = new();
 
+            AnsiConsole.Markup($"[green]Getting Active Subscriptions (Include Restricted: {Config.IncludeRestrictedSubscriptions})\n[/]");
             Dictionary<string, int> subsActive = await m_ApiHelper.GetActiveSubscriptions("/subscriptions/subscribes", Config.IncludeRestrictedSubscriptions, Config) ?? [];
-            Dictionary<string, int> subsExpired = Config!.IncludeExpiredSubscriptions
-                ? await m_ApiHelper.GetExpiredSubscriptions("/subscriptions/subscribes", Config.IncludeRestrictedSubscriptions, Config) ?? []
-                : [] ;
 
             Log.Debug("Subscriptions: ");
             foreach (KeyValuePair<string, int> activeSub in subsActive)
@@ -932,9 +930,14 @@ public class Program
 					Log.Debug($"Name: {activeSub.Key} ID: {activeSub.Value}");
 				}
 			}
+
 			if (Config!.IncludeExpiredSubscriptions)
 			{
 				Log.Debug("Inactive Subscriptions: ");
+
+                AnsiConsole.Markup($"[green]Getting Expired Subscriptions (Include Restricted: {Config.IncludeRestrictedSubscriptions})\n[/]");
+                Dictionary<string, int> subsExpired = await m_ApiHelper.GetExpiredSubscriptions("/subscriptions/subscribes", Config.IncludeRestrictedSubscriptions, Config) ?? [];
+
                 foreach (KeyValuePair<string, int> expiredSub in subsExpired)
                 {
                     if (!users.ContainsKey(expiredSub.Key))