Merge branch 'main' into dynamic-available-message-patch

1 files changed, 26 insertions, 22 deletions

diff --git a/config-default.yml b/config-default.yml
index 3dbc7bd6b..9b07d026d 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -89,8 +89,8 @@ style:
 
         filtering: "https://cdn.discordapp.com/emojis/472472638594482195.png"
 
-        green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-checkmark-dist.png"
-        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-question-mark-dist.png"
+        green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-checkmark-dist.png"
+        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-question-mark-dist.png"
         guild_update: "https://cdn.discordapp.com/emojis/469954765141442561.png"
 
         hash_blurple: "https://cdn.discordapp.com/emojis/469950142942806017.png"
@@ -139,6 +139,7 @@ guild:
         help_dormant:                       691405908919451718
         help_in_use:                        696958401460043776
         logs:               &LOGS           468520609152892958
+        moderators:         &MODS_CATEGORY  749736277464842262
         modmail:            &MODMAIL        714494672835444826
         voice:                              356013253765234688
 
@@ -150,7 +151,6 @@ guild:
         python_events:              &PYEVENTS_CHANNEL   729674110270963822
         python_news:                &PYNEWS_CHANNEL     704372456592506880
         reddit:                     &REDDIT_CHANNEL     458224812528238616
-        user_event_announcements:   &USER_EVENT_A       592000283102674944
 
         # Development
         dev_contrib:        &DEV_CONTRIB    635950537262759947
@@ -169,7 +169,6 @@ guild:
 
         # Logs
         attachment_log:     &ATTACH_LOG     649243850006855680
-        dm_log:                             653713721625018428
         message_log:        &MESSAGE_LOG    467752170159079424
         mod_log:            &MOD_LOG        282638479504965634
         user_log:                           528976905546760203
@@ -193,14 +192,12 @@ guild:
         helpers:            &HELPERS        385474242440986624
         incidents:                          714214212200562749
         incidents_archive:                  720668923636351037
-        mods:               &MODS           305126844661760000
         mod_alerts:                         473092532147060736
-        mod_appeals:        &MOD_APPEALS    808790025688711198
-        mod_meta:           &MOD_META       775412552795947058
-        mod_spam:           &MOD_SPAM       620607373828030464
-        mod_tools:          &MOD_TOOLS      775413915391098921
+        nominations:                        822920136150745168
+        nomination_voting:                  822853512709931008
         organisation:       &ORGANISATION   551789653284356126
         staff_lounge:       &STAFF_LOUNGE   464905259261755392
+        staff_info:         &STAFF_INFO     396684402404622347
 
         # Staff announcement channels
         admin_announcements:    &ADMIN_ANNOUNCEMENTS    749736155569848370
@@ -225,17 +222,13 @@ guild:
         talent_pool:        &TALENT_POOL    534321732593647616
 
     moderation_categories:
+        - *MODS_CATEGORY
         - *MODMAIL
         - *LOGS
 
     moderation_channels:
         - *ADMINS
         - *ADMIN_SPAM
-        - *MOD_APPEALS
-        - *MOD_META
-        - *MOD_TOOLS
-        - *MODS
-        - *MOD_SPAM
 
     # Modlog cog ignores events which occur in these channels
     modlog_blacklist:
@@ -264,14 +257,19 @@ guild:
         admins:             &ADMINS_ROLE    267628507062992896
         core_developers:                    587606783669829632
         devops:                             409416496733880320
+        domain_leads:                       807415650778742785
         helpers:            &HELPERS_ROLE   267630620367257601
         moderators:         &MODS_ROLE      267629731250176001
         owners:             &OWNERS_ROLE    267627879762755584
+        project_leads:                      815701647526330398
 
         # Code Jam
         jammers:        737249140966162473
         team_leaders:   737250302834638889
 
+        # Streaming
+        video:          764245844798079016
+
     moderation_roles:
         - *ADMINS_ROLE
         - *MODS_ROLE
@@ -286,7 +284,6 @@ guild:
     webhooks:
         big_brother:                        569133704568373283
         dev_log:                            680501655111729222
-        dm_log:                             654567640664244225
         duck_pond:                          637821475327311927
         incidents_archive:                  720671599790915702
         python_news:        &PYNEWS_WEBHOOK 704381182279942324
@@ -323,7 +320,6 @@ filter:
         - *MOD_LOG
         - *STAFF_LOUNGE
         - *TALENT_POOL
-        - *USER_EVENT_A
 
     role_whitelist:
         - *ADMINS_ROLE
@@ -360,8 +356,8 @@ urls:
     discord_api:        &DISCORD_API "https://discordapp.com/api/v7/"
     discord_invite_api: !JOIN [*DISCORD_API, "invites"]
 
-    # Misc URLs
-    bot_avatar:      "https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle/logo_circle.png"
+    # Misc URLsw
+    bot_avatar:      "https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_circle/logo_circle.png"
     github_bot_repo: "https://github.com/python-discord/bot"
 
 
@@ -468,8 +464,12 @@ help_channels:
     cmd_whitelist:
         - *HELPERS_ROLE
 
-    # Allowed duration of inactivity before making a channel dormant
-    idle_minutes: 30
+    # Allowed duration of inactivity by claimant before making a channel dormant
+    idle_minutes_claimant: 30
+
+    # Allowed duration of inactivity by others before making a channel dormant
+    # `idle_minutes_claimant` must also be met, before a channel is closed
+    idle_minutes_others: 10
 
     # Allowed duration of inactivity when channel is empty (due to deleted messages)
     # before message making a channel dormant
@@ -480,7 +480,7 @@ help_channels:
 
     # Maximum number of channels across all 3 categories
     # Note Discord has a hard limit of 50 channels per category, so this shouldn't be > 50
-    max_total_channels: 32
+    max_total_channels: 42
 
     # Prefix for help channel names
     name_prefix: 'help-'
@@ -512,12 +512,12 @@ duck_pond:
         - *PYEVENTS_CHANNEL
         - *MAILING_LISTS
         - *REDDIT_CHANNEL
-        - *USER_EVENT_A
         - *DUCK_POND
         - *CHANGE_LOG
         - *STAFF_ANNOUNCEMENTS
         - *MOD_ANNOUNCEMENTS
         - *ADMIN_ANNOUNCEMENTS
+        - *STAFF_INFO
 
 
 python_news:
@@ -545,3 +545,7 @@ branding:
 
 config:
     required_keys: ['bot.token']
+
+
+video_permission:
+    default_permission_duration: 5  # Default duration for stream command in minutes