Merge branch 'master' into queue

Author: Taaku18

.gitignore

@@ -102,10 +102,15 @@ ENV/
 *.json
 !app.json
 
-#Pycharm
+# Pycharm
 .idea/
 
-#MacOs
+# MacOS
 .DS_Store
 
+# VS Code
+.vscode/
+
+# Modmail
 config.json
+plugins/

CHANGELOG.md

@@ -10,6 +10,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `thread.create` is now synchronous so that the first message sent can be queued to be sent as soon as a thread is created. 
     - This fixes a problem where if multiple messages are sent in quick succession, the first message sent (which triggers the thread creation) is not sent in order.
 
+# v2.13.4
+
+### Changed
+- `?contact` no longer raise a silent error in Heroku logs when the recipient is a bot. Now Modmail respond with an error message.
+
+# v2.13.3
+
+### Fixed
+- a typo in the config options.
+
+# v2.13.2
+
+### Fixed
+- Installing `requirements.txt` files in plugins.
+
+
+# v2.13.1
+
+### Fixed
+- Reading `requirements.txt` files in plugins.
+
+
+# v2.13.0
+
+### Added 
+- Plugins
+    - Think of it like addons! Anyone (with the skills) can create a plugin, make it public and distribute it.    
+    Add a welcome message to Modmail, or moderation commands? It's all up to your imagination!    
+    Have a niche feature request that you think only your server would benefit from? Plugins are your go-to!
+    - [Creating Plugins Documention](https://github.com/kyb3r/modmail/wiki/Plugins).
+
+# v2.12.5
+
+### Fixed
+
+- `config del` command will now work properly on self-hosted db bots.
+
 # v2.12.4
 
 ### Added

bot.py

@@ -22,26 +22,28 @@
 SOFTWARE.
 """
 
-__version__ = '2.12.4'
+__version__ = '2.13.4'
 
 import asyncio
+import traceback
+import os
 from datetime import datetime
-from os import listdir
 from textwrap import dedent
 from types import SimpleNamespace
 
 import discord
-import uvloop
-from aiohttp import ClientSession
-from colorama import init, Fore, Style
 from discord.enums import ActivityType
 from discord.ext import commands
 from discord.ext.commands.view import StringView
+
+from aiohttp import ClientSession
+from colorama import init, Fore, Style
 from emoji import UNICODE_EMOJI
 from motor.motor_asyncio import AsyncIOMotorClient
 
 from core.changelog import Changelog
 from core.clients import ModmailApiClient, SelfHostedClient
+from core.clients import PluginDatabaseClient
 from core.config import ConfigManager
 from core.models import Bot
 from core.thread import ThreadManager
@@ -59,14 +61,14 @@ def __init__(self):
         self._threads = None
         self._session = None
         self._config = None
-        self._connected = asyncio.Event()
         self._db = None
 
         if self.self_hosted:
             self._db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
             self._api = SelfHostedClient(self)
         else:
             self._api = ModmailApiClient(self)
+        self.plugin_db = PluginDatabaseClient(self)
 
         self.data_task = self.loop.create_task(self.data_loop())
         self.autoupdate_task = self.loop.create_task(self.autoupdate_loop())
@@ -120,17 +122,18 @@ def _load_extensions(self):
               '┴ ┴└─┘─┴┘┴ ┴┴ ┴┴┴─┘', sep='\n')
         print(f'v{__version__}')
         print('Authors: kyb3r, fourjr, Taaku18' + Style.RESET_ALL)
-        print(LINE + Fore.CYAN)
+        print(LINE)
 
-        for file in listdir('cogs'):
+        for file in os.listdir('cogs'):
             if not file.endswith('.py'):
                 continue
             cog = f'cogs.{file[:-3]}'
-            print(f'Loading {cog}')
+            print(Fore.CYAN + f'Loading {cog}' + Style.RESET_ALL)
             try:
                 self.load_extension(cog)
             except Exception:
                 print(f'Failed to load {cog}')
+                traceback.print_exc()
 
     async def is_owner(self, user):
         allowed = {int(x) for x in
@@ -145,8 +148,21 @@ async def logout(self):
 
     def run(self, *args, **kwargs):
         try:
-            super().run(self.token, *args, **kwargs)
+            self.loop.run_until_complete(self.start(self.token))
+        except discord.LoginFailure:
+            print('Invalid token')
+        except KeyboardInterrupt:
+            pass
+        except Exception:
+            print('Fatal exception')
+            traceback.print_exc()
         finally:
+            self.data_task.cancel()
+            self.autoupdate_task.cancel()
+
+            self.loop.run_until_complete(self.logout())
+            self.loop.run_until_complete(self.session.close())
+            self.loop.close()
             print(Fore.RED + ' - Shutting down bot' + Style.RESET_ALL)
 
     @property
@@ -294,7 +310,7 @@ async def setup_indexes(self):
             await coll.create_index([
                 ('messages.content', 'text'),
                 ('messages.author.name', 'text')
-                ])
+            ])
 
     async def on_ready(self):
         """Bot startup, sets uptime."""
@@ -647,17 +663,19 @@ async def autoupdate_loop(self):
         await self.wait_until_ready()
 
         if self.config.get('disable_autoupdates'):
-            print('Autoupdates disabled.')
+            print(Fore.CYAN + 'Autoupdates disabled.' + Style.RESET_ALL)
             print(LINE)
             return
 
         if self.self_hosted and not self.config.get('github_access_token'):
+            print('Github access token not found.')
+            print(Fore.CYAN + 'Autoupdates disabled.' + Style.RESET_ALL)
             print('GitHub access token not found.')
             print('Autoupdates disabled.')
             print(LINE)
             return
 
-        while True:
+        while not self.is_closed():
             metadata = await self.api.get_metadata()
 
             if metadata['latest_version'] != self.version:
@@ -694,6 +712,8 @@ async def autoupdate_loop(self):
 
 
 if __name__ == '__main__':
-    uvloop.install()
+    if os.name != 'nt':
+        import uvloop
+        uvloop.install()
     bot = ModmailBot()  # pylint: disable=invalid-name
     bot.run()

cogs/modmail.py

@@ -3,8 +3,9 @@
 from typing import Optional, Union
 
 import discord
-from dateutil import parser
 from discord.ext import commands
+
+from dateutil import parser
 from natural.date import duration
 
 from core import checks
@@ -98,6 +99,7 @@ async def snippets(self, ctx):
         await session.run()
 
     @snippets.command(name='add')
+    @checks.has_permissions(manage_messages=True)
     async def add_(self, ctx, name: str.lower, *, value):
         """Add a snippet to the bot config."""
         if 'snippets' not in self.bot.config.cache:
@@ -115,6 +117,7 @@ async def add_(self, ctx, name: str.lower, *, value):
         await ctx.send(embed=embed)
 
     @snippets.command(name='del')
+    @checks.has_permissions(manage_messages=True)
     async def del_(self, ctx, *, name: str.lower):
         """Removes a snippet from bot config."""
 
@@ -601,12 +604,19 @@ async def contact(self, ctx,
                       user: Union[discord.Member, discord.User]):
         """Create a thread with a specified member."""
 
+        if user.bot:
+            embed = discord.Embed(
+                color=discord.Color.red(),
+                description='Cannot start a thread with a bot.'
+            )
+            return await ctx.send(embed=embed)
+
         exists = await self.bot.threads.find(recipient=user)
         if exists:
             embed = discord.Embed(
                 color=discord.Color.red(),
                 description='A thread for this user already '
-                f'exists in {exists.channel.mention}.'
+                            f'exists in {exists.channel.mention}.'
             )
 
         else:
@@ -619,7 +629,7 @@ async def contact(self, ctx,
                 color=self.bot.main_color
             )
 
-        return await ctx.send(embed=embed)
+        await ctx.send(embed=embed)
 
     @commands.command()
     @trigger_typing