Merge branch 'master' into bug/backend/906/converter-year-range

1 files changed, 43 insertions, 9 deletions

diff --git a/config-default.yml b/config-default.yml
index f2b0bfa9f..3a1bdae54 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -3,6 +3,12 @@ bot:
     token:       !ENV "BOT_TOKEN"
     sentry_dsn:  !ENV "BOT_SENTRY_DSN"
 
+    redis:
+        host:  "redis"
+        port:  6379
+        password: !ENV "REDIS_PASSWORD"
+        use_fakeredis: false
+
     stats:
         statsd_host: "graphite"
         presence_update_timeout: 300
@@ -118,10 +124,12 @@ guild:
         help_available:                     691405807388196926
         help_in_use:                        696958401460043776
         help_dormant:                       691405908919451718
+        modmail:                            714494672835444826
 
     channels:
         announcements:                              354619224620138496
         user_event_announcements:   &USER_EVENT_A   592000283102674944
+        python_news:                &PYNEWS_CHANNEL 704372456592506880
 
         # Development
         dev_contrib:        &DEV_CONTRIB    635950537262759947
@@ -132,6 +140,9 @@ guild:
         meta:               429409067623251969
         python_discussion:  267624335836053506
 
+        # Python Help: Available
+        how_to_get_help:    704250143020417084
+
         # Logs
         attachment_log:     &ATTACH_LOG     649243850006855680
         message_log:        &MESSAGE_LOG    467752170159079424
@@ -160,6 +171,7 @@ guild:
         mod_spam:           &MOD_SPAM       620607373828030464
         organisation:       &ORGANISATION   551789653284356126
         staff_lounge:       &STAFF_LOUNGE   464905259261755392
+        incidents:                          714214212200562749
 
         # Voice
         admins_voice:       &ADMINS_VOICE   500734494840717332
@@ -201,6 +213,7 @@ guild:
     roles:
         announcements:                          463658397560995840
         contributors:                           295488872404484098
+        help_cooldown:                          699189276025421825
         muted:              &MUTED_ROLE         277914926603829249
         partners:                               323426753857191936
         python_community:   &PY_COMMUNITY_ROLE  458226413825294336
@@ -231,11 +244,12 @@ guild:
         - *HELPERS_ROLE
 
     webhooks:
-        talent_pool:    569145364800602132
-        big_brother:    569133704568373283
-        reddit:         635408384794951680
-        duck_pond:      637821475327311927
-        dev_log:        680501655111729222
+        talent_pool:                    569145364800602132
+        big_brother:                    569133704568373283
+        reddit:                         635408384794951680
+        duck_pond:                      637821475327311927
+        dev_log:                        680501655111729222
+        python_news:    &PYNEWS_WEBHOOK 704381182279942324
 
 
 filter:
@@ -259,7 +273,8 @@ filter:
     guild_invite_whitelist:
         - 280033776820813825  # Functional Programming
         - 267624335836053506  # Python Discord
-        - 440186186024222721  # Python Discord: ModLog Emojis
+        - 440186186024222721  # Python Discord: Emojis 1
+        - 578587418123304970  # Python Discord: Emojis 2
         - 273944235143593984  # STEM
         - 348658686962696195  # RLBot
         - 531221516914917387  # Pallets
@@ -276,6 +291,13 @@ filter:
         - 336642139381301249  # discord.py
         - 405403391410438165  # Sentdex
         - 172018499005317120  # The Coding Den
+        - 666560367173828639  # PyWeek
+        - 702724176489873509  # Microsoft Python
+        - 81384788765712384   # Discord API
+        - 613425648685547541  # Discord Developers
+        - 185590609631903755  # Blender Hub
+        - 420324994703163402  # /r/FlutterDev
+        - 488751051629920277  # Python Atlanta
 
     domain_blacklist:
         - pornhub.com
@@ -304,6 +326,9 @@ filter:
         - poweredbydialup.online
         - poweredbysecurity.org
         - poweredbysecurity.online
+        - ssteam.site
+        - steamwalletgift.com
+        - discord.gift
 
     word_watchlist:
         - goo+ks*
@@ -503,9 +528,6 @@ free:
     cooldown_rate: 1
     cooldown_per: 60.0
 
-mention:
-    message_timeout: 300
-    reset_delay: 5
 
 help_channels:
     enable: true
@@ -520,6 +542,10 @@ help_channels:
     # Allowed duration of inactivity before making a channel dormant
     idle_minutes: 30
 
+    # Allowed duration of inactivity when question message deleted
+    # and no one other sent before message making channel dormant.
+    deleted_idle_minutes: 5
+
     # Maximum number of channels to put in the available category
     max_available: 2
 
@@ -568,5 +594,13 @@ duck_pond:
         - *DUCKY_MAUL
         - *DUCKY_SANTA
 
+python_news:
+    mail_lists:
+        - 'python-ideas'
+        - 'python-announce-list'
+        - 'pypi-announce'
+    channel: *PYNEWS_CHANNEL
+    webhook: *PYNEWS_WEBHOOK
+
 config:
     required_keys: ['bot.token']