Use embeds instead of normal messages

Author: robinmahieu

cogs/plugins.py

@@ -41,7 +41,7 @@ def __init__(self, bot):
         self.registry = {}
         self.bot.loop.create_task(self.download_initial_plugins())
         self.bot.loop.create_task(self.populate_registry())
-    
+
     async def populate_registry(self):
         url = 'https://raw.githubusercontent.com/kyb3r/modmail/master/plugins/registry.json'
         async with self.bot.session.get(url) as resp:
@@ -146,42 +146,71 @@ async def plugin_add(self, ctx, *, plugin_name: str):
             plugin_name = info['repository'] + '/' + plugin_name
             required_version = info['bot_version']
             if parse_version(self.bot.version) < parse_version(required_version):
-                return await ctx.send(f"Bot version too low, plugin requires version `{required_version}`")
+                em = discord.Embed(
+                    description=f'Your bot\'s version is too low. This plugin requires version `{required_version}`.',
+                    color=self.bot.main_color
+                )
+                return await ctx.send(embed=em)
         if plugin_name in self.bot.config.plugins:
-            return await ctx.send('Plugin already installed.')
+            em = discord.Embed(
+                description='This plugin is already installed.',
+                color=self.bot.main_color
+            )
+            return await ctx.send(embed=em)
         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.')
+            em = discord.Embed(
+                description='There\'s another cog installed with the same name.',
+                color=self.bot.main_color
+            )
+            return await ctx.send(embed=em)
 
-        message = await ctx.send('Downloading plugin...')
+        em = discord.Embed(
+            description='Downloading this plugin...',
+            color=self.bot.main_color
+        )
+        message = await ctx.send(embed=em)
         async with ctx.typing():
             if len(plugin_name.split('/')) >= 3:
                 parsed_plugin = self.parse_plugin(plugin_name)
 
                 try:
                     await self.download_plugin_repo(*parsed_plugin[:-1])
                 except DownloadError as exc:
-                    return await ctx.send(
-                        f'Unable to fetch plugin from Github: {exc}.'
+                    em = discord.Embed(
+                        description=f'Unable to fetch this plugin from Github: {exc}.',
+                        color=self.bot.main_color
                     )
+                    return await ctx.send(embed=em)
 
                 importlib.invalidate_caches()
                 try:
                     await self.load_plugin(*parsed_plugin)
                 except DownloadError as exc:
-                    return await ctx.send(f'Unable to load plugin: `{exc}`.')
+                    em = discord.Embed(
+                        description=f'Unable to load this plugin: {exc}.',
+                        color=self.bot.main_color
+                    )
+                    return await ctx.send(embed=em)
 
                 # if it makes it here, it has passed all checks and should
                 # be entered into the config
 
                 self.bot.config.plugins.append(plugin_name)
                 await self.bot.config.update()
 
-                await message.edit(content='Plugin installed. Any plugin that '
-                                   'you install is of your OWN RISK.')
+                em = discord.Embed(
+                    description='The plugin is installed.\n'
+                                '*Please note: any plugin that you install is of your OWN RISK*',
+                    color=self.bot.main_color
+                )
+                await self.bot.edit_message(message, embed=em)
             else:
-                await message.edit(content='Invalid plugin name format. '
-                                   'Use username/repo/plugin.')
+                em = discord.Embed(
+                    description='Invalid plugin name format: use username/repo/plugin.',
+                    color=self.bot.main_color
+                )
+                await self.bot.edit_message(message, embed=em)
 
     @plugin.command(name='remove', aliases=['del', 'delete', 'rm'])
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -196,7 +225,7 @@ async def plugin_remove(self, ctx, *, plugin_name: str):
                 self.bot.unload_extension(
                     f'plugins.{username}-{repo}.{name}.{name}'
                 )
-            except:
+            except Exception:
                 pass
 
             self.bot.config.plugins.remove(plugin_name)
@@ -219,10 +248,17 @@ def onerror(func, path, exc_info):  # pylint: disable=W0613
                 raise exc
 
             await self.bot.config.update()
-            await ctx.send('Plugin uninstalled and '
-                           'all related data is erased.')
+            em = discord.Embed(
+                description='The plugin is uninstalled and all it\'s data is erased.',
+                color=self.bot.main_color
+            )
+            await ctx.send(embed=em)
         else:
-            await ctx.send('Plugin not installed.')
+            em = discord.Embed(
+                description='That plugin is not installed.',
+                color=self.bot.main_color
+            )
+            await ctx.send(embed=em)
 
     @plugin.command(name='update')
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -232,7 +268,11 @@ async def plugin_update(self, ctx, *, plugin_name: str):
             info = self.registry[plugin_name]
             plugin_name = info['repository'] + '/' + plugin_name
         if plugin_name not in self.bot.config.plugins:
-            return await ctx.send('Plugin not installed.')
+            em = discord.Embed(
+                description='That plugin is not installed.',
+                color=self.bot.main_color
+            )
+            return await ctx.send(embed=em)
 
         async with ctx.typing():
             username, repo, name = self.parse_plugin(plugin_name)
@@ -245,10 +285,18 @@ async def plugin_update(self, ctx, *, plugin_name: str):
                 )
             except subprocess.CalledProcessError as exc:
                 err = exc.stderr.decode('utf8').strip()
-                await ctx.send(f'Error while updating: {err}.')
+                em = discord.Embed(
+                    description=f'An error occured while updating: {err}.',
+                    color=self.bot.main_color
+                )
+                await ctx.send(embed=em)
             else:
                 output = cmd.stdout.decode('utf8').strip()
-                await ctx.send(f'```\n{output}\n```')
+                em = discord.Embed(
+                    description='```\n{output}\n```',
+                    color=self.bot.main_color
+                )
+                await ctx.send(embed=em)
 
                 if output != 'Already up to date.':
                     # repo was updated locally, now perform the cog reload
@@ -257,21 +305,33 @@ async def plugin_update(self, ctx, *, plugin_name: str):
                     try:
                         await self.load_plugin(username, repo, name)
                     except DownloadError as exc:
-                        await ctx.send(f'Unable to start plugin: `{exc}`.')
+                        em = discord.Embed(
+                            description=f'Unable to start the plugin: `{exc}`.',
+                            color=self.bot.main_color
+                        )
+                        await ctx.send(embed=em)
 
     @plugin.command(name='enabled', aliases=['installed'])
     @checks.has_permissions(PermissionLevel.OWNER)
     async def plugin_enabled(self, ctx):
         """Shows a list of currently enabled plugins."""
         if self.bot.config.plugins:
             msg = '```\n' + '\n'.join(self.bot.config.plugins) + '\n```'
-            await ctx.send(msg)
+            em = discord.Embed(
+                description=msg,
+                color=self.bot.main_color
+            )
+            await ctx.send(embed=em)
         else:
-            await ctx.send('No plugins installed.')
+            em = discord.Embed(
+                description='There are no plugins installed.',
+                color=self.bot.main_color
+            )
+            await ctx.send(embed=em)
 
     @plugin.command(name='registry', aliases=['list'])
     @checks.has_permissions(PermissionLevel.OWNER)
-    async def plugin_registry(self, ctx, *, plugin_name:str=None):
+    async def plugin_registry(self, ctx, *, plugin_name: str = None):
         """Shows a list of all approved plugins."""
 
         await self.populate_registry()
@@ -293,9 +353,9 @@ def find_index(name):
             index = find_index(plugin_name)
         elif plugin_name is not None:
             em = discord.Embed(
-                    color=discord.Color.red(), 
-                    description=f'Could not find a plugin with name "{plugin_name}" within the registry.'
-                    )
+                color=discord.Color.red(),
+                description=f'Could not find a plugin with name "{plugin_name}" within the registry.'
+            )
 
             matches = get_close_matches(plugin_name, self.registry.keys())
             if matches:
@@ -311,11 +371,11 @@ def find_index(name):
                 url=repo,
                 title=info['repository']
                 )
-            
+
             em.add_field(
-                name='Installation', 
+                name='Installation',
                 value=f'```{self.bot.prefix}plugins add {name}```')
-            
+
             em.set_author(name=info['title'], icon_url=info.get('icon_url'))
             if info.get('thumbnail_url'):
                 em.set_thumbnail(url=info.get('thumbnail_url'))
@@ -327,6 +387,5 @@ def find_index(name):
         await paginator.run()
 
 
-
 def setup(bot):
     bot.add_cog(Plugins(bot))