Merge pull request #2820 from kyb3r/discordpy-bump

Discordpy bump

CHANGELOG.md

@@ -7,6 +7,34 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugins developer, note the "BREAKING" section.
 
 
+# v3.5.0
+
+Fixed discord.py issue.
+
+### Added
+
+- A confirmation when you manually delete a thread message embed.
+- Config var `enable_eval` defaults true, set `enable_eval=no` to disable the eval command. (GH #2803)
+- Added `?plugins reset` command to completely reset everything related to plugins. This will fix some problems caused by broken plugins in the file system.
+- Support private GitHub repos for plugins (thanks to @officialpiyush pr#2767)
+
+### Changed
+
+- Bump discord.py version to v1.3.3.
+- Renamed `bot.owner_ids` to `bot.bot_owner_ids` as the attribute is now defined internally for team support.
+- Deleting channel manually will now close the thread.
+- Deleting messages will no longer cause the bot to produce warnings.
+- Plugins will automatically be removed when it fails to load.
+- Moved all database-related activities to clients.py under MongoDBClient, with possible future hook for additional database support. 
+- `bot.db` is deprecated in favour of `bot.api.db` and will be removed in the future.
+- Deprecated `bot.plugin_db.get_partition` in favour of `bot.api.get_plugin_partition` (not final).
+- Deprecated `MONGO_URI` config var (but will keep support in the future) in favour of `CONNECTION_URI` and `DATABASE_TYPE`. Right now there is one supported database - "mongodb", which is the default.
+
+### Fixed
+
+- Plugins not loading in Windows OS. Now uses proactor event loop for asyncio which should fix this.
+
+
 # v3.4.1
 
 ### Fixed

Pipfile

@@ -4,7 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-black = "==19.3b0"
+black = "==19.10b0"
 pylint = "*"
 bandit = "==1.6.2"
 
@@ -17,11 +17,11 @@ motor = ">=2.0.0"
 natural = "==0.2.0"
 isodate = ">=0.6.0"
 dnspython = "~=1.16.0"
-parsedatetime = "==2.5"
-aiohttp = "<3.6.0,>=3.3.0"
+parsedatetime = "==2.6"
+aiohttp = ">=3.6.0,<3.7.0"
 python-dotenv = ">=0.10.3"
 pipenv = "*"
-"discord.py" = "==1.2.5"
+"discord.py" = "==1.3.4"
 
 [requires]
 python_version = "3.7"

Procfile

@@ -1 +1 @@
-worker: pipenv run bot
+worker: python bot.py

app.json

@@ -15,10 +15,14 @@
       "description": "Comma separated user IDs of people that are allowed to use owner only commands. (eval).",
       "required": true
     },
-    "MONGO_URI": {
-      "description": "Mongo DB connection URI for self-hosting your data.",
+    "CONNECTION_URI": {
+      "description": "The connection URI for your database.",
       "required": true
     },
+    "DATABASE_TYPE": {
+      "description": "The type of your database. There is only one supported database at the moment - MongoDB (default).",
+      "required": false
+    },
     "LOG_URL": {
       "description": "The url of the log viewer app for viewing self-hosted logs.",
       "required": true