aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar kwzrd <[email protected]>2020-10-22 17:57:40 +0200
committerGravatar GitHub <[email protected]>2020-10-22 17:57:40 +0200
commit71b688988f20b81e9d9895de83d4dc70c683d4de (patch)
treeafae132be5f23be939064c183373fb692becc3d3
parentUpdate Python Discord badge to 100k members. (diff)
parentMerge branch 'master' into Hemlock/Add_eval_to_voice_chats (diff)
PR #1253: Allow eval in voice channels
-rw-r--r--bot/constants.py2
-rw-r--r--bot/exts/utils/snekbox.py4
-rw-r--r--config-default.yml2
3 files changed, 6 insertions, 2 deletions
diff --git a/bot/constants.py b/bot/constants.py
index b615dcd19..23d5b4304 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -377,6 +377,7 @@ class Categories(metaclass=YAMLGetter):
help_in_use: int
help_dormant: int
modmail: int
+ voice: int
class Channels(metaclass=YAMLGetter):
@@ -425,6 +426,7 @@ class Channels(metaclass=YAMLGetter):
user_event_announcements: int
user_log: int
verification: int
+ voice_chat: int
voice_gate: int
voice_log: int
diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index cad451571..213d57365 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -41,8 +41,8 @@ RAW_CODE_REGEX = re.compile(
MAX_PASTE_LEN = 10000
# `!eval` command whitelists
-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_CHANNELS = (Channels.bot_commands, Channels.esoteric)
+EVAL_CATEGORIES = (Categories.help_available, Categories.help_in_use, Categories.voice)
EVAL_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community, Roles.partners)
SIGKILL = 9
diff --git a/config-default.yml b/config-default.yml
index 98c5ff42c..071f6e1ec 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -130,6 +130,7 @@ guild:
help_dormant: 691405908919451718
modmail: &MODMAIL 714494672835444826
logs: &LOGS 468520609152892958
+ voice: 356013253765234688
channels:
# Public announcement and news channels
@@ -195,6 +196,7 @@ guild:
# Voice
code_help_voice: 755154969761677312
code_help_voice_2: 766330079135268884
+ voice_chat: 412357430186344448
admins_voice: &ADMINS_VOICE 500734494840717332
staff_voice: &STAFF_VOICE 412375055910043655