diff options
| author |  Boris Muratov <[email protected]> | 2020-10-18 00:16:10 +0300 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2020-10-18 00:16:10 +0300 |
| commit | 9b7af4ec9705a9ddd99201502ca301ad46b83cf1 (patch) | |
| tree | 9c83b2e6e340d0f3d02c67c620fffa44c8c125df | |
| parent | Improved logging in is_mod_channel (diff) | |
| parent | Allow !eval in #code-help-voice-2 (diff) | |
Merge branch 'master' into mbaruh-mod-channels
| -rw-r--r-- | bot/constants.py | 1 | ||||
| -rw-r--r-- | bot/exts/moderation/infraction/_scheduler.py | 2 | ||||
| -rw-r--r-- | bot/exts/utils/snekbox.py | 2 | ||||
| -rw-r--r-- | config-default.yml | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/bot/constants.py b/bot/constants.py index 2e6c84fc7..d27683f37 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -392,6 +392,7 @@ class Channels(metaclass=YAMLGetter): bot_commands: int change_log: int code_help_voice: int + code_help_voice_2: int cooldown: int defcon: int dev_contrib: int diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py index 7f18017ac..605eb09eb 100644 --- a/bot/exts/moderation/infraction/_scheduler.py +++ b/bot/exts/moderation/infraction/_scheduler.py @@ -145,7 +145,7 @@ class InfractionScheduler: params={"user__id": str(user.id)} ) total = len(infractions) - end_msg = f" ({total} infraction{ngettext('', 's', total)} total)" + end_msg = f" (#{id_} ; {total} infraction{ngettext('', 's', total)} total)" # Execute the necessary actions to apply the infraction on Discord. if action_coro: diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py index 59a27a2be..cad451571 100644 --- a/bot/exts/utils/snekbox.py +++ b/bot/exts/utils/snekbox.py @@ -41,7 +41,7 @@ RAW_CODE_REGEX = re.compile( MAX_PASTE_LEN = 10000 # `!eval` command whitelists -EVAL_CHANNELS = (Channels.bot_commands, Channels.esoteric, Channels.code_help_voice) +EVAL_CHANNELS = (Channels.bot_commands, Channels.esoteric, Channels.code_help_voice, Channels.code_help_voice_2) EVAL_CATEGORIES = (Categories.help_available, Categories.help_in_use) EVAL_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community, Roles.partners) diff --git a/config-default.yml b/config-default.yml index baa5c783a..8266212dd 100644 --- a/config-default.yml +++ b/config-default.yml @@ -193,6 +193,7 @@ guild: # Voice code_help_voice: 755154969761677312 + code_help_voice_2: 766330079135268884 admins_voice: &ADMINS_VOICE 500734494840717332 staff_voice: &STAFF_VOICE 412375055910043655 |