Merge branch 'develop' into main

BrackeysCommunity · Mar 8, 2023 · 6503590 · 6503590
2 parents 2c69a8d + 0c81483
commit 6503590
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Hammer/Commands/Infractions/InfractionCommand.Stats.cs b/Hammer/Commands/Infractions/InfractionCommand.Stats.cs
@@ -54,13 +54,14 @@ public async Task StatsAsync(InteractionContext context)
             int banCount = infractions.Count(i => i.Type is InfractionType.Ban);
             var bans = $"{banCount + tempBanCount} ({tempBanCount}T / {banCount}P)";
 
-            long totalMuteDuration = _muteService.GetTemporaryMutes(context.Guild).Sum(m => m.ExpiresAt!.Value.Ticks);
-            long totalBanDuration = _banService.GetTemporaryBans(context.Guild).Sum(m => m.ExpiresAt.Ticks);
+            DateTimeOffset now = DateTimeOffset.UtcNow;
+            long remainingMuteDuration = _muteService.GetTemporaryMutes(context.Guild).Sum(m => (now - m.ExpiresAt!.Value).Ticks);
+            long remainingBanDuration = _banService.GetTemporaryBans(context.Guild).Sum(b => (now - b.ExpiresAt).Ticks);
 
             embed.WithTitle("Infraction Statistics");
             embed.AddField("Total Infractions", totalInfractions.ToString("N0"), true);
-            embed.AddField("Total Mute Duration", TimeSpan.FromTicks(totalMuteDuration).Humanize(), true);
-            embed.AddField("Total Ban Duration", TimeSpan.FromTicks(totalBanDuration).Humanize(), true);
+            embed.AddField("Remaining Mute Duration", TimeSpan.FromTicks(remainingMuteDuration).Humanize(), true);
+            embed.AddField("Remaining Ban Duration", TimeSpan.FromTicks(remainingBanDuration).Humanize(), true);
 
             embed.AddField("Total Infracted Users", infractedUsers.ToString("N0"), true);
             embed.AddField("Total Warned Users", warnedUsers.ToString("N0"), true);

diff --git a/Hammer/Hammer.csproj b/Hammer/Hammer.csproj
@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <VersionPrefix>5.0.0</VersionPrefix>
+        <VersionPrefix>5.0.1</VersionPrefix>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">