diff --git a/cogs/mod.py b/cogs/mod.py index 8f1fc58e1..2d52ae6af 100644 --- a/cogs/mod.py +++ b/cogs/mod.py @@ -84,18 +84,19 @@ class Mod: @commands.command(no_pm=True, pass_context=True) @checks.admin_or_permissions(manage_nicknames=True) - async def rename(self, ctx, user : discord.Member, *, nickname): - """Changes user's nickname""" + async def rename(self, ctx, user : discord.Member, *, nickname=""): + """Changes user's nickname + + Leaving the nickname empty will remove it.""" nickname = nickname.strip() - if nickname != "": - try: - await self.bot.change_nickname(user, nickname) - await self.bot.say("Done.") - except discord.Forbidden: - await self.bot.say("I cannot do that, I lack the " - "\"Manage Nicknames\" permission.") - else: - await send_cmd_help(ctx) + if nickname == "": + nickname = None + try: + await self.bot.change_nickname(user, nickname) + await self.bot.say("Done.") + except discord.Forbidden: + await self.bot.say("I cannot do that, I lack the " + "\"Manage Nicknames\" permission.") @commands.group(pass_context=True, no_pm=True) @checks.mod_or_permissions(manage_messages=True) diff --git a/cogs/owner.py b/cogs/owner.py index ad72ba820..a90e98d18 100644 --- a/cogs/owner.py +++ b/cogs/owner.py @@ -218,18 +218,19 @@ class Owner: @_set.command(pass_context=True, no_pm=True) @checks.is_owner() - async def nickname(self, ctx, *, nickname): - """Sets Red's nickname""" + async def nickname(self, ctx, *, nickname=""): + """Sets Red's nickname + + Leaving this empty will remove it.""" nickname = nickname.strip() - if nickname != "": - try: - await self.bot.change_nickname(ctx.message.server.me, nickname) - await self.bot.say("Done.") - except discord.Forbidden: - await self.bot.say("I cannot do that, I lack the " - "\"Change Nickname\" permission.") - else: - await send_cmd_help(ctx) + if nickname == "": + nickname = None + try: + await self.bot.change_nickname(ctx.message.server.me, nickname) + await self.bot.say("Done.") + except discord.Forbidden: + await self.bot.say("I cannot do that, I lack the " + "\"Change Nickname\" permission.") @_set.command(pass_context=True) @checks.is_owner()