Merge branch 'develop' into main

Hammer/Commands/Infractions/InfractionCommand.Stats.cs

@@ -3,7 +3,6 @@
 using DSharpPlus.SlashCommands.Attributes;
 using Hammer.Configuration;
 using Hammer.Data;
-using Humanizer;
 
 namespace Hammer.Commands.Infractions;
 
@@ -13,73 +12,30 @@ internal sealed partial class InfractionCommand
     [SlashRequireGuild]
     public async Task StatsAsync(InteractionContext context)
     {
-        await context.DeferAsync().ConfigureAwait(false);
-        var embed = new DiscordEmbedBuilder();
-
         IReadOnlyList<Infraction> infractions = _infractionService.GetInfractions(context.Guild);
 
         if (infractions.Count == 0)
         {
+            var embed = new DiscordEmbedBuilder();
             embed.WithColor(DiscordColor.Orange);
             embed.WithTitle("No infractions on record");
             embed.WithDescription("Statistics cannot be generated because there are no infractions on record.");
-        }
-        else
-        {
-            if (_configurationService.TryGetGuildConfiguration(context.Guild, out GuildConfiguration? guildConfiguration))
-                embed.WithColor(guildConfiguration.PrimaryColor);
-            else
-                embed.WithColor(DiscordColor.Purple);
-
-            int totalInfractions = infractions.Count;
-            Infraction[] distinctUserInfractions = infractions.DistinctBy(i => i.UserId).ToArray();
-
-            int infractedUsers = distinctUserInfractions.Length;
-            int warnedUsers = distinctUserInfractions.Count(i => i.Type == InfractionType.Warning);
-            int mutedUsers = distinctUserInfractions.Count(i => i.Type is InfractionType.Mute or InfractionType.TemporaryMute);
-            int bannedUsers = distinctUserInfractions.Count(i => i.Type is InfractionType.Ban or InfractionType.TemporaryBan);
-            int kickedUsers = distinctUserInfractions.Count(i => i.Type is InfractionType.Kick);
-            int gaggedUsers = distinctUserInfractions.Count(i => i.Type is InfractionType.Gag);
-
-            int warnings = infractions.Count(i => i.Type is InfractionType.Warning);
-            int gags = infractions.Count(i => i.Type is InfractionType.Gag);
-            int kicks = infractions.Count(i => i.Type is InfractionType.Kick);
-            int messagesDeleted = await _messageDeletionService.CountMessageDeletionsAsync(context.Guild);
-
-            int tempMuteCount = infractions.Count(i => i.Type is InfractionType.TemporaryMute);
-            int muteCount = infractions.Count(i => i.Type is InfractionType.Mute);
-            var mutes = $"{muteCount + tempMuteCount} ({tempMuteCount}T / {muteCount}P)";
 
-            int tempBanCount = infractions.Count(i => i.Type is InfractionType.TemporaryBan);
-            int banCount = infractions.Count(i => i.Type is InfractionType.Ban);
-            var bans = $"{banCount + tempBanCount} ({tempBanCount}T / {banCount}P)";
-
-            DateTimeOffset now = DateTimeOffset.UtcNow;
-            long remainingMuteDuration = _muteService.GetTemporaryMutes(context.Guild).Sum(m => (m.ExpiresAt!.Value - now).Ticks);
-            long remainingBanDuration = _banService.GetTemporaryBans(context.Guild).Sum(b => (b.ExpiresAt - now).Ticks);
-
-            embed.WithTitle("Infraction Statistics");
-            embed.AddField("Total Infractions", totalInfractions.ToString("N0"), 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);
-            embed.AddField("Total Muted Users", mutedUsers.ToString("N0"), true);
-            embed.AddField("Total Banned Users", bannedUsers.ToString("N0"), true);
-            embed.AddField("Total Kicked Users", kickedUsers.ToString("N0"), true);
-            embed.AddField("Total Gagged Users", gaggedUsers.ToString("N0"), true);
+            await context.CreateResponseAsync(embed, true).ConfigureAwait(false);
+            return;
+        }
 
-            embed.AddField("Warnings", warnings.ToString("N0"), true);
-            embed.AddField("Mutes", mutes, true);
-            embed.AddField("Bans", bans, true);
-            embed.AddField("Kicks", kicks.ToString("N0"), true);
-            embed.AddField("Gags", gags.ToString("N0"), true);
-            embed.AddField("Messages Deleted", messagesDeleted.ToString("N0"), true);
+        if (!_configurationService.TryGetGuildConfiguration(context.Guild, out GuildConfiguration? guildConfiguration))
+        {
+            await context.CreateResponseAsync("Guild is not configured!", true).ConfigureAwait(false);
+            return;
         }
 
+        await context.DeferAsync().ConfigureAwait(false);
+        DiscordEmbed result = await _infractionStatisticsService.CreateStatisticsEmbedAsync(context.Guild).ConfigureAwait(false);
+
         var builder = new DiscordWebhookBuilder();
-        builder.AddEmbed(embed);
+        builder.AddEmbed(result);
         await context.EditResponseAsync(builder).ConfigureAwait(false);
     }
 }

Hammer/Commands/Infractions/InfractionCommand.cs

@@ -11,10 +11,8 @@ internal sealed partial class InfractionCommand : ApplicationCommandModule
 {
     private readonly ConfigurationService _configurationService;
     private readonly InfractionService _infractionService;
+    private readonly InfractionStatisticsService _infractionStatisticsService;
     private readonly DiscordLogService _logService;
-    private readonly BanService _banService;
-    private readonly MessageDeletionService _messageDeletionService;
-    private readonly MuteService _muteService;
     private readonly RuleService _ruleService;
 
     /// <summary>
@@ -23,19 +21,15 @@ internal sealed partial class InfractionCommand : ApplicationCommandModule
     public InfractionCommand(
         ConfigurationService configurationService,
         DiscordLogService logService,
-        BanService banService,
         InfractionService infractionService,
-        MessageDeletionService messageDeletionService,
-        MuteService muteService,
+        InfractionStatisticsService infractionStatisticsService,
         RuleService ruleService
     )
     {
         _configurationService = configurationService;
         _infractionService = infractionService;
+        _infractionStatisticsService = infractionStatisticsService;
         _logService = logService;
-        _banService = banService;
-        _messageDeletionService = messageDeletionService;
-        _muteService = muteService;
         _ruleService = ruleService;
     }
 }

Hammer/Hammer.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <VersionPrefix>5.0.1</VersionPrefix>
+        <VersionPrefix>5.0.2</VersionPrefix>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">

Hammer/Program.cs

@@ -33,6 +33,7 @@ await Host.CreateDefaultBuilder(args)
 
         services.AddSingleton<HttpClient>();
         services.AddSingleton<ConfigurationService>();
+        services.AddSingleton<InfractionStatisticsService>();
         services.AddSingleton<MailmanService>();
         services.AddSingleton<MessageService>();
         services.AddSingleton<MessageDeletionService>();