Merge branch 'master' into update

Author: Taaku18

CHANGELOG.md

@@ -5,6 +5,12 @@ 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.20.0
+
+### What's new? 
+
+New `oauth` whitelist command which allows you to whitelist users so they can log in via discord to view logs. To set up oauth login for your logviewer app check the logviewer [repo](https://github.com/kyb3r/logviewer).
+
 # v2.19.1
 
 ### Changed

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.19.1'
+__version__ = '2.20.0'
 
 import asyncio
 import logging
@@ -510,7 +510,11 @@ async def process_modmail(self, message):
             min_account_age = now
 
         try:
-            min_guild_age = self.guild.get_member(message.author.id).joined_at + guild_age
+            member = self.guild.get_member(message.author.id)
+            if member:
+                min_guild_age = member.joined_at + guild_age
+            else:
+                min_guild_age = now
         except ValueError as e:
             logger.warning(e.args[0])
             del self.config.cache['guild_age']

cogs/modmail.py

@@ -106,7 +106,7 @@ async def snippets(self, ctx):
 
     @snippets.command(name='add')
     @checks.has_permissions(PermissionLevel.SUPPORTER)
-    async def add_(self, ctx, name: str.lower, *, value):
+    async def snippets_add(self, ctx, name: str.lower, *, value):
         """Add a snippet to the bot config."""
         if 'snippets' not in self.bot.config.cache:
             self.bot.config['snippets'] = {}
@@ -124,7 +124,7 @@ async def add_(self, ctx, name: str.lower, *, value):
 
     @snippets.command(name='remove', aliases=['del', 'delete', 'rm'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
-    async def remove_(self, ctx, *, name: str.lower):
+    async def snippets_remove(self, ctx, *, name: str.lower):
         """Removes a snippet from bot config."""
 
         if self.bot.config.snippets.get(name):
@@ -386,7 +386,6 @@ def format_log_embeds(self, logs, avatar_url):
             if prefix == 'NONE':
                 prefix = ''
 
-
             log_url = self.bot.config.log_url.strip('/') + f'{prefix}/{key}'
 
             username = entry['recipient']['name'] + '#'
@@ -450,9 +449,9 @@ async def logs(self, ctx, *, member: User = None):
         session = PaginatorSession(ctx, *embeds)
         await session.run()
 
-    @logs.command(name='closed-by')
+    @logs.command(name='closed-by', aliases=['closeby'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
-    async def closed_by(self, ctx, *, user: User = None):
+    async def logs_closed_by(self, ctx, *, user: User = None):
         """Returns all logs closed by a user."""
         user = user or ctx.author
 
@@ -481,9 +480,9 @@ async def closed_by(self, ctx, *, user: User = None):
         session = PaginatorSession(ctx, *embeds)
         await session.run()
 
-    @logs.command()
+    @logs.command(name='search', aliases=['find'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
-    async def search(self, ctx, limit: Optional[int] = None, *, query):
+    async def logs_search(self, ctx, limit: Optional[int] = None, *, query):
         """Searches all logs for a message that contains your query."""
 
         await ctx.trigger_typing()
@@ -518,7 +517,7 @@ async def search(self, ctx, limit: Optional[int] = None, *, query):
     @commands.command()
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def reply(self, ctx, *, msg=''):
+    async def reply(self, ctx, *, msg: str):
         """Reply to users using this command.
 
         Supports attachments and images as well as
@@ -531,7 +530,7 @@ async def reply(self, ctx, *, msg=''):
     @commands.command()
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def anonreply(self, ctx, *, msg=''):
+    async def anonreply(self, ctx, *, msg: str):
         """Reply to a thread anonymously.
 
         You can edit the anonymous user's name,
@@ -547,7 +546,7 @@ async def anonreply(self, ctx, *, msg=''):
     @commands.command()
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def note(self, ctx, *, msg=''):
+    async def note(self, ctx, *, msg: str):
         """Take a note about the current thread, useful for noting context."""
         ctx.message.content = msg
         async with ctx.typing():
@@ -579,7 +578,7 @@ async def find_linked_message(self, ctx, message_id):
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
     async def edit(self, ctx, message_id: Optional[int] = None,
-                   *, new_message):
+                   *, new_message: str):
         """Edit a message that was sent using the reply command.
 
         If no `message_id` is provided, the
@@ -758,7 +757,6 @@ async def unblock(self, ctx, *, user: User = None):
         use only.
         """
 
-
         if user is None:
             thread = ctx.thread
             if thread:
@@ -803,18 +801,19 @@ async def unblock(self, ctx, *, user: User = None):
     @commands.command()
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def delete(self, ctx, message_id = None):
+    async def delete(self, ctx, message_id: Optional[int] = None):
         """Delete a message that was sent using the reply command.
 
         Deletes the previous message, unless a message ID is provided, which in that case,
         deletes the message with that message ID.
         """
         thread = ctx.thread
 
-        try:
-            message_id = int(message_id)
-        except ValueError:
-            raise commands.BadArgument('An integer message ID needs to be specified.')
+        if message_id is not None:
+            try:
+                message_id = int(message_id)
+            except ValueError:
+                raise commands.BadArgument('An integer message ID needs to be specified.')
 
         linked_message_id = await self.find_linked_message(ctx, message_id)
 

cogs/plugins.py

@@ -124,9 +124,9 @@ async def plugin(self, ctx):
         cmd = self.bot.get_command('help')
         await ctx.invoke(cmd, command='plugin')
 
-    @plugin.command()
+    @plugin.command(name='add')
     @checks.has_permissions(PermissionLevel.OWNER)
-    async def add(self, ctx, *, plugin_name):
+    async def plugin_add(self, ctx, *, plugin_name):
         """Adds a plugin"""
         if plugin_name in self.bot.config.plugins:
             return await ctx.send('Plugin already installed')
@@ -164,9 +164,9 @@ async def add(self, ctx, *, plugin_name):
                 await message.edit(content='Invalid plugin name format. '
                                    'Use username/repo/plugin.')
 
-    @plugin.command()
+    @plugin.command(name='remove', aliases=['del', 'delete', 'rm'])
     @checks.has_permissions(PermissionLevel.OWNER)
-    async def remove(self, ctx, *, plugin_name):
+    async def plugin_remove(self, ctx, *, plugin_name):
         """Removes a certain plugin"""
         if plugin_name in self.bot.config.plugins:
             username, repo, name = self.parse_plugin(plugin_name)
@@ -199,9 +199,9 @@ def onerror(func, path, exc_info):
         else:
             await ctx.send('Plugin not installed.')
 
-    @plugin.command()
+    @plugin.command(name='update')
     @checks.has_permissions(PermissionLevel.OWNER)
-    async def update(self, ctx, *, plugin_name):
+    async def plugin_update(self, ctx, *, plugin_name):
         """Updates a certain plugin"""
         if plugin_name not in self.bot.config.plugins:
             return await ctx.send('Plugin not installed')
@@ -232,9 +232,9 @@ async def update(self, ctx, *, plugin_name):
                     except DownloadError as exc:
                         await ctx.send(f'Unable to start plugin: `{exc}`')
 
-    @plugin.command(name='list')
+    @plugin.command(name='list', aliases=['show', 'view'])
     @checks.has_permissions(PermissionLevel.OWNER)
-    async def list_(self, ctx):
+    async def plugin_list(self, ctx):
         """Shows a list of currently enabled plugins"""
         if self.bot.config.plugins:
             msg = '```\n' + '\n'.join(self.bot.config.plugins) + '\n```'