Merge branch 'master' into new-env-tag

1 files changed, 19 insertions, 18 deletions

diff --git a/config-default.yml b/config-default.yml
index ca89bb639..6695cffed 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -28,6 +28,9 @@ style:
         soft_green: 0x68c290
         soft_orange: 0xf9cb54
         bright_green: 0x01d277
+        orange: 0xe67e22
+        pink: 0xcf84e0
+        purple: 0xb734eb
 
     emojis:
         defcon_disabled: "<:defcondisabled:470326273952972810>"
@@ -68,6 +71,8 @@ style:
         comments:       "<:reddit_comments:755845255001014384>"
         user:           "<:reddit_users:755845303822974997>"
 
+        ok_hand: ":ok_hand:"
+
     icons:
         crown_blurple: "https://cdn.discordapp.com/emojis/469964153289965568.png"
         crown_green:   "https://cdn.discordapp.com/emojis/469964154719961088.png"
@@ -152,11 +157,14 @@ guild:
 
         # Discussion
         meta:                               429409067623251969
-        python_discussion:  &PY_DISCUSSION  267624335836053506
+        python_general:     &PY_GENERAL     267624335836053506
 
         # Python Help: Available
         cooldown:           720603994149486673
 
+        # Topical
+        discord_py:         343944376055103488
+
         # Logs
         attachment_log:     &ATTACH_LOG     649243850006855680
         message_log:        &MESSAGE_LOG    467752170159079424
@@ -173,7 +181,6 @@ guild:
         # Special
         bot_commands:       &BOT_CMD        267659945086812160
         esoteric:                           470884583684964352
-        verification:                       352442727016693763
         voice_gate:                         764802555427029012
 
         # Staff
@@ -186,6 +193,8 @@ guild:
         mods:               &MODS           305126844661760000
         mod_alerts:                         473092532147060736
         mod_spam:           &MOD_SPAM       620607373828030464
+        mod_tools:          &MOD_TOOLS      775413915391098921
+        mod_meta:           &MOD_META       775412552795947058
         organisation:       &ORGANISATION   551789653284356126
         staff_lounge:       &STAFF_LOUNGE   464905259261755392
         duck_pond:          &DUCK_POND      637820308341915648
@@ -219,6 +228,8 @@ guild:
     moderation_channels:
         - *ADMINS
         - *ADMIN_SPAM
+        - *MOD_META
+        - *MOD_TOOLS
         - *MODS
         - *MOD_SPAM
 
@@ -244,8 +255,6 @@ guild:
         python_community:   &PY_COMMUNITY_ROLE  458226413825294336
         sprinters:          &SPRINTERS          758422482289426471
 
-        unverified:                             739794855945044069
-        verified:                               352427296948486144  # @Developers on PyDis
         voice_verified:                         764802720779337729
 
         # Staff
@@ -424,7 +433,7 @@ code_block:
 
     # The channels which will be affected by a cooldown. These channels are also whitelisted.
     cooldown_channels:
-        - *PY_DISCUSSION
+        - *PY_GENERAL
 
     # Sending instructions triggers a cooldown on a per-channel basis.
     # More instruction messages will not be sent in the same channel until the cooldown has elapsed.
@@ -489,7 +498,7 @@ redirect_output:
 
 
 duck_pond:
-    threshold: 4
+    threshold: 5
     channel_blacklist:
         - *ANNOUNCEMENTS
         - *PYNEWS_CHANNEL
@@ -514,18 +523,6 @@ python_news:
     webhook: *PYNEWS_WEBHOOK
 
 
-verification:
-    unverified_after: 3  # Days after which non-Developers receive the @Unverified role
-    kicked_after: 30  # Days after which non-Developers get kicked from the guild
-    reminder_frequency: 28  # Hours between @Unverified pings
-    bot_message_delete_delay: 10  # Seconds before deleting bots response in #verification
-
-    # Number in range [0, 1] determining the percentage of unverified users that are safe
-    # to be kicked from the guild in one batch, any larger amount will require staff confirmation,
-    # set this to 0 to require explicit approval for batches of any size
-    kick_confirmation_threshold: 0.01  # 1%
-
-
 voice_gate:
     minimum_days_member: 3  # How many days the user must have been a member for
     minimum_messages: 50  # How many messages a user must have to be eligible for voice
@@ -534,5 +531,9 @@ voice_gate:
     voice_ping_delete_delay: 60  # Seconds before deleting the bot's ping to user in Voice Gate
 
 
+branding:
+    cycle_frequency: 3  # How many days bot wait before refreshing server icon
+
+
 config:
     required_keys: ['bot.token']