Merge remote-tracking branch 'upstream/master'

Author: Agent-Fennec

.gitignore

@@ -126,5 +126,5 @@ dmypy.json
 
 # Modmail
 config.json
-plugins/
+plugins/*-plugins/
 temp/

.pylintrc

@@ -79,7 +79,8 @@ disable=raw-checker-failed,
         too-many-instance-attributes,
         too-many-arguments,
         too-few-public-methods,
-        too-many-lines
+        too-many-lines,
+        line-too-long
 
 
 # Enable the message, report, category or checker with the given id(s). You can
@@ -358,15 +359,14 @@ function-naming-style=snake_case
 # Good variable names which should always be accepted, separated by a comma.
 good-names=i,
            j,
-           k,
            ex,
            _,
-           v,
            id,
            db,
            f,
            dt,
-           c
+           ch,
+           ts
 
 # Include a hint for the correct naming format with invalid-name.
 include-naming-hint=yes

CHANGELOG.md

@@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# v2.21.0
+
+### Added 
+
+New `?plugin registry compact` command which shows a more compact view of all plugins.
+
+# v2.20.2
+
+### Plugin Registry
+
+Plugin developers can now make a PR to include their plugin in the `plugin registry` command.
+Add your plugin in the `plugins/registry.json` file in the main repository.
+
+### Changed
+
+`?debug` command now shows the most recent logs first. (Starts at the last page)
+
+# v2.20.1
+
+### What's new?
+
+  - New error message when using thread-only commands outside of threads.
+  - `?unnotify`, ability to undo `?notify`.
+  - `?notify` and `?subscribe` now accepts other users.
+
+### Changes
+
+This update contains mostly internal changes.
+  - Implemented support for the new discord.py v1.1.1.
+  - Improved help text for most commands.
+  - Completely revamped help command, few user changes.
+  - Removed abc (internal).
 
 # v2.20.0
 

README.md

@@ -80,4 +80,4 @@ $ python3 bot.py
 
 This project is licenced under MIT. If you have any new ideas, create an issue or a pull request. Contributions to Modmail are always welcome, whether it be improvements to the documentation or new functionality, please feel free make the change.
 
-If you use Modmail and love it, consider becoming a patron on **[Patreon](https://www.patreon.com/kyber)** :smile:
+This bot is open source and always will be. If you like this project and would like to show your appreciation, heres the link for our **[Patreon](https://www.patreon.com/kyber)**.