From 4c21160b31eb669df2b420fd861f9740ac3c26b8 Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Sun, 7 Nov 2021 15:00:04 +0200
Subject: [PATCH] fix (rroles): Repair setting error reply.

Modified `error_reply` utility so `kwargs` are passed to `Embed`.
Added `send_args` kwarg to `error_reply`.

Fixed an rroles issue where `UserInputError` handling would fail.
---
 bot/modules/guild_admin/reaction_roles/command.py | 6 +++---
 bot/utils/ctx_addons.py                           | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bot/modules/guild_admin/reaction_roles/command.py b/bot/modules/guild_admin/reaction_roles/command.py
index 61e4a1ed..7f460262 100644
--- a/bot/modules/guild_admin/reaction_roles/command.py
+++ b/bot/modules/guild_admin/reaction_roles/command.py
@@ -821,8 +821,8 @@ async def cmd_reactionroles(ctx, flags):
                 setting = await setting_class.parse(target.messageid, ctx, flags[flag])
             except UserInputError as e:
                 return await ctx.error_reply(
-                    title="Couldn't save settings!",
-                    description="{} {}\nNo settings were modified.".format(cross, e.msg)
+                    "{} {}\nNo settings were modified.".format(cross, e.msg),
+                    title="Couldn't save settings!"
                 )
             else:
                 update_lines.append(
@@ -861,8 +861,8 @@ async def cmd_reactionroles(ctx, flags):
                     setting = await setting_class.parse(reaction.reactionid, ctx, flags[flag])
                 except UserInputError as e:
                     return await ctx.error_reply(
+                        "{} {}\nNo reaction roles were modified.".format(cross, e.msg),
                         title="Couldn't save reaction role settings!",
-                        description="{} {}\nNo reaction roles were modified.".format(cross, e.msg)
                     )
                 else:
                     update_lines.append(
diff --git a/bot/utils/ctx_addons.py b/bot/utils/ctx_addons.py
index 931422d9..9697eeec 100644
--- a/bot/utils/ctx_addons.py
+++ b/bot/utils/ctx_addons.py
@@ -26,21 +26,22 @@ async def embed_reply(ctx, desc, colour=discord.Colour.orange(), **kwargs):
 
 
 @Context.util
-async def error_reply(ctx, error_str, **kwargs):
+async def error_reply(ctx, error_str, send_args={}, **kwargs):
     """
     Notify the user of a user level error.
     Typically, this will occur in a red embed, posted in the command channel.
     """
     embed = discord.Embed(
         colour=discord.Colour.red(),
-        description=error_str
+        description=error_str,
+        **kwargs
     )
     message = None
     try:
         message = await ctx.ch.send(
             embed=embed,
             reference=ctx.msg.to_reference(fail_if_not_exists=False),
-            **kwargs
+            **send_args
         )
         ctx.sent_messages.append(message)
         return message