From 2fe3f5c9d06a1eea249b6cd7f0f5ffeae58ada22 Mon Sep 17 00:00:00 2001
From: Zevaryx <zevaryx@gmail.com>
Date: Wed, 2 Feb 2022 14:39:43 -0700
Subject: [PATCH] Fix display of role add to include all added roles

---
 jarvis/cogs/rolegiver.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jarvis/cogs/rolegiver.py b/jarvis/cogs/rolegiver.py
index 4568594..ac27d14 100644
--- a/jarvis/cogs/rolegiver.py
+++ b/jarvis/cogs/rolegiver.py
@@ -247,8 +247,10 @@ class RolegiverCog(commands.Cog):
                 timeout=60 * 5,
             )
 
+            added_roles = []
             for role in context.selected_options:
                 role = ctx.guild.get_role(int(role))
+                added_roles.append(role)
                 await ctx.author.add_roles(role, reason="Rolegiver")
 
             roles = ctx.author.roles
@@ -256,9 +258,10 @@ class RolegiverCog(commands.Cog):
                 roles.sort(key=lambda x: -x.position)
                 _ = roles.pop(-1)
 
+            avalue = "\n".join([r.mention for r in added_roles]) if added_roles else "None"
             value = "\n".join([r.mention for r in roles]) if roles else "None"
             fields = [
-                Field(name="Added Role", value=f"{role.mention}"),
+                Field(name="Added Role(s)", value=avalue),
                 Field(name="Prior Role(s)", value=value),
             ]
 
@@ -275,8 +278,11 @@ class RolegiverCog(commands.Cog):
             )
 
             embed.set_footer(text=f"{ctx.author.name}#{ctx.author.discriminator} | {ctx.author.id}")
+            for row in components:
+                for component in row["components"]:
+                    component["disabled"] = True
 
-            await ctx.send(embed=embed)
+            await message.edit_origin(embed=embed, content="\u200b", components=components)
         except asyncio.TimeoutError:
             for row in components:
                 for component in row["components"]: