Merge pull request #64 from GravityWolfNotAmused/revert-63-sunmoon-ta…

…gs-and-time-tag-for-steam Revert "Sunmoon tags and time tag for steam games"
GravityWolfNotAmused · Jan 13, 2024 · 0e1a9da · 0e1a9da
2 parents 7ba2f07 + 468c980
commit 0e1a9da
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 41 deletions.
diff --git a/DiscordPlayerCountBot/Bot/BotInformation.cs b/DiscordPlayerCountBot/Bot/BotInformation.cs
@@ -12,8 +12,6 @@ public class BotInformation
         public int ProviderType { get; set; } = 0;
         public ulong? ChannelID { get; set; }
         public string? StatusFormat { get; set; }
-        public int? SunriseHour { get; set; }
-        public int? SunsetHour { get; set; }
 
         public Tuple<string, ushort> GetAddressAndPort()
         {

diff --git a/DiscordPlayerCountBot/Providers/BattleMetricsProvider.cs b/DiscordPlayerCountBot/Providers/BattleMetricsProvider.cs
@@ -1,6 +1,4 @@
-using SteamQueryNet.Enums;
-
-namespace PlayerCountBot.Providers
+namespace PlayerCountBot.Providers
 {
     [Name("BattleMetrics")]
     public class BattleMetricsProvider : ServerInformationProvider
@@ -23,18 +21,7 @@ public BattleMetricsProvider(BotInformation info) : base(info)
 
                 HandleLastException(information);
 
-                var model = server.GetViewModel();
-
-                if (!string.IsNullOrEmpty(model.Time) && TimeOnly.TryParse(model.Time, out var time))
-                {
-                    if (information.SunriseHour.HasValue && information.SunsetHour.HasValue)
-                        model.SunMoon = time.Hour > information.SunriseHour && time.Hour < information.SunsetHour ? "☀️" : "🌙";
-
-                    if (!information.SunriseHour.HasValue || !information.SunsetHour.HasValue)
-                        model.SunMoon = time.Hour > 6 && time.Hour < 20 ? "☀️" : "🌙";
-                }
-
-                return model;
+                return server.GetViewModel();
             }
             catch (Exception e)
             {

diff --git a/DiscordPlayerCountBot/Providers/SteamProvider.cs b/DiscordPlayerCountBot/Providers/SteamProvider.cs
@@ -21,7 +21,7 @@ public SteamProvider(BotInformation info) : base(info)
 
                 HandleLastException(information);
 
-                var model = new SteamViewModel()
+                return new SteamViewModel()
                 {
                     Address = addressAndPort.Item1,
                     Port = addressAndPort.Item2,
@@ -31,26 +31,6 @@ public SteamProvider(BotInformation info) : base(info)
                     Gametype = response.gametype,
                     Map = response.map
                 };
-
-                var serverTime = model.Gametype.Split(",")
-                    .Where(entry => entry.Contains(':') && entry.Length == 5)
-                    .FirstOrDefault();
-
-                if (!string.IsNullOrEmpty(serverTime))
-                {
-                    if (TimeOnly.TryParse(serverTime, out var time))
-                    {
-                        if (information.SunriseHour.HasValue && information.SunsetHour.HasValue)
-                            model.SunMoon = time.Hour > information.SunriseHour && time.Hour < information.SunsetHour ? "☀️" : "🌙";
-
-                        if (!information.SunriseHour.HasValue || !information.SunsetHour.HasValue)
-                            model.SunMoon = time.Hour > 6 && time.Hour < 20 ? "☀️" : "🌙";
-
-                        model.Time = serverTime;
-                    }
-                }
-
-                return model;
             }
             catch (Exception e)
             {

diff --git a/DiscordPlayerCountBot/ViewModels/BattleMetrics/BattleMetricsViewModel.cs b/DiscordPlayerCountBot/ViewModels/BattleMetrics/BattleMetricsViewModel.cs
@@ -6,6 +6,5 @@ public class BattleMetricsViewModel : BaseViewModel
         public string Time { get; set; }
         public string GameMode { get; set; }
         public int Rank { get; set; }
-        public string SunMoon { get; set; }
     }
 }
diff --git a/DiscordPlayerCountBot/ViewModels/Steam/SteamViewModel.cs b/DiscordPlayerCountBot/ViewModels/Steam/SteamViewModel.cs
@@ -4,7 +4,6 @@ public class SteamViewModel : BaseViewModel
     {
         public string Map { get; set; }
         public string Gametype { get; set; }
-        public string Time { get; set; }
-        public string SunMoon { get; set; }
+
     }
 }