Skip to content

Commit

Permalink
Merge pull request #261 from SylteA/dev
Browse files Browse the repository at this point in the history
This should work
  • Loading branch information
SylteA authored Nov 13, 2023
2 parents 12c14c2 + d4cb6e0 commit 157c213
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bot/extensions/custom_roles/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ async def myrole(
role = interaction.guild.get_role(before.role_id)

# Return role information if no parameter is passed
if (name == before.name or name is None) and (color.value == before.color or color is None):
if (name is None or name == before.name) and (color is None or color.value == before.color):
return await interaction.response.send_message(
embed=self.role_embed("Custom Role for", interaction.user, interaction.guild.get_role(before.role_id)),
ephemeral=True,
Expand Down
20 changes: 10 additions & 10 deletions cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@ async def main(ctx):
prefixes = ("t.",)
extensions = (
"jishaku",
"bot.extensions.challenges",
"bot.extensions.readthedocs",
"bot.extensions.suggestions",
"bot.extensions.github",
"bot.extensions.tags",
"bot.extensions.levelling",
"bot.extensions.persistent_roles",
"bot.extensions.custom_roles",
"bot.extensions.polls",
"bot.extensions.youtube",
# "bot.extensions.challenges",
# "bot.extensions.readthedocs",
# "bot.extensions.suggestions",
# "bot.extensions.github",
# "bot.extensions.tags",
# "bot.extensions.levelling",
# "bot.extensions.persistent_roles",
# "bot.extensions.custom_roles",
# "bot.extensions.polls",
# "bot.extensions.youtube",
"bot.cogs._help",
"bot.cogs.clashofcode",
"bot.cogs.roles",
Expand Down

0 comments on commit 157c213

Please sign in to comment.