aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Hassan Abouelela <[email protected]>2021-02-04 11:17:52 +0300
committerGravatar Hassan Abouelela <[email protected]>2021-02-04 11:17:52 +0300
commit1c08e5a152a3ac0f571bdbd6f6c632f9299dda03 (patch)
treecf630c0724b0a5ae6ebc520433940fb135cc36f6
parentMerge branch 'master' into voicechannel-mute (diff)
Updates Voice Channel Config
Adds the new voice and text channels to the default config, and renames all affected channels in the config and constants to match the new names.
-rw-r--r--bot/constants.py10
-rw-r--r--bot/exts/moderation/silence.py5
-rw-r--r--config-default.yml14
3 files changed, 17 insertions, 12 deletions
diff --git a/bot/constants.py b/bot/constants.py
index 95e22513f..e0ff80e93 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -441,15 +441,17 @@ class Channels(metaclass=YAMLGetter):
staff_announcements: int
admins_voice: int
+ code_help_voice_0: int
code_help_voice_1: int
- code_help_voice_2: int
- general_voice: int
+ general_voice_0: int
+ general_voice_1: int
staff_voice: int
+ code_help_chat_0: int
code_help_chat_1: int
- code_help_chat_2: int
staff_voice_chat: int
- voice_chat: int
+ voice_chat_0: int
+ voice_chat_1: int
big_brother_logs: int
talent_pool: int
diff --git a/bot/exts/moderation/silence.py b/bot/exts/moderation/silence.py
index cf4d16067..c15cbccaa 100644
--- a/bot/exts/moderation/silence.py
+++ b/bot/exts/moderation/silence.py
@@ -34,9 +34,10 @@ MSG_UNSILENCE_SUCCESS = f"{constants.Emojis.check_mark} unsilenced current chann
TextOrVoiceChannel = Union[TextChannel, VoiceChannel]
VOICE_CHANNELS = {
+ constants.Channels.code_help_voice_0: constants.Channels.code_help_chat_0,
constants.Channels.code_help_voice_1: constants.Channels.code_help_chat_1,
- constants.Channels.code_help_voice_2: constants.Channels.code_help_chat_2,
- constants.Channels.general_voice: constants.Channels.voice_chat,
+ constants.Channels.general_voice_0: constants.Channels.voice_chat_0,
+ constants.Channels.general_voice_1: constants.Channels.voice_chat_1,
constants.Channels.staff_voice: constants.Channels.staff_voice_chat,
}
diff --git a/config-default.yml b/config-default.yml
index d3b267159..8e8d1f43e 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -204,16 +204,18 @@ guild:
# Voice Channels
admins_voice: &ADMINS_VOICE 500734494840717332
- code_help_voice_1: 751592231726481530
- code_help_voice_2: 764232549840846858
- general_voice: 751591688538947646
+ code_help_voice_0: 751592231726481530
+ code_help_voice_1: 764232549840846858
+ general_voice_0: 751591688538947646
+ general_voice_1: 799641437645701151
staff_voice: &STAFF_VOICE 412375055910043655
# Voice Chat
- code_help_chat_1: 755154969761677312
- code_help_chat_2: 766330079135268884
+ code_help_chat_0: 755154969761677312
+ code_help_chat_1: 766330079135268884
staff_voice_chat: 541638762007101470
- voice_chat: 412357430186344448
+ voice_chat_0: 412357430186344448
+ voice_chat_1: 799647045886541885
# Watch
big_brother_logs: &BB_LOGS 468507907357409333