From 148818efc36f211e1e8f560ac87fe873762ca1d4 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 5 Aug 2021 18:16:15 -0600 Subject: [PATCH] Fix settings list with rolegiver --- jarvis/cogs/jokes.py | 4 +++- jarvis/cogs/settings.py | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jarvis/cogs/jokes.py b/jarvis/cogs/jokes.py index 979e2b4..1740eba 100644 --- a/jarvis/cogs/jokes.py +++ b/jarvis/cogs/jokes.py @@ -50,7 +50,9 @@ class JokeCog(commands.Cog): return emotes = re.findall(r"(&#x[a-fA-F0-9]*;)", result["body"]) for match in emotes: - result["body"] = result["body"].replace(match, html.unescape(match)) + result["body"] = result["body"].replace( + match, html.unescape(match) + ) emotes = re.findall(r"(&#x[a-fA-F0-9]*;)", result["title"]) for match in emotes: result["title"] = result["title"].replace( diff --git a/jarvis/cogs/settings.py b/jarvis/cogs/settings.py index 8355721..d1062e1 100644 --- a/jarvis/cogs/settings.py +++ b/jarvis/cogs/settings.py @@ -250,7 +250,15 @@ class SettingsCog(commands.Cog): value = value.mention else: value = "||`[redacted]`||" - fields.append(Field(name=setting.setting, value=value)) + elif setting.setting == "rolegiver": + value = "" + for role in setting.value: + nvalue = find(lambda x: x.id == value, ctx.guild.roles) + if value: + value += "\n" + nvalue.mention + else: + value += "\n||`[redacted]`||" + fields.append(Field(name=setting.setting, value=value or "N/A")) embed = build_embed( title="Current Settings", description="", fields=fields