diff options
| author |  SebastiaanZ <[email protected]> | 2019-02-22 14:12:51 +0100 |
|---|---|---|
| committer | SebastiaanZ <[email protected]> | 2019-02-22 14:12:51 +0100 |
| commit | d7e7d62ca3605c7271f76a942280985cd6efd80b (patch) | |
| tree | 61a408a95f1e6c6a58952731456f59e2b5152da5 /bot/cogs/moderation.py | |
| parent | Merge branch 'master' into bb-improvements (diff) | |
| parent | Merge pull request #313 from python-discord/Hemlock.Users_and_Roles_adjustment (diff) | |
Resolving merge conflicts with Hemlock's STAFF_ROLES changes
Diffstat (limited to '')
| -rw-r--r-- | bot/cogs/moderation.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bot/cogs/moderation.py b/bot/cogs/moderation.py index 3c7f80a7a..5d8aa0217 100644 --- a/bot/cogs/moderation.py +++ b/bot/cogs/moderation.py @@ -13,7 +13,7 @@ from discord.ext.commands import ( from bot import constants from bot.cogs.modlog import ModLog -from bot.constants import Colours, Event, Icons, Keys, Roles, URLs +from bot.constants import Colours, Event, Icons, Keys, MODERATION_ROLES, URLs from bot.converters import InfractionSearchQuery from bot.decorators import with_role from bot.pagination import LinePaginator @@ -23,7 +23,6 @@ from bot.utils.time import parse_rfc1123, wait_until log = logging.getLogger(__name__) -MODERATION_ROLES = Roles.owner, Roles.admin, Roles.moderator INFRACTION_ICONS = { "Mute": Icons.user_mute, "Kick": Icons.sign_out, |