Add RuleService.CreateRuleNotFoundEmbed

BrackeysCommunity · Mar 6, 2022 · ff798c3 · ff798c3
1 parent 753d18f
commit ff798c3
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 43 deletions.
diff --git a/Hammer/CommandModules/Rules/RulesModule.DeleteRuleCommand.cs b/Hammer/CommandModules/Rules/RulesModule.DeleteRuleCommand.cs
@@ -15,24 +15,21 @@ internal sealed partial class RulesModule
     [RequirePermissionLevel(PermissionLevel.Administrator)]
     public async Task DeleteRuleCommandAsync(CommandContext context, [Description("The ID of the rule to remove.")] int ruleId)
     {
-        await context.Message.CreateReactionAsync(DiscordEmoji.FromUnicode("✅"));
-
+        await context.AcknowledgeAsync();
         DiscordGuild guild = context.Guild;
-        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
 
         if (!_ruleService.GuildHasRule(guild, ruleId))
         {
-            embed.WithColor(0xFF0000);
-            embed.WithTitle("No such rule");
-            embed.WithDescription("A rule by that ID could not be found.");
-        }
-        else
-        {
-            await _ruleService.DeleteRuleAsync(guild, ruleId);
-            embed.WithColor(0x4CAF50);
-            embed.WithTitle($"Rule {ruleId} deleted");
-            embed.WithDescription($"To view the new rules, run `{context.Prefix}rules`");
+            await context.RespondAsync(_ruleService.CreateRuleNotFoundEmbed(guild, ruleId));
+            return;
         }
+
+        await _ruleService.DeleteRuleAsync(guild, ruleId);
+
+        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
+        embed.WithColor(0x4CAF50);
+        embed.WithTitle($"Rule {ruleId} deleted");
+        embed.WithDescription($"To view the new rules, run `{context.Prefix}rules`");
 
         await context.RespondAsync(embed);
     }

diff --git a/Hammer/CommandModules/Rules/RulesModule.RuleCommand.cs b/Hammer/CommandModules/Rules/RulesModule.RuleCommand.cs
@@ -11,27 +11,24 @@ internal sealed partial class RulesModule
     [Command("rule")]
     [Description("Displays a specified rule.")]
     [RequireGuild]
-    public async Task RuleCommandAsync(CommandContext context, [Description("The ID of the rule to retrieve.")] int id)
+    public async Task RuleCommandAsync(CommandContext context, [Description("The ID of the rule to retrieve.")] int ruleId)
     {
-        await context.Message.CreateReactionAsync(DiscordEmoji.FromUnicode("✅"));
-
+        await context.AcknowledgeAsync();
         DiscordGuild guild = context.Guild;
-        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
-
-        if (!_ruleService.GuildHasRule(guild, id))
-        {
-            embed.WithColor(0xFF0000);
-            embed.WithTitle("No such rule");
-            embed.WithDescription("A rule by that ID could not be found.");
-        }
-        else
+
+        if (!_ruleService.GuildHasRule(guild, ruleId))
         {
-            Rule rule = _ruleService.GetRuleById(guild, id)!;
-            embed.WithColor(DiscordColor.Orange);
-            embed.WithTitle(string.IsNullOrWhiteSpace(rule.Brief) ? $"Rule #{rule.Id}" : $"Rule #{rule.Id}. {rule.Brief}");
-            embed.WithDescription(rule.Content);
+            await context.RespondAsync(_ruleService.CreateRuleNotFoundEmbed(guild, ruleId));
+            return;
         }
 
+        Rule rule = _ruleService.GetRuleById(guild, ruleId)!;
+
+        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
+        embed.WithColor(DiscordColor.Orange);
+        embed.WithTitle(string.IsNullOrWhiteSpace(rule.Brief) ? $"Rule #{rule.Id}" : $"Rule #{rule.Id}. {rule.Brief}");
+        embed.WithDescription(rule.Content);
+
         await context.RespondAsync(embed);
     }
 }
diff --git a/Hammer/CommandModules/Rules/RulesModule.RulesCommand.cs b/Hammer/CommandModules/Rules/RulesModule.RulesCommand.cs
@@ -22,7 +22,7 @@ public async Task RulesCommandAsync(CommandContext context)
         if (rules.Count == 0)
         {
             embed.WithColor(0xFF0000);
-            embed.WithTitle("No rules found");
+            embed.WithTitle("No Rules Found");
             embed.WithDescription($"No rules could be found for {Formatter.Bold(guild.Name)}.");
         }
         else

diff --git a/Hammer/CommandModules/Rules/RulesModule.SetRuleCommand.cs b/Hammer/CommandModules/Rules/RulesModule.SetRuleCommand.cs
@@ -17,25 +17,22 @@ public async Task SetRuleCommandAsync(CommandContext context,
         [Description("The ID of the rule to remove.")] int ruleId,
         [Description("The new rule text"), RemainingText] string ruleContent)
     {
-        await context.Message.CreateReactionAsync(DiscordEmoji.FromUnicode("✅"));
-
+        await context.AcknowledgeAsync();
         DiscordGuild guild = context.Guild;
-        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
 
         if (!_ruleService.GuildHasRule(guild, ruleId))
         {
-            embed.WithColor(0xFF0000);
-            embed.WithTitle("No such rule");
-            embed.WithDescription("A rule by that ID could not be found.");
-        }
-        else
-        {
-            await _ruleService.SetRuleContentAsync(guild, ruleId, ruleContent);
-            embed.WithColor(0x4CAF50);
-            embed.WithTitle($"Rule {ruleId} updated");
-            embed.WithDescription(ruleContent);
+            await context.RespondAsync(_ruleService.CreateRuleNotFoundEmbed(guild, ruleId));
+            return;
         }
 
+        await _ruleService.SetRuleContentAsync(guild, ruleId, ruleContent);
+
+        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
+        embed.WithColor(0x4CAF50);
+        embed.WithTitle($"Rule {ruleId} updated");
+        embed.WithDescription(ruleContent);
+
         await context.RespondAsync(embed);
     }
 }
diff --git a/Hammer/Services/RuleService.cs b/Hammer/Services/RuleService.cs
@@ -1,5 +1,6 @@
 using DisCatSharp.Entities;
 using Hammer.Data;
+using Hammer.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Extensions.DependencyInjection;
@@ -47,6 +48,21 @@ public async Task<Rule> AddRuleAsync(DiscordGuild guild, string ruleContent)
         return rule;
     }
 
+    /// <summary>
+    ///     Creates a "Rule Not Found" embed.
+    /// </summary>
+    /// <param name="guild">The guild whose branding to display.</param>
+    /// <param name="ruleId">The ID of the rule which wasn't found.</param>
+    /// <returns>A <see cref="DiscordEmbed" /> stating the rule cannot be found.</returns>
+    public DiscordEmbed CreateRuleNotFoundEmbed(DiscordGuild guild, int ruleId)
+    {
+        DiscordEmbedBuilder embed = guild.CreateDefaultEmbed(false);
+        embed.WithColor(0xFF0000);
+        embed.WithTitle("Rule Not Found");
+        embed.WithDescription($"A rule with ID {ruleId} could not be found.");
+        return embed;
+    }
+
     /// <summary>
     ///     Deletes a rule from the database.
     /// </summary>