v3.3.0-dev1

Author: Taaku18

CHANGELOG.md

@@ -7,7 +7,13 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
 however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
 
 
-# [UNRELEASED]
+# v3.3.0-dev1
+
+### Added
+
+- Two new config vars:
+  - `ENABLE_PLUGINS` (yes/no default yes), when set to no, plugins will not be loaded into the bot.
+  - `ERROR_COLOR` (color format, defaults discord red), the color of error messages.
 
 ### Changed
 
@@ -19,6 +25,7 @@ however, insignificant breaking changes does not guarantee a major version bump,
   - Logging / plugin-related messages changes.
   - Updating one plugin will not update all other plugins (plugins are no longer separated by repos, but the plugin name itself).
 - Help command is in alphabetical order grouped by permissions.
+- Notes are no longer always blurple, its set to `MAIN_COLOR` now.
 
 ### Internal
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.3.0-dev"
+__version__ = "3.3.0-dev1"
 
 import asyncio
 import logging
@@ -376,6 +376,10 @@ def recipient_color(self) -> int:
     def main_color(self) -> int:
         return self.config.get("main_color")
 
+    @property
+    def error_color(self) -> int:
+        return self.config.get("error_color")
+
     def command_perm(self, command_name: str) -> PermissionLevel:
         level = self.config["override_command_level"].get(command_name)
         if level is not None:
@@ -608,7 +612,7 @@ async def _process_blocked(self, message: discord.Message) -> bool:
                         title="Message not sent!",
                         description=f"Your must wait for {delta} "
                         f"before you can contact me.",
-                        color=discord.Color.red(),
+                        color=self.error_color,
                     )
                 )
 
@@ -632,7 +636,7 @@ async def _process_blocked(self, message: discord.Message) -> bool:
                         title="Message not sent!",
                         description=f"Your must wait for {delta} "
                         f"before you can contact me.",
-                        color=discord.Color.red(),
+                        color=self.error_color,
                     )
                 )
 
@@ -950,7 +954,7 @@ async def on_member_remove(self, member):
         if thread:
             embed = discord.Embed(
                 description="The recipient has left the server.",
-                color=discord.Color.red(),
+                color=self.error_color,
             )
             await thread.channel.send(embed=embed)
 
@@ -1008,14 +1012,14 @@ async def on_command_error(self, context, exception):
             )
             await context.trigger_typing()
             await context.send(
-                embed=discord.Embed(color=discord.Color.red(), description=msg)
+                embed=discord.Embed(color=self.error_color, description=msg)
             )
 
         elif isinstance(exception, commands.BadArgument):
             await context.trigger_typing()
             await context.send(
                 embed=discord.Embed(
-                    color=discord.Color.red(), description=str(exception)
+                    color=self.error_color, description=str(exception)
                 )
             )
         elif isinstance(exception, commands.CommandNotFound):
@@ -1028,7 +1032,7 @@ async def on_command_error(self, context, exception):
                     if hasattr(check, "fail_msg"):
                         await context.send(
                             embed=discord.Embed(
-                                color=discord.Color.red(), description=check.fail_msg
+                                color=self.error_color, description=check.fail_msg
                             )
                         )
                     if hasattr(check, "permission_level"):

cogs/modmail.py

@@ -52,7 +52,7 @@ async def setup(self, ctx):
             embed = discord.Embed(
                 title="Error",
                 description="Modmail functioning guild not found.",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
             )
             return await ctx.send(embed=embed)
 
@@ -165,7 +165,7 @@ async def snippet(self, ctx, *, name: str.lower = None):
 
         if not self.bot.snippets:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="You dont have any snippets at the moment.",
             )
             embed.set_footer(
@@ -212,23 +212,23 @@ async def snippet_add(self, ctx, name: str.lower, *, value: commands.clean_conte
         if name in self.bot.snippets:
             embed = discord.Embed(
                 title="Error",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"Snippet `{name}` already exists.",
             )
             return await ctx.send(embed=embed)
 
         if name in self.bot.aliases:
             embed = discord.Embed(
                 title="Error",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"An alias with the same name already exists: `{name}`.",
             )
             return await ctx.send(embed=embed)
 
         if len(name) > 120:
             embed = discord.Embed(
                 title="Error",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"Snippet names cannot be longer than 120 characters.",
             )
             return await ctx.send(embed=embed)
@@ -316,16 +316,15 @@ async def move(self, ctx, category: discord.CategoryChannel, *, specifics: str =
         except (discord.HTTPException, discord.InvalidArgument):
             pass
 
-    @staticmethod
-    async def send_scheduled_close_message(ctx, after, silent=False):
+    async def send_scheduled_close_message(self, ctx, after, silent=False):
         human_delta = human_timedelta(after.dt)
 
         silent = "*silently* " if silent else ""
 
         embed = discord.Embed(
             title="Scheduled close",
             description=f"This thread will close {silent}in {human_delta}.",
-            color=discord.Color.red(),
+            color=self.bot.error_color,
         )
 
         if after.arg and not silent:
@@ -375,12 +374,12 @@ async def close(self, ctx, *, after: UserFriendlyTime = None):
             if thread.close_task is not None or thread.auto_close_task is not None:
                 await thread.cancel_closure(all=True)
                 embed = discord.Embed(
-                    color=discord.Color.red(),
+                    color=self.bot.error_color,
                     description="Scheduled close has been cancelled.",
                 )
             else:
                 embed = discord.Embed(
-                    color=discord.Color.red(),
+                    color=self.bot.error_color,
                     description="This thread has not already been scheduled to close.",
                 )
 
@@ -432,7 +431,7 @@ async def notify(
 
         if mention in mentions:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"{mention} is already going to be mentioned.",
             )
         else:
@@ -471,7 +470,7 @@ async def unnotify(
 
         if mention not in mentions:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"{mention} does not have a pending notification.",
             )
         else:
@@ -511,7 +510,7 @@ async def subscribe(
 
         if mention in mentions:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"{mention} is already " "subscribed to this thread.",
             )
         else:
@@ -550,7 +549,7 @@ async def unsubscribe(
 
         if mention not in mentions:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"{mention} is not already " "subscribed to this thread.",
             )
         else:
@@ -659,7 +658,7 @@ async def logs(self, ctx, *, user: User = None):
 
         if not any(not log["open"] for log in logs):
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="This user does not " "have any previous logs.",
             )
             return await ctx.send(embed=embed)
@@ -696,7 +695,7 @@ async def logs_closed_by(self, ctx, *, user: User = None):
 
         if not embeds:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="No log entries have been found for that query",
             )
             return await ctx.send(embed=embed)
@@ -729,7 +728,7 @@ async def logs_search(self, ctx, limit: Optional[int] = None, *, query):
 
         if not embeds:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="No log entries have been found for that query.",
             )
             return await ctx.send(embed=embed)
@@ -788,11 +787,7 @@ async def find_linked_message(self, ctx, message_id):
         async for msg in ctx.channel.history():
             if message_id is None and msg.embeds:
                 embed = msg.embeds[0]
-                if isinstance(self.bot.mod_color, discord.Color):
-                    mod_color = self.bot.mod_color.value
-                else:
-                    mod_color = self.bot.mod_color
-                if embed.color.value != mod_color or not embed.author.url:
+                if embed.color.value != self.bot.mod_color or not embed.author.url:
                     continue
                 # TODO: use regex to find the linked message id
                 linked_message_id = str(embed.author.url).split("/")[-1]
@@ -823,7 +818,7 @@ async def edit(self, ctx, message_id: Optional[int] = None, *, message: str):
                 embed=discord.Embed(
                     title="Failed",
                     description="Cannot find a message to edit.",
-                    color=discord.Color.red(),
+                    color=self.bot.error_color,
                 )
             )
 
@@ -859,15 +854,15 @@ async def contact(
 
         if user.bot:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="Cannot start a thread with a bot.",
             )
             return await ctx.send(embed=embed)
 
         exists = await self.bot.threads.find(recipient=user)
         if exists:
             embed = discord.Embed(
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description="A thread for this user already "
                 f"exists in {exists.channel.mention}.",
             )
@@ -1031,7 +1026,7 @@ async def block(
             embed = discord.Embed(
                 title="Error",
                 description=f"Cannot block {mention}, user is whitelisted.",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
             )
             return await ctx.send(embed=embed)
 
@@ -1079,7 +1074,7 @@ async def block(
         else:
             embed = discord.Embed(
                 title="Error",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
                 description=f"{mention} is already blocked.",
             )
 
@@ -1136,7 +1131,7 @@ async def unblock(self, ctx, *, user: User = None):
             embed = discord.Embed(
                 title="Error",
                 description=f"{mention} is not blocked.",
-                color=discord.Color.red(),
+                color=self.bot.error_color,
             )
 
         return await ctx.send(embed=embed)
@@ -1168,7 +1163,7 @@ async def delete(self, ctx, message_id: Optional[int] = None):
                 embed=discord.Embed(
                     title="Failed",
                     description="Cannot find a message to delete.",
-                    color=discord.Color.red(),
+                    color=self.bot.error_color,
                 )
             )