From d7c511d902543394de754ee6dd5a808d990ec73b Mon Sep 17 00:00:00 2001
From: Taaku18 <45324516+Taaku18@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:52:07 -0800
Subject: [PATCH] 3.3.2-dev3 fallback category

---
 .github/workflows/lints.yml | 13 ++++++++++---
 CHANGELOG.md                |  5 ++++-
 bot.py                      |  2 +-
 core/config_help.json       |  7 +++++--
 requirements.min.txt        |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
index 3870c3f4da..852b3e1e07 100644
--- a/.github/workflows/lints.yml
+++ b/.github/workflows/lints.yml
@@ -1,14 +1,21 @@
 name: Modmail Workflow
 
-on: [push, pull_request, pull_request_review]
+on: [push, pull_request]
 
 jobs:
   code-style:
-    runs-on: ${{ matrix.os }}
+
+#    runs-on: ${{ matrix.os }}
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        os: [ubuntu-latest, windows-latest, macOS-latest]
+#        python-version: [3.6, 3.7]
+
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
         python-version: [3.6, 3.7]
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d19a0ec37f..0d6d81066b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,13 +7,16 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
 however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
 
 
-# v3.3.2-dev2
+# v3.3.2-dev3
 
 ### Added
 
 - Thread cooldown!
   - Set via the new config var `thread_cooldown`.
   - Specify a time for the recipient to wait before allowed to create another thread.
+- Fallback Category (thanks to DAzVise PR#636)
+  - Automatically created upon reaching the 50 channels limit.
+  - Manually set fallback category with the config var `fallback_category_id`.
 - "enable" and "disable" support for yes or no config vars.
 - Added "perhaps you meant" section to `?config help`.
 - Multi-command alias is now more stable. With support for a single quote escape `\"`.
diff --git a/bot.py b/bot.py
index 5276f2e62f..44d9d002e8 100644
--- a/bot.py
+++ b/bot.py
@@ -1,4 +1,4 @@
-__version__ = "3.3.2-dev2"
+__version__ = "3.3.2-dev3"
 
 
 import asyncio
diff --git a/core/config_help.json b/core/config_help.json
index 177e488094..db9218d2b3 100644
--- a/core/config_help.json
+++ b/core/config_help.json
@@ -17,7 +17,9 @@
       "`{prefix}config set main_category_id 9234932582312` (`9234932582312` is the category ID)"
     ],
     "notes": [
-      "If the Modmail category ended up being non-existent/invalid, Modmail will break. To fix this, run `{prefix}setup` again or set `main_category_id` to a valid category."
+      "If the Modmail category ended up being non-existent/invalid, Modmail will break. To fix this, run `{prefix}setup` again or set `main_category_id` to a valid category.",
+      "When the Modmail category is full, new channels will be created in the fallback category.",
+      "See also: `fallback_category_id`."
     ]
   },
   "fallback_category_id": {
@@ -27,7 +29,8 @@
       "`{prefix}config set fallback_category_id 9234932582312` (`9234932582312` is the category ID)"
     ],
     "notes": [
-      "If the Fallback category ended up being non-existent/invalid, Modmail will create a new one. To fix this, set `fallback_category_id` to a valid category."
+      "If the Fallback category ended up being non-existent/invalid, Modmail will create a new one. To fix this, set `fallback_category_id` to a valid category.",
+      "See also: `main_category_id`."
     ]
   },
   "prefix": {
diff --git a/requirements.min.txt b/requirements.min.txt
index c8c5c2ab07..dded194188 100644
--- a/requirements.min.txt
+++ b/requirements.min.txt
@@ -6,7 +6,7 @@ aiohttp==3.5.4
 async-timeout==3.0.1
 attrs==19.3.0
 chardet==3.0.4
-discord.py==1.2.4
+discord.py==1.2.5
 dnspython==1.16.0
 emoji==0.5.4
 future==0.18.1