Merge branch 'rolegiver_patch' into 'main'

Fix display of role add to include all added roles

See merge request stark-industries/j.a.r.v.i.s.!42
This commit is contained in:
Zeva Rose 2022-02-02 21:40:11 +00:00
commit 8172efee23

View file

@ -247,8 +247,10 @@ class RolegiverCog(commands.Cog):
timeout=60 * 5, timeout=60 * 5,
) )
added_roles = []
for role in context.selected_options: for role in context.selected_options:
role = ctx.guild.get_role(int(role)) role = ctx.guild.get_role(int(role))
added_roles.append(role)
await ctx.author.add_roles(role, reason="Rolegiver") await ctx.author.add_roles(role, reason="Rolegiver")
roles = ctx.author.roles roles = ctx.author.roles
@ -256,9 +258,10 @@ class RolegiverCog(commands.Cog):
roles.sort(key=lambda x: -x.position) roles.sort(key=lambda x: -x.position)
_ = roles.pop(-1) _ = 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" value = "\n".join([r.mention for r in roles]) if roles else "None"
fields = [ fields = [
Field(name="Added Role", value=f"{role.mention}"), Field(name="Added Role(s)", value=avalue),
Field(name="Prior Role(s)", value=value), 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}") 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: except asyncio.TimeoutError:
for row in components: for row in components:
for component in row["components"]: for component in row["components"]: