Merge branch 'master' into cleanup

Author: Taaku18

CHANGELOG.md

@@ -4,12 +4,25 @@ 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]
+
+# v2.9.4
+Fixed a small bug due to a typo.
+
+# v2.9.3
+Forgot to enable custom embed colors.
+
+### Added
+- Ability to set a custom `mod_tag` (the text in the footer of the mod reply embed, which by default says "Moderator")
+
+# v2.9.2
 
 ### Changed
-- Improve format of thread message embeds. Slightly cleaner and simpler now.
+- Improve format of thread info embed. Slightly cleaner and simpler now.
 - All commands are now blurple instead of green.
 
+### Fixed
+- Bug where the close command wouldn't work if you didnt configure a log channel. 
+
 ### Added
 - Ability to set your own custom `mod_color` and `recipient_color` for the thread message embeds.
 

README.md

@@ -44,7 +44,7 @@ When a user sends a direct message to the bot, a channel is created within an is
 
 ## Installation
 
-You have two options for using this bot, host on Heroku or self-host the bot. If you choose to install the bot using Heroku, you will not need to download anything. Read the **[installation guide](https://github.com/kyb3r/modmail/wiki/Installation)**. If you ran into any problems, join our [discord server](https://discord.gg/etJNHCQ) for help and support. Even if you don't have any issues, you should come and check out our awesome Discord community! :wink:
+Currently the easiest and fastest way to set up the bot is using Heroku. If you choose to install the bot using Heroku, you will not need to download anything. Read the **[installation guide](https://github.com/kyb3r/modmail/wiki/Installation)**. If you ran into any problems, join our [discord server](https://discord.gg/etJNHCQ) for help and support. Even if you don't have any issues, you should come and check out our awesome Discord community! :wink:
 
 ## What is Heroku?
 

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.9.1'
+__version__ = '2.9.4'
 
 import discord
 from discord.enums import ActivityType

cogs/modmail.py

@@ -413,7 +413,7 @@ def truncate(c):
 
         session = PaginatorSession(ctx, *embeds)
         await session.run()
-
+        
     @commands.command()
     @trigger_typing
     async def reply(self, ctx, *, msg=''):
@@ -457,7 +457,8 @@ 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 em.color != discord.Color.green() or not em.author.url:
+                mod_color = self.bot.mod_color.value if isinstance(self.bot.mod_color, discord.Color) else self.bot.mod_color
+                if em.color.value != mod_color or not em.author.url:
                     continue
                 linked_message_id = str(em.author.url).split('/')[-1]
                 break

core/config.py

@@ -13,7 +13,8 @@ class ConfigManager:
         'activity_message', 'activity_type', 'log_channel_id',
         'mention', 'disable_autoupdates', 'prefix',
         'main_category_id', 'sent_emoji', 'blocked_emoji',
-        'thread_creation_response', 'twitch_url'
+        'thread_creation_response', 'twitch_url', 'mod_color', 
+        'recipient_color', 'mod_tag'
         }
 
     internal_keys = {

core/thread.py

@@ -130,10 +130,12 @@ async def _close(self, closer, silent=False, delete_channel=True,
         em.timestamp = datetime.utcnow()
 
         tasks = [
-            self.bot.log_channel.send(embed=em),
             self.bot.config.update()
         ]
 
+        if self.bot.log_channel:
+            tasks.append(self.bot.log_channel.send(embed=em))
+
         # Thread closed message 
 
         em = discord.Embed(title='Thread Closed',
@@ -322,7 +324,7 @@ def is_image_url(u, _):
 
         if from_mod:
             em.color = self.bot.mod_color
-            em.set_footer(text=f'Moderator')
+            em.set_footer(text=self.bot.config.get('mod_tag', 'Moderator'))
         elif note:
             em.color = discord.Color.blurple()
         else: