Merge pull request #65 from GravityWolfNotAmused/sunmoon-tags-time-tags

Sunmoon tags time tags
GravityWolfNotAmused · Jan 13, 2024 · 88dd8db · 88dd8db
2 parents 0e1a9da + 66da2d3
commit 88dd8db
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/DiscordPlayerCountBot/Bot/BotInformation.cs b/DiscordPlayerCountBot/Bot/BotInformation.cs
@@ -12,6 +12,8 @@ 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/DiscordClient.cs b/DiscordPlayerCountBot/DiscordClient.cs
@@ -23,17 +23,20 @@ public static async Task SetChannelName(this IDiscordClient socket, ulong? chann
                 throw new ArgumentException($"[Bot] - Invalid Channel Id: {channelId}, Channel was not found.");
             }
 
+            /*
+            * Keep in mind there is a massive rate limit on this call that is specific to discord, and not Discord.Net
+            * 2x per 10 minutes
+            * https://discord.com/developers/docs/topics/rate-limits
+            * https://www.reddit.com/r/Discord_Bots/comments/qzrl5h/channel_name_edit_rate_limit/
+            */
+
             if (channel != null)
             {
-		if (channel is ITextChannel && channel is not IVoiceChannel)
-		{
-			gameStatus = gameStatus.Replace('/', '-').Replace(' ', '-').Replace(':', '-');
-		}
+                if (channel is ITextChannel && channel is not IVoiceChannel)
+                {
+                    gameStatus = gameStatus.Replace('/', '-').Replace(' ', '-').Replace(':', '-');
+                }
 
-                //Keep in mind there is a massive rate limit on this call that is specific to discord, and not Discord.Net
-                //2x per 10 minutes
-                //https://discord.com/developers/docs/topics/rate-limits
-                //https://www.reddit.com/r/Discord_Bots/comments/qzrl5h/channel_name_edit_rate_limit/
                 await channel.ModifyAsync(prop => prop.Name = gameStatus);
             }
         }

diff --git a/DiscordPlayerCountBot/DiscordPlayerCountBot.csproj b/DiscordPlayerCountBot/DiscordPlayerCountBot.csproj
@@ -6,6 +6,7 @@
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
 	<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath></OutputPath>

diff --git a/DiscordPlayerCountBot/Providers/BattleMetricsProvider.cs b/DiscordPlayerCountBot/Providers/BattleMetricsProvider.cs
@@ -21,7 +21,18 @@ public BattleMetricsProvider(BotInformation info) : base(info)
 
                 HandleLastException(information);
 
-                return server.GetViewModel();
+                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;
             }
             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);
 
-                return new SteamViewModel()
+                var model = new SteamViewModel()
                 {
                     Address = addressAndPort.Item1,
                     Port = addressAndPort.Item2,
@@ -31,6 +31,26 @@ 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,5 +6,6 @@ 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,6 +4,7 @@ public class SteamViewModel : BaseViewModel
     {
         public string Map { get; set; }
         public string Gametype { get; set; }
-
+        public string Time { get; set; }
+        public string SunMoon { get; set; }
     }
 }