Merge branch 'development' of https://github.com/Cordila/modmail into Cordila-development

Author: fourjr

bot.py

@@ -1099,7 +1099,7 @@ async def get_context(self, message, *, cls=commands.Context):
         view = StringView(message.content)
         ctx = cls(prefix=self.prefix, view=view, bot=self, message=message)
 
-        if self._skip_check(message.author.id, self.user.id):
+        if message.author.id == self.user.id:
             return ctx
 
         ctx.thread = await self.threads.find(channel=ctx.channel)

core/thread.py

@@ -196,7 +196,6 @@ async def setup(self, *, creator=None, category=None, initial_message=None):
             log_url = log_count = None
             # ensure core functionality still works
 
-        await channel.edit(topic=f"User ID: {recipient.id}")
         self.ready = True
 
         if creator is not None and creator != recipient:

core/utils.py

@@ -432,6 +432,7 @@ async def create_thread_channel(bot, recipient, category, overwrites, *, name=No
             name=name,
             category=category,
             overwrites=overwrites,
+            topic=f"User ID: {recipient.id}",
             reason="Creating a thread channel.",
         )
     except discord.HTTPException as e: