Merge branch 'master' of https://github.com/verixx/modmail

Author: kyb3r

bot.py

@@ -845,14 +845,14 @@ async def on_command_error(self, context, exception):
             await context.send(embed=discord.Embed(
                 color=discord.Color.red(),
                 description=msg
-                ))
+            ))
 
         elif isinstance(exception, commands.BadArgument):
             await context.trigger_typing()
             await context.send(embed=discord.Embed(
                 color=discord.Color.red(),
                 description=str(exception)
-                ))
+            ))
         elif isinstance(exception, commands.CommandNotFound):
             logger.warning(error('CommandNotFound: ' + str(exception)))
         elif isinstance(exception, commands.MissingRequiredArgument):
@@ -901,7 +901,7 @@ async def validate_database_connection(self):
                     "This may have been caused by not whitelisting "
                     "IPs correctly. Make sure to whitelist all "
                     "IPs (0.0.0.0/0) https://i.imgur.com/mILuQ5U.png"
-                    ))
+                ))
 
             if 'OperationFailure' in message:
                 logger.critical(error("This is due to having invalid credentials in your MONGO_URI."))

cogs/modmail.py

@@ -563,7 +563,7 @@ async def logs_closed_by(self, ctx, *, user: User = None):
             embed = discord.Embed(
                 color=discord.Color.red(),
                 description='No log entries have been found for that query'
-                )
+            )
             return await ctx.send(embed=embed)
 
         session = PaginatorSession(ctx, *embeds)
@@ -585,7 +585,7 @@ async def logs_search(self, ctx, limit: Optional[int] = None, *, query):
             'open': False,
             '$text': {
                 '$search': f'"{query}"'
-                }
+            }
         }
 
         projection = {
@@ -601,7 +601,7 @@ async def logs_search(self, ctx, limit: Optional[int] = None, *, query):
             embed = discord.Embed(
                 color=discord.Color.red(),
                 description='No log entries have been found for that query'
-                )
+            )
             return await ctx.send(embed=embed)
 
         session = PaginatorSession(ctx, *embeds)

cogs/plugins.py

@@ -37,6 +37,7 @@ class Plugins(commands.Cog):
     Learn how to create a plugin yourself here:
     https://github.com/kyb3r/modmail/wiki/Plugins
     """
+
     def __init__(self, bot):
         self.bot = bot
         self.registry = {}
@@ -387,7 +388,7 @@ def find_index(find_name):
                 description=details['description'],
                 url=repo,
                 title=details['repository']
-                )
+            )
 
             embed.add_field(
                 name='Installation',
@@ -434,7 +435,7 @@ async def plugin_registry_compact(self, ctx):
             embed = discord.Embed(
                 color=self.bot.main_color,
                 description=page,
-                )
+            )
             embed.set_author(name='Plugin Registry', icon_url=self.bot.user.avatar_url)
             embeds.append(embed)
 

cogs/utility.py

@@ -1287,7 +1287,7 @@ async def oauth_whitelist(self, ctx, target: Union[User, Role]):
         embed.description = (
             f"{'Un-w' if removed else 'W'}hitelisted "
             f"{target.mention} to view logs."
-            )
+        )
 
         await ctx.send(embed=embed)
 

core/clients.py

@@ -280,7 +280,7 @@ async def get_user_logs(self, user_id: Union[str, int]) -> list:
         query = {
             'recipient.id': str(user_id),
             'guild_id': str(self.bot.guild_id)
-            }
+        }
 
         projection = {
             'messages': {'$slice': 5}
@@ -345,7 +345,7 @@ async def update_config(self, data: dict):
         return await self.db.config.update_one(
             {'bot_id': self.bot.user.id},
             {'$set': toset, '$unset': unset}
-            )
+        )
 
     async def edit_message(self, message_id: Union[int, str],
                            new_content: str) -> None:

core/thread.py

@@ -635,13 +635,13 @@ async def find(self, *,
 
         try:
             thread = self.cache[recipient_id]
-            if not self.bot.get_channel(thread.channel.id): # deleted channel
+            if not self.bot.get_channel(thread.channel.id):  # deleted channel
                 self.bot.loop.create_task(
                     thread.close(
-                        closer=self.bot.user, 
-                        silent=True, 
+                        closer=self.bot.user,
+                        silent=True,
                         delete_channel=False
-                        ))
+                    ))
                 thread = None
         except KeyError:
             channel = discord.utils.get(