Merge from "master"

Author: Taaku18

CHANGELOG.md

@@ -4,7 +4,17 @@ 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).
 
+# [Unreleased]
+
+### Changed
+- Improve format of thread message embeds. Slightly cleaner and simpler now.
+- All commands are now blurple instead of green.
+
+### Added
+- Ability to set your own custom `mod_color` and `recipient_color` for the thread message embeds.
+
 # v2.9.1
+
 Changed order of arguments for the contact command. This is so that you can use aliases to their full potential. 
 For example: 
 - `contact "Recruitment Category" @somedude` 

bot.py

@@ -172,6 +172,32 @@ def blocked_users(self):
     @property
     def prefix(self):
         return self.config.get('prefix', '?')
+    
+    @property
+    def mod_color(self):
+        color = self.config.get('mod_color')
+        if not color:
+            return discord.Color.green()
+        try:
+            color = int(color.lstrip('#'), base=16)
+        except ValueError:
+            print('Invalid mod_color provided')
+            return discord.Color.green()
+        else:
+            return color
+
+    @property
+    def recipient_color(self):
+        color = self.config.get('recipient_color')
+        if not color:
+            return discord.Color.gold()
+        try:
+            color = int(color.lstrip('#'), base=16)
+        except ValueError:
+            print('Invalid recipient_color provided')
+            return discord.Color.gold()
+        else:
+            return color
 
     @staticmethod
     async def get_pre(bot, message):  # TODO: there gotta be a better way
@@ -409,10 +435,6 @@ async def on_message_edit(self, before, after):
                     embed = msg.embeds[0]
                     matches = str(embed.author.url).split('/')
                     if matches and matches[-1] == str(before.id):
-                        if ' - (Edited)' not in embed.footer.text:
-                            embed.set_footer(
-                                text=embed.footer.text + ' - (Edited)'
-                            )
                         embed.description = after.content
                         await msg.edit(embed=embed)
                         break

cogs/modmail.py

@@ -64,24 +64,25 @@ async def snippets(self, ctx):
 
         embeds = []
 
-        em = discord.Embed(color=discord.Color.green())
-        em.set_author(name='Snippets', icon_url=ctx.guild.icon_url)
-
-        embeds.append(em)
-
-        em.description = ('Here is a list of snippets '
-                          'that are currently configured.')
-
-        if not self.bot.snippets:
-            em.color = discord.Color.red()
-            em.description = f'You dont have any snippets at the moment.'
+        if self.bot.snippets:
+            em = discord.Embed(color=discord.Color.blurple(),
+                               description='Here is a list of snippets '
+                                           'that are currently configured.')
+        else:
+            em = discord.Embed(
+                color=discord.Color.red(),
+                description='You dont have any snippets at the moment.'
+            )
             em.set_footer(
                 text=f'Do {self.bot.prefix}help snippets for more commands.'
             )
 
+        em.set_author(name='Snippets', icon_url=ctx.guild.icon_url)
+        embeds.append(em)
+
         for name, value in self.bot.snippets.items():
             if len(em.fields) == 5:
-                em = discord.Embed(color=discord.Color.green(),
+                em = discord.Embed(color=discord.Color.blurple(),
                                    description=em.description)
                 em.set_author(name='Snippets', icon_url=ctx.guild.icon_url)
                 embeds.append(em)
@@ -101,7 +102,7 @@ async def add_(self, ctx, name: str.lower, *, value):
 
         em = discord.Embed(
             title='Added snippet',
-            color=discord.Color.green(),
+            color=discord.Color.blurple(),
             description=f'`{name}` points to: {value}'
         )
 
@@ -111,20 +112,22 @@ async def add_(self, ctx, name: str.lower, *, value):
     async def del_(self, ctx, *, name: str.lower):
         """Removes a snippet from bot config."""
 
-        em = discord.Embed(
-            title='Removed snippet',
-            color=discord.Color.green(),
-            description=f'`{name}` no longer exists.'
-        )
-
-        if not self.bot.config.snippets.get(name):
-            em.title = 'Error'
-            em.color = discord.Color.red()
-            em.description = f'Snippet `{name}` does not exist.'
-        else:
+        if self.bot.config.snippets.get(name):
+            em = discord.Embed(
+                title='Removed snippet',
+                color=discord.Color.blurple(),
+                description=f'`{name}` no longer exists.'
+            )
             del self.bot.config['snippets'][name]
             await self.bot.config.update()
 
+        else:
+            em = discord.Embed(
+                title='Error',
+                color=discord.Color.red(),
+                description=f'Snippet `{name}` does not exist.'
+            )
+
         await ctx.send(embed=em)
 
     @commands.command()
@@ -246,7 +249,7 @@ async def notify(self, ctx, *, role=None):
         else:
             mentions.append(mention)
             await self.bot.config.update()
-            em = discord.Embed(color=discord.Color.green(),
+            em = discord.Embed(color=discord.Color.blurple(),
                                description=f'{mention} will be mentioned '
                                            'on the next message received.')
         return await ctx.send(embed=em)
@@ -284,7 +287,7 @@ async def subscribe(self, ctx, *, role=None):
         else:
             mentions.append(mention)
             await self.bot.config.update()
-            em = discord.Embed(color=discord.Color.green(),
+            em = discord.Embed(color=discord.Color.blurple(),
                                description=f'{mention} will now be notified '
                                            'of all messages received.')
         return await ctx.send(embed=em)
@@ -317,7 +320,7 @@ async def unsubscribe(self, ctx, *, role=None):
         else:
             mentions.remove(mention)
             await self.bot.config.update()
-            em = discord.Embed(color=discord.Color.green(),
+            em = discord.Embed(color=discord.Color.blurple(),
                                description=f'{mention} is now unsubscribed '
                                            'to this thread.')
         return await ctx.send(embed=em)
@@ -372,7 +375,7 @@ async def logs(self, ctx, *,
 
         for index, entry in enumerate(closed_logs):
             if len(embeds[-1].fields) == 3:
-                em = discord.Embed(color=discord.Color.green())
+                em = discord.Embed(color=discord.Color.blurple())
                 em.set_author(name='Previous Logs', icon_url=icon_url)
                 embeds.append(em)
 
@@ -454,7 +457,7 @@ async def edit(self, ctx, message_id: Optional[int] = None,
         async for msg in ctx.channel.history():
             if message_id is None and msg.embeds:
                 em = msg.embeds[0]
-                if 'Moderator' not in str(em.footer.text):
+                if em.color != discord.Color.green() or not em.author.url:
                     continue
                 linked_message_id = str(em.author.url).split('/')[-1]
                 break
@@ -492,7 +495,7 @@ async def contact(self, ctx,
                 title='Created thread',
                 description=f'Thread started in {thread.channel.mention} '
                             f'for {user.mention}',
-                color=discord.Color.green()
+                color=discord.Color.blurple()
             )
 
         return await ctx.send(embed=em)
@@ -503,8 +506,8 @@ async def contact(self, ctx,
     async def blocked(self, ctx):
         """Returns a list of blocked users"""
         em = discord.Embed(title='Blocked Users',
-                           color=discord.Color.green(),
-                           description='')
+                           color=discord.Color.blurple(),
+                           description='Here is a list of blocked users.')
 
         users = []
         not_reachable = []
@@ -516,8 +519,6 @@ async def blocked(self, ctx):
             else:
                 not_reachable.append((id_, reason))
 
-        em.description = 'Here is a list of blocked users.'
-
         if users:
             val = '\n'.join(u.mention + (f' - `{r}`' if r else '')
                             for u, r in users)
@@ -549,19 +550,21 @@ async def block(self, ctx,
 
         mention = user.mention if hasattr(user, 'mention') else f'`{user.id}`'
 
-        em = discord.Embed(color=discord.Color.green())
-
         if str(user.id) not in self.bot.blocked_users:
             self.bot.config.blocked[str(user.id)] = reason
             await self.bot.config.update()
-
-            em.title = 'Success'
             extend = f'for `{reason}`' if reason else ''
-            em.description = f'{mention} is now blocked ' + extend
+            em = discord.Embed(
+                title='Success',
+                color=discord.Color.blurple(),
+                description=f'{mention} is now blocked ' + extend
+            )
         else:
-            em.title = 'Error'
-            em.description = f'{mention} is already blocked'
-            em.color = discord.Color.red()
+            em = discord.Embed(
+                title='Error',
+                color=discord.Color.red(),
+                description=f'{mention} is already blocked'
+            )
 
         return await ctx.send(embed=em)
 
@@ -581,18 +584,20 @@ async def unblock(self, ctx, *,
 
         mention = user.mention if hasattr(user, 'mention') else f'`{user.id}`'
 
-        em = discord.Embed(color=discord.Color.green())
-
         if str(user.id) in self.bot.blocked_users:
             del self.bot.config.blocked[str(user.id)]
             await self.bot.config.update()
-
-            em.title = 'Success'
-            em.description = f'{mention} is no longer blocked'
+            em = discord.Embed(
+                title='Success',
+                color=discord.Color.blurple(),
+                description=f'{mention} is no longer blocked'
+            )
         else:
-            em.title = 'Error'
-            em.description = f'{mention} is not blocked'
-            em.color = discord.Color.red()
+            em = discord.Embed(
+                title='Error',
+                description=f'{mention} is not blocked',
+                color=discord.Color.red()
+            )
 
         return await ctx.send(embed=em)