Implement get_prefix which replaces the former weird get_pre method

Author: Taaku18

bot.py

@@ -55,7 +55,7 @@
 class ModmailBot(commands.Bot):
 
     def __init__(self):
-        super().__init__(command_prefix=self.get_pre)
+        super().__init__(command_prefix=None)  # implemented in `get_prefix`
         self.version = __version__
         self.start_time = datetime.utcnow()
         self.threads = ThreadManager(self)
@@ -75,6 +75,9 @@ def __init__(self):
         self._add_commands()
         self.owner = None
 
+    async def get_prefix(self, message=None):
+        return [self.prefix, f'<@{self.user.id}> ', f'<@!{self.user.id}> ']
+
     def _add_commands(self):
         """Adds commands automatically"""
         self.remove_command('help')
@@ -199,11 +202,6 @@ def recipient_color(self):
         else:
             return color
 
-    @staticmethod
-    async def get_pre(bot, message):  # TODO: there gotta be a better way
-        """Returns the prefix."""
-        return [bot.prefix, f'<@{bot.user.id}> ', f'<@!{bot.user.id}> ']
-
     async def on_connect(self):
         print(line)
         print(Fore.CYAN, end='')
@@ -343,8 +341,7 @@ async def get_context(self, message, *, cls=commands.Context):
         if self._skip_check(message.author.id, self.user.id):
             return ctx
 
-        # TODO: Can be replaced with await `self.get_pre(self, None)`?
-        prefixes = [self.prefix, f'<@{bot.user.id}> ', f'<@!{bot.user.id}> ']
+        prefixes = await self.get_prefix()
 
         invoked_prefix = discord.utils.find(view.skip_string, prefixes)
         if invoked_prefix is None:

core/thread.py

@@ -14,12 +14,14 @@
 
 
 class Thread:
-    """Represents a discord modmail thread"""
+    """Represents a discord Modmail thread"""
 
     def __init__(self, manager, recipient):
         self.manager = manager
         self.bot = manager.bot
+        # TODO: Why wouldn't there be recipient?
         self.id = recipient.id if recipient else None
+        # TODO: recipient should not be bot
         self.recipient = recipient
         self.channel = None
         self.ready_event = asyncio.Event()