Merge

Author: robinmahieu

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 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.21.0
+
+### Added 
+
+New `?plugin registry compact` command which shows a more compact view of all plugins.
+
 # v2.20.2
 
 ### Plugin Registry

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.20.2'
+__version__ = '2.21.0'
 
 import asyncio
 import logging

cogs/modmail.py

@@ -52,14 +52,18 @@ async def setup(self, ctx):
         )
 
         embed = discord.Embed(
-            title='Friendly Reminder:',
+            title='Friendly Reminder',
             description=f'You may use the `{self.bot.prefix}config set log_channel_id '
                         '<channel-id>` command to set up a custom log channel'
                         ', then you can delete the default '
                         f'{log_channel.mention} channel.',
             color=self.bot.main_color
         )
 
+        embed.add_field(name='Thanks for using the bot!', value='If you like what you see, '
+        'consider giving the [repo a star](https://github.com/kyb3r/modmail) :star: or if you are '
+        'feeling generous, check us out on [Patreon](https://patreon.com/kyber)!')
+
         embed.set_footer(text=f'Type "{self.bot.prefix}help" '
                               'for a complete list of commands.')
         await log_channel.send(embed=embed)

cogs/plugins.py

@@ -343,7 +343,7 @@ async def plugin_enabled(self, ctx):
             )
             await ctx.send(embed=em)
 
-    @plugin.command(name='registry', aliases=['list'])
+    @plugin.group(invoke_without_command=True, name='registry', aliases=['list'])
     @checks.has_permissions(PermissionLevel.OWNER)
     async def plugin_registry(self, ctx, *, plugin_name: str = None):
         """Shows a list of all approved plugins."""
@@ -380,6 +380,7 @@ def find_index(name):
 
         for name, info in registry:
             repo = f"https://github.com/{info['repository']}"
+            url = f"{repo}/tree/master/{name}"
 
             em = discord.Embed(
                 color=self.bot.main_color,
@@ -392,16 +393,54 @@ def find_index(name):
                 name='Installation',
                 value=f'```{self.bot.prefix}plugins add {name}```')
 
-            em.set_author(name=info['title'], icon_url=info.get('icon_url'))
+            em.set_author(name=info['title'], icon_url=info.get('icon_url'), url=url)
             if info.get('thumbnail_url'):
                 em.set_thumbnail(url=info.get('thumbnail_url'))
+            if info.get('image_url'):
+                em.set_image(url=info.get('image_url'))
 
             embeds.append(em)
 
         paginator = PaginatorSession(ctx, *embeds)
         paginator.current = index
         await paginator.run()
 
+    @plugin_registry.command(name='compact')
+    async def plugin_registry_compact(self, ctx):
+        """Shows a compact view of all plugins within the registry."""
+
+        await self.populate_registry()
+
+        registry = list(self.registry.items())
+        registry.sort(key=lambda elem: elem[0])
+
+        pages = ['']
+
+        for name, info in registry:
+            repo = f"https://github.com/{info['repository']}"
+            url = f"{repo}/tree/master/{name}"
+            desc = info['description'].replace('\n', '')
+            fmt = f"[`{name}`]({url}) - {desc}"
+            length = len(fmt) - len(url) - 4
+            fmt = fmt[:75 + len(url)].strip() + '...' if length > 75 else fmt
+            if len(fmt) + len(pages[-1]) >= 1024:
+                pages.append(fmt+'\n')
+            else:
+                pages[-1] += fmt + '\n'
+
+        embeds = []
+
+        for page in pages:
+            em = discord.Embed(
+                color=self.bot.main_color,
+                description=page,
+                title='Plugin Registry (Compact View)',
+                )
+            embeds.append(em)
+
+        paginator = PaginatorSession(ctx, *embeds)
+        await paginator.run()
+
 
 def setup(bot):
     bot.add_cog(Plugins(bot))