v1.1.1 support

Author: Taaku18

bot.py

@@ -46,7 +46,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 
 from core.changelog import Changelog
-from core.clients import SelfHostedClient, PluginDatabaseClient
+from core.clients import DatabaseClient, PluginDatabaseClient
 from core.config import ConfigManager
 from core.utils import info, error
 from core.models import Bot, PermissionLevel
@@ -103,9 +103,9 @@ def __init__(self):
         self._db = None
 
         self._configure_logging()
-
+        # TODO: Raise fatal error if mongo_uri or other essentials are not found
         self._db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
-        self._api = SelfHostedClient(self)
+        self._api = DatabaseClient(self)
         self.plugin_db = PluginDatabaseClient(self)
 
         self.metadata_task = self.loop.create_task(self.metadata_loop())
@@ -563,7 +563,8 @@ async def process_modmail(self, message):
 
         elif str(message.author.id) in self.blocked_users:
             reaction = blocked_emoji
-            if reason.startswith('System Message: New Account.'):
+            if reason.startswith('System Message: New Account.') or \
+                    reason.startswith('System Message: Recently Joined.'):
                 # Met the age limit already
                 reaction = sent_emoji
                 del self.config.blocked[str(message.author.id)]
@@ -718,8 +719,7 @@ async def on_raw_reaction_add(self, payload):
                 return
             channel = await _thread.recipient.create_dm()
 
-        # TODO: change to fetch_message (breaking change in d.py)
-        message = await channel.get_message(payload.message_id)
+        message = await channel.fetch_message(payload.message_id)
         reaction = payload.emoji
 
         close_emoji = await self.convert_emoji(
@@ -810,6 +810,9 @@ async def on_message_delete(self, message):
                         if message_id == url.split('/')[-1]:
                             return await msg.delete()
 
+    async def on_bulk_message_delete(self, messages):
+        await discord.utils.async_all(self.on_message_delete(msg) for msg in messages)
+
     async def on_message_edit(self, before, after):
         if before.author.bot:
             return
@@ -953,7 +956,7 @@ async def metadata_loop(self):
                 "owner_id": owner.id,
                 "bot_id": self.user.id,
                 "bot_name": str(self.user),
-                "avatar_url": self.user.avatar_url,
+                "avatar_url": str(self.user.avatar_url),
                 "guild_id": self.guild_id,
                 "guild_name": self.guild.name,
                 "member_count": len(self.guild.members),

cogs/modmail.py

@@ -818,7 +818,8 @@ async def delete(self, ctx, message_id: Optional[int] = None):
         linked_message_id = await self.find_linked_message(ctx, message_id)
 
         if linked_message_id is None:
-            return await ctx.send(embed=discord.Embed(
+            return await ctx.send(
+                embed=discord.Embed(
                 title='Failed',
                 description='Cannot find a message to delete.',
                 color=discord.Color.red()

cogs/plugins.py

@@ -111,8 +111,8 @@ async def load_plugin(self, username, repo, plugin_name):
 
         try:
             self.bot.load_extension(ext)
-        except ModuleNotFoundError as exc:
-            raise DownloadError('Invalid plugin structure') from exc
+        except commands.ExtensionError as exc:
+            raise DownloadError('Invalid plugin.') from exc
         else:
             msg = f'Loaded plugins.{username}-{repo}.{plugin_name}'
             logger.info(info(msg))
@@ -129,10 +129,10 @@ async def plugin(self, ctx):
     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')
+            return await ctx.send('Plugin already installed.')
         if plugin_name in self.bot.cogs.keys():
             # another class with the same name
-            return await ctx.send('Another cog exists with the same name')
+            return await ctx.send('Another cog exists with the same name.')
 
         message = await ctx.send('Downloading plugin...')
         async with ctx.typing():
@@ -143,14 +143,14 @@ async def plugin_add(self, ctx, *, plugin_name):
                     await self.download_plugin_repo(*parsed_plugin[:-1])
                 except DownloadError as exc:
                     return await ctx.send(
-                        f'Unable to fetch plugin from Github: {exc}'
+                        f'Unable to fetch plugin from Github: {exc}.'
                     )
 
                 importlib.invalidate_caches()
                 try:
                     await self.load_plugin(*parsed_plugin)
                 except DownloadError as exc:
-                    return await ctx.send(f'Unable to load plugin: `{exc}`')
+                    return await ctx.send(f'Unable to load plugin: `{exc}`.')
 
                 # if it makes it here, it has passed all checks and should
                 # be entered into the config
@@ -204,7 +204,7 @@ def onerror(func, path, exc_info):
     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')
+            return await ctx.send('Plugin not installed.')
 
         async with ctx.typing():
             username, repo, name = self.parse_plugin(plugin_name)
@@ -217,7 +217,7 @@ async def plugin_update(self, ctx, *, plugin_name):
                 )
             except subprocess.CalledProcessError as exc:
                 err = exc.stderr.decode('utf8').strip()
-                await ctx.send(f'Error while updating: {err}')
+                await ctx.send(f'Error while updating: {err}.')
             else:
                 output = cmd.stdout.decode('utf8').strip()
                 await ctx.send(f'```\n{output}\n```')
@@ -230,7 +230,7 @@ async def plugin_update(self, ctx, *, plugin_name):
                     try:
                         await self.load_plugin(username, repo, name)
                     except DownloadError as exc:
-                        await ctx.send(f'Unable to start plugin: `{exc}`')
+                        await ctx.send(f'Unable to start plugin: `{exc}`.')
 
     @plugin.command(name='list', aliases=['show', 'view'])
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -240,7 +240,7 @@ async def plugin_list(self, ctx):
             msg = '```\n' + '\n'.join(self.bot.config.plugins) + '\n```'
             await ctx.send(msg)
         else:
-            await ctx.send('No plugins installed')
+            await ctx.send('No plugins installed.')
 
 
 def setup(bot):

cogs/utility.py

@@ -28,7 +28,7 @@
 logger = logging.getLogger('Modmail')
 
 
-class Utility:
+class Utility(commands.Cog):
     """General commands that provide utility."""
 
     def __init__(self, bot: Bot):
@@ -40,9 +40,10 @@ async def format_cog_help(self, ctx, cog):
         prefix = self.bot.prefix
 
         fmts = ['']
+        # TODO: Use Utility.get_commands() / Utility.walk_commands()
         for perm_level, cmd in sorted(((get_perm_level(c), c) for c in self.bot.commands),
                                       key=itemgetter(0)):
-            if cmd.instance is cog and not cmd.hidden:
+            if cmd.cog is cog and not cmd.hidden:
                 if perm_level is PermissionLevel.INVALID:
                     new_fmt = f'`{prefix + cmd.qualified_name}` '
                 else:
@@ -90,6 +91,7 @@ async def format_command_help(self, cmd):
         else:
             perm_level = ''
 
+        # TODO: cmd.signature broken
         embed = Embed(
             title=f'`{prefix}{cmd.signature}`',
             color=self.bot.main_color,
@@ -148,6 +150,7 @@ async def format_not_found(self, ctx, command):
     async def help_(self, ctx, *, command: str = None):
         """Shows the help message."""
 
+        # TODO: use https://gist.github.com/Rapptz/288294ca99fa1f042f0e39a92ddd88eb
         if command:
             cmd = self.bot.get_command(command)
             cog = self.bot.cogs.get(command)

core/clients.py

@@ -19,6 +19,7 @@
 if prefix == 'NONE':
     prefix = ''
 
+
 class ApiClient:
     """
     This class represents the general request class for all type of clients.
@@ -255,7 +256,7 @@ async def login(cls, bot: Bot) -> 'GitHub':
         return self
 
 
-class SelfHostedClient(UserClient, ApiClient):
+class DatabaseClient(UserClient, ApiClient):
 
     def __init__(self, bot: Bot):
         super().__init__(bot)
@@ -308,14 +309,14 @@ async def create_log_entry(self, recipient, channel, creator):
                 'id': str(recipient.id),
                 'name': recipient.name,
                 'discriminator': recipient.discriminator,
-                'avatar_url': recipient.avatar_url,
+                'avatar_url': str(recipient.avatar_url),
                 'mod': False
             },
             'creator': {
                 'id': str(creator.id),
                 'name': creator.name,
                 'discriminator': creator.discriminator,
-                'avatar_url': creator.avatar_url,
+                'avatar_url': str(creator.avatar_url),
                 'mod': isinstance(creator, Member)
             },
             'closer': None,
@@ -363,7 +364,7 @@ async def append_log(self, message, channel_id='', type_='thread_message'):
                 'id': str(message.author.id),
                 'name': message.author.name,
                 'discriminator': message.author.discriminator,
-                'avatar_url': message.author.avatar_url,
+                'avatar_url': str(message.author.avatar_url),
                 'mod': not isinstance(message.channel, DMChannel),
             },
             'content': message.content,

core/thread.py

@@ -216,14 +216,15 @@ async def _close(self, closer, silent=False, delete_channel=True,
                 'id': str(closer.id),
                 'name': closer.name,
                 'discriminator': closer.discriminator,
-                'avatar_url': closer.avatar_url,
+                'avatar_url': str(closer.avatar_url),
                 'mod': True
             }
         })
 
         if log_data is not None and isinstance(log_data, dict):
             prefix = os.getenv('LOG_URL_PREFIX', '/logs')
-            if prefix == 'NONE': prefix = ''
+            if prefix == 'NONE':
+                prefix = ''
             log_url = f"{self.bot.config.log_url.strip('/')}{prefix}/{log_data['key']}"
 
             if log_data['messages']:
@@ -703,7 +704,6 @@ def _format_info_embed(self, user, log_url, log_count, color):
         """Get information about a member of a server
         supports users from the guild or not."""
         member = self.bot.guild.get_member(user.id)
-        avi = user.avatar_url
         time = datetime.utcnow()
 
         # key = log_url.split('/')[-1]
@@ -742,7 +742,7 @@ def _format_info_embed(self, user, log_url, log_count, color):
 
         footer = 'User ID: ' + str(user.id)
         embed.set_footer(text=footer)
-        embed.set_author(name=str(user), icon_url=avi, url=log_url)
+        embed.set_author(name=str(user), icon_url=user.avatar_url, url=log_url)
         # embed.set_thumbnail(url=avi)
 
         if member:

requirements.txt

@@ -1,4 +1,4 @@
-git+https://github.com/Rapptz/discord.py
+discord.py==1.1.1
 colorama>=0.4.0
 python-dateutil>=2.7.0
 emoji>=0.2