From 66bafe381ab4a0fca1f9e1bcd992bf19590ac483 Mon Sep 17 00:00:00 2001 From: Phxntxm Date: Thu, 6 Apr 2017 17:01:35 -0500 Subject: [PATCH] Forbid a couple of things that can get tags and hangman stuck --- cogs/tags.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cogs/tags.py b/cogs/tags.py index 72a0e8f..13fbdd2 100644 --- a/cogs/tags.py +++ b/cogs/tags.py @@ -83,10 +83,18 @@ class Tags: return trigger = msg.content.lower().strip() + if len(trigger) > 100: + await ctx.send("Please keep tag triggers under 100 characters") + return + forbidden_tags = ['add', 'create', 'setup', 'edit', ''] + elif trigger in forbidden_tags: + await ctx.send("Sorry, but your tag trigger was detected to be forbidden. Current forbidden tag triggers are: \n{}".format("\n".join(forbidden_tags))) + return + try: await my_msg.delete() await msg.delete() - except discord.Forbidden: + except (discord.Forbidden, discord.HTTPException): pass if trigger.lower() in ['edit', 'delete', 'remove', 'stop']: @@ -105,7 +113,7 @@ class Tags: try: await my_msg.delete() await msg.delete() - except discord.Forbidden: + except (discord.Forbidden, discord.HTTPException): pass # The different DB settings