diff options
| author | 2021-03-31 19:56:34 +0200 | |
|---|---|---|
| committer | 2021-03-31 19:56:34 +0200 | |
| commit | 25b1a72735fc6d638b0263ef8b55b9d9cf62e7af (patch) | |
| tree | aa1bf64fe2e53ee4080081ad52fda4294a85ac06 /config-default.yml | |
| parent | Merge: changes from 'upstream/main' & conflict resolution (diff) | |
| parent | Merge pull request #1491 from python-discord/fix/dmrelay (diff) | |
Merge: changes from 'upstream/main'
Lockfile conflict resolved by re-locking on the merged Pipfile.
Diffstat (limited to 'config-default.yml')
| -rw-r--r-- | config-default.yml | 15 | 
1 files changed, 7 insertions, 8 deletions
| diff --git a/config-default.yml b/config-default.yml index 502f0f861..1b5ef42fe 100644 --- a/config-default.yml +++ b/config-default.yml @@ -150,7 +150,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 +168,6 @@ guild:          # Logs          attachment_log:     &ATTACH_LOG     649243850006855680 -        dm_log:                             653713721625018428          message_log:        &MESSAGE_LOG    467752170159079424          mod_log:            &MOD_LOG        282638479504965634          user_log:                           528976905546760203 @@ -287,7 +285,6 @@ guild:      webhooks:          big_brother:                        569133704568373283          dev_log:                            680501655111729222 -        dm_log:                             654567640664244225          duck_pond:                          637821475327311927          incidents_archive:                  720671599790915702          python_news:        &PYNEWS_WEBHOOK 704381182279942324 @@ -324,7 +321,6 @@ filter:          - *MOD_LOG          - *STAFF_LOUNGE          - *TALENT_POOL -        - *USER_EVENT_A      role_whitelist:          - *ADMINS_ROLE @@ -469,8 +465,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 @@ -481,7 +481,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-' @@ -513,7 +513,6 @@ duck_pond:          - *PYEVENTS_CHANNEL          - *MAILING_LISTS          - *REDDIT_CHANNEL -        - *USER_EVENT_A          - *DUCK_POND          - *CHANGE_LOG          - *STAFF_ANNOUNCEMENTS | 
