aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2020-07-24 09:47:49 +0200
committerGravatar Leon Sandøy <[email protected]>2020-07-24 09:47:49 +0200
commit2723949b2fbc065bf870e7fee1275782071a180b (patch)
tree4968dbea6336f707b66f1bb60197390354ad38a9
parentImplement new guild invite filtering logic. (diff)
Catch ResponseCodeError in the ValidAllowDenyListType converter.
-rw-r--r--bot/converters.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/bot/converters.py b/bot/converters.py
index 7e21c1542..55cc630f7 100644
--- a/bot/converters.py
+++ b/bot/converters.py
@@ -1,16 +1,16 @@
+import dateutil.parser
+import dateutil.tz
+import discord
import logging
import re
import typing as t
+from aiohttp import ClientConnectorError
from datetime import datetime
-from ssl import CertificateError
-
-import dateutil.parser
-import dateutil.tz
-import discord
-from aiohttp import ClientConnectorError, ContentTypeError
from dateutil.relativedelta import relativedelta
from discord.ext.commands import BadArgument, Context, Converter, IDConverter, UserConverter
+from ssl import CertificateError
+from bot.api import ResponseCodeError
from bot.constants import URLs
from bot.utils.regex import INVITE_RE
@@ -84,7 +84,7 @@ class ValidAllowDenyListType(Converter):
"""Checks whether the given string is a valid AllowDenyList type."""
try:
valid_types = await ctx.bot.api_client.get('bot/allow_deny_lists/get_types')
- except ContentTypeError:
+ except ResponseCodeError:
raise BadArgument("Cannot validate list_type: Unable to fetch valid types from API.")
valid_types = [enum for enum, classname in valid_types]