CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[V3 Warnings] Fix warn command when no valid reason is passed (#1672)

Browse Source 
Resolves #1670
This commit is contained in:
Tobotimus 2018-05-28 06:15:56 +10:00 committed by palmtree5
parent 1de3251127
commit f4b640126b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redbot/cogs/warnings/warnings.py
View File

@ -71,7 +71,9 @@ class Warnings:
@commands.guild_only() @commands.guild_only()
async def action_add(self, ctx: commands.Context, name: str, points: int): async def action_add(self, ctx: commands.Context, name: str, points: int):
"""Create an action to be taken at a specified point count """Create an action to be taken at a specified point count
Duplicate action names are not allowed"""
Duplicate action names are not allowed
"""
guild = ctx.guild guild = ctx.guild
await ctx.send("Would you like to enter commands to be run? (y/n)") await ctx.send("Would you like to enter commands to be run? (y/n)")
@ -219,8 +221,9 @@ class Warnings:
@checks.admin_or_permissions(ban_members=True) @checks.admin_or_permissions(ban_members=True)
async def warn(self, ctx: commands.Context, user: discord.Member, reason: str): async def warn(self, ctx: commands.Context, user: discord.Member, reason: str):
"""Warn the user for the specified reason """Warn the user for the specified reason
Reason must be a registered reason, or custom if custom reasons are allowed"""
reason_type = {} Reason must be a registered reason, or "custom" if custom reasons are allowed
"""
if reason.lower() == "custom": if reason.lower() == "custom":
custom_allowed = await self.config.guild(ctx.guild).allow_custom_reasons() custom_allowed = await self.config.guild(ctx.guild).allow_custom_reasons()
if not custom_allowed: if not custom_allowed:
@ -237,6 +240,7 @@ class Warnings:
async with guild_settings.reasons() as registered_reasons: async with guild_settings.reasons() as registered_reasons:
if reason.lower() not in registered_reasons: if reason.lower() not in registered_reasons:
await ctx.send(_("That is not a registered reason!")) await ctx.send(_("That is not a registered reason!"))
return
else: else:
reason_type = registered_reasons[reason.lower()] reason_type = registered_reasons[reason.lower()]
@ -261,9 +265,11 @@ class Warnings:
@commands.guild_only() @commands.guild_only()
async def warnings(self, ctx: commands.Context, userid: int = None): async def warnings(self, ctx: commands.Context, userid: int = None):
"""Show warnings for the specified user. """Show warnings for the specified user.
If userid is None, show warnings for the person running the command If userid is None, show warnings for the person running the command
Note that showing warnings for users other than yourself requires Note that showing warnings for users other than yourself requires
appropriate permissions""" appropriate permissions
"""
if userid is None: if userid is None:
user = ctx.author user = ctx.author
else: else: