From a33aef5c45441920ec62e614c9df3d04cdd1b23e Mon Sep 17 00:00:00 2001
From: goaaats <goatsdev@protonmail.com>
Date: Thu, 31 Mar 2022 20:24:23 +0200
Subject: [PATCH] feat: add timezone check

---
 Dalamud/Configuration/Internal/DalamudConfiguration.cs | 2 +-
 Dalamud/Dalamud.cs                                     | 7 +++++++
 Dalamud/Fools22.cs                                     | 7 +------
 Dalamud/Interface/Internal/Windows/SettingsWindow.cs   | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
index b2a11d774..e33df668e 100644
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@@ -290,7 +290,7 @@ namespace Dalamud.Configuration.Internal
         /// </summary>
         public bool ShowTsm { get; set; } = true;
 
-        public bool Fools22 { get; set; } = true;
+        public bool? Fools22New { get; set; } = true;
 
         /// <summary>
         /// Load a configuration from the provided path.
diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 691a541ef..b07bf2594 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -275,6 +275,13 @@ namespace Dalamud
                 try
                 {
                     Log.Information("Loading fools22");
+                    var timeZone = TimeZoneInfo.Local;
+                    var offset = timeZone.GetUtcOffset(DateTime.UtcNow);
+
+                    var config = Service<DalamudConfiguration>.Get();
+                    config.Fools22New = offset.Hours < 1;
+                    config.Save();
+
                     this.fools22 = new Fools22();
                 }
                 catch (Exception ex)
diff --git a/Dalamud/Fools22.cs b/Dalamud/Fools22.cs
index 2de81bc1a..380fde208 100644
--- a/Dalamud/Fools22.cs
+++ b/Dalamud/Fools22.cs
@@ -323,17 +323,12 @@ public class Fools22 : IDisposable
     {
         var config = Service<DalamudConfiguration>.Get();
 
-        if (!config.Fools22)
+        if (!(config.Fools22New ?? true))
             return false;
 
         if (!(DateTime.Now.Month == 4 && DateTime.Now.Day == 1))
             return false;
 
-        var timeZone = TimeZoneInfo.Local;
-        var offset = timeZone.GetUtcOffset(DateTime.UtcNow);
-
-        Log.Information("Fools22: UTC offset: {0}", offset);
-
         return this.assetsReady;
     }
 
diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
index 48104ed6a..909b5fe69 100644
--- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
@@ -106,8 +106,6 @@ namespace Dalamud.Interface.Internal.Windows
             this.doFocus = configuration.IsFocusManagementEnabled;
             this.doTsm = configuration.ShowTsm;
 
-            this.doFools22 = configuration.Fools22;
-
             this.dtrSpacing = configuration.DtrSpacing;
             this.dtrSwapDirection = configuration.DtrSwapDirection;
 
@@ -176,6 +174,8 @@ namespace Dalamud.Interface.Internal.Windows
             var configuration = Service<DalamudConfiguration>.Get();
             this.dtrOrder = configuration.DtrOrder;
             this.dtrIgnore = configuration.DtrIgnore;
+
+            this.doFools22 = configuration.Fools22New ?? true;
         }
 
         /// <inheritdoc/>
@@ -853,7 +853,7 @@ namespace Dalamud.Interface.Internal.Windows
             configuration.IsFocusManagementEnabled = this.doFocus;
             configuration.ShowTsm = this.doTsm;
 
-            configuration.Fools22 = this.doFools22;
+            configuration.Fools22New = this.doFools22;
 
             configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame;
             configuration.FontGamma = this.fontGamma;