[pull] master from kyb3r:master

.bandit_baseline.json

@@ -1,6 +1,6 @@
 {
   "errors": [],
-  "generated_at": "2020-11-12T15:17:38Z",
+  "generated_at": "2021-11-20T17:06:28Z",
   "metrics": {
     "./bot.py": {
       "CONFIDENCE.HIGH": 1.0,
@@ -11,7 +11,7 @@
       "SEVERITY.LOW": 1.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 1264,
+      "loc": 1406,
       "nosec": 0
     },
     "./cogs/modmail.py": {
@@ -23,7 +23,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 1280,
+      "loc": 1678,
       "nosec": 0
     },
     "./cogs/plugins.py": {
@@ -35,7 +35,7 @@
       "SEVERITY.LOW": 1.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 572,
+      "loc": 597,
       "nosec": 0
     },
     "./cogs/utility.py": {
@@ -47,7 +47,7 @@
       "SEVERITY.LOW": 1.0,
       "SEVERITY.MEDIUM": 1.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 1710,
+      "loc": 1768,
       "nosec": 0
     },
     "./core/_color_data.py": {
@@ -63,15 +63,15 @@
       "nosec": 0
     },
     "./core/changelog.py": {
-      "CONFIDENCE.HIGH": 0.0,
+      "CONFIDENCE.HIGH": 1.0,
       "CONFIDENCE.LOW": 0.0,
       "CONFIDENCE.MEDIUM": 0.0,
       "CONFIDENCE.UNDEFINED": 0.0,
       "SEVERITY.HIGH": 0.0,
-      "SEVERITY.LOW": 0.0,
+      "SEVERITY.LOW": 1.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 145,
+      "loc": 159,
       "nosec": 0
     },
     "./core/checks.py": {
@@ -83,7 +83,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 89,
+      "loc": 105,
       "nosec": 0
     },
     "./core/clients.py": {
@@ -95,7 +95,7 @@
       "SEVERITY.LOW": 1.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 585,
+      "loc": 598,
       "nosec": 0
     },
     "./core/config.py": {
@@ -107,7 +107,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 327,
+      "loc": 375,
       "nosec": 0
     },
     "./core/decorators.py": {
@@ -131,7 +131,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 199,
+      "loc": 204,
       "nosec": 0
     },
     "./core/paginator.py": {
@@ -155,7 +155,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 993,
+      "loc": 1097,
       "nosec": 0
     },
     "./core/time.py": {
@@ -167,7 +167,7 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 158,
+      "loc": 156,
       "nosec": 0
     },
     "./core/utils.py": {
@@ -179,32 +179,32 @@
       "SEVERITY.LOW": 0.0,
       "SEVERITY.MEDIUM": 0.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 283,
+      "loc": 351,
       "nosec": 0
     },
     "_totals": {
-      "CONFIDENCE.HIGH": 4.0,
+      "CONFIDENCE.HIGH": 5.0,
       "CONFIDENCE.LOW": 0.0,
       "CONFIDENCE.MEDIUM": 1.0,
       "CONFIDENCE.UNDEFINED": 0.0,
       "SEVERITY.HIGH": 0.0,
-      "SEVERITY.LOW": 4.0,
+      "SEVERITY.LOW": 5.0,
       "SEVERITY.MEDIUM": 1.0,
       "SEVERITY.UNDEFINED": 0.0,
-      "loc": 8989,
+      "loc": 9878,
       "nosec": 0
     }
   },
   "results": [
     {
-      "code": "11 from datetime import datetime\n12 from subprocess import PIPE\n13 from types import SimpleNamespace\n",
+      "code": "13 from datetime import datetime\n14 from subprocess import PIPE\n15 from types import SimpleNamespace\n",
       "filename": "./bot.py",
       "issue_confidence": "HIGH",
       "issue_severity": "LOW",
       "issue_text": "Consider possible security implications associated with PIPE module.",
-      "line_number": 12,
+      "line_number": 14,
       "line_range": [
-        12
+        14
       ],
       "more_info": "https://bandit.readthedocs.io/en/latest/blacklists/blacklist_imports.html#b404-import-subprocess",
       "test_id": "B404",
@@ -240,27 +240,42 @@
       "test_name": "blacklist"
     },
     {
-      "code": "1985         try:\n1986             exec(to_compile, env)  # pylint: disable=exec-used\n1987         except Exception as exc:\n",
+      "code": "2061         try:\n2062             exec(to_compile, env)  # pylint: disable=exec-used\n2063         except Exception as exc:\n",
       "filename": "./cogs/utility.py",
       "issue_confidence": "HIGH",
       "issue_severity": "MEDIUM",
       "issue_text": "Use of exec detected.",
-      "line_number": 1986,
+      "line_number": 2062,
       "line_range": [
-        1986
+        2062
       ],
       "more_info": "https://bandit.readthedocs.io/en/latest/plugins/b102_exec_used.html",
       "test_id": "B102",
       "test_name": "exec_used"
     },
     {
-      "code": "68 \n69     def __init__(self, bot, access_token: str = \"\", username: str = \"\", **kwargs):\n70         self.bot = bot\n71         self.session = bot.session\n72         self.headers: dict = None\n73         self.access_token = access_token\n74         self.username = username\n75         self.avatar_url: str = kwargs.pop(\"avatar_url\", \"\")\n76         self.url: str = kwargs.pop(\"url\", \"\")\n77         if self.access_token:\n78             self.headers = {\"Authorization\": \"token \" + str(access_token)}\n79 \n80     async def request(\n",
+      "code": "2 import re\n3 from subprocess import PIPE\n4 from typing import List\n",
+      "filename": "./core/changelog.py",
+      "issue_confidence": "HIGH",
+      "issue_severity": "LOW",
+      "issue_text": "Consider possible security implications associated with PIPE module.",
+      "line_number": 3,
+      "line_range": [
+        3
+      ],
+      "more_info": "https://bandit.readthedocs.io/en/latest/blacklists/blacklist_imports.html#b404-import-subprocess",
+      "test_id": "B404",
+      "test_name": "blacklist"
+    },
+    {
+      "code": "67 \n68     def __init__(self, bot, access_token: str = \"\", username: str = \"\", **kwargs):\n69         self.bot = bot\n70         self.session = bot.session\n71         self.headers: Optional[dict] = None\n72         self.access_token = access_token\n73         self.username = username\n74         self.avatar_url: str = kwargs.pop(\"avatar_url\", \"\")\n75         self.url: str = kwargs.pop(\"url\", \"\")\n76         if self.access_token:\n77             self.headers = {\"Authorization\": \"token \" + str(access_token)}\n78 \n79     @property\n80     def BRANCH(self):\n",
       "filename": "./core/clients.py",
       "issue_confidence": "MEDIUM",
       "issue_severity": "LOW",
       "issue_text": "Possible hardcoded password: ''",
-      "line_number": 69,
+      "line_number": 68,
       "line_range": [
+        68,
         69,
         70,
         71,

.dockerignore

@@ -133,23 +133,18 @@ node_modules/
 config.json
 plugins/
 !plugins/registry.json
+!plugins/@local/
 temp/
 test.py
 
 # Other stuff
 .env.example
 .gitignore
-.lint.py
-.pylintrc
-.travis.yml
+.github/
 app.json
 CHANGELOG.md
-CODE_OF_CONDUCT.md
-CONTRIBUTING.md
-requirements.min.txt
 Procfile
 pyproject.toml
 README.md
-runtime.txt
-SPONSORS.json
-stack.yml
+Pipfile
+Pipfile.lock

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,55 @@
+name: Bug Report
+description: File a bug report
+title: "[BUG]: your bug report title"
+labels: "maybe: bug"
+body:
+  - type: input
+    id: bot-info-version
+    attributes:
+      label: Bot Version
+      description: Check it with `@modmail about`
+      placeholder: eg. v3.9.4
+    validations:
+      required: true
+  - type: dropdown
+    id: bot-info-hosting
+    attributes:
+      label: How are you hosting Modmail?
+      description: You can check it with `@modmail about` if you are unsure
+      options:
+        - Heroku
+        - Systemd
+        - PM2
+        - Patreon
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: logs
+    attributes:
+      label: Error Logs
+      placeholder: https://hastebin.cc/placeholder
+      description:
+        "If your Modmail bot is online, type `@modmail debug hastebin` and include the link here.
+
+        If your Modmail bot is not online or the previous command did not generate a link, do the following:
+
+        1. Select your *bot* application at https://dashboard.heroku.com
+
+        2. [Restart your bot](https://i.imgur.com/3FcrlKz.png)
+
+        3. Reproduce the error to populate the error logs
+
+        4. [Copy and paste the logs](https://i.imgur.com/TTrhitm.png)"
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: "[optional] You may add screenshots to further explain your problem."
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional Information
+      description: "[optional] You may provide additional context for us to better understand how this issue occured."

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discord Server
+    url: https://discord.gg/etJNHCQ
+    about: Please ask hosting-related questions here before creating an issue.