Merge from master

Author: Taaku18

CHANGELOG.md

@@ -24,7 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `thread_auto_close_response` has a configurable variable `{timeout}`.
 - `?snippet` is now the default command name instead of `?snippets` (`?snippets` is still usable). This is to make this consistent with `?alias`/`?aliases`.
-- Colorama is no longer a necessity, this is due to some unsupported OS.
+- `colorama` is no longer a necessity, this is due to some unsupported OS.
+- Changelog command can now take a version argument to jump straight to specified version.
 
 ### Fixes
 

README.md

@@ -48,7 +48,7 @@ All threads are logged and you can view previous threads through the correspondi
   * Snippets and *command aliases*.
   * Minimum duration for accounts to be created before allowed to contact Modmail (`account_age`).
   * Minimum duration for member to be in the guild allowed to contact Modmail (`guild_age`). 
-* **Thread logs:**
+* **Advanced Logging Functionality:**
   * When you close a thread, a [log link](https://logs.modmail.tk/example) is generated and posted to your log channel.
   * Native Discord dark-mode feel.
   * Markdown/formatting support.
@@ -108,6 +108,20 @@ Finally, run the bot.
 $ pipenv run bot
 ```
 
+## Sponsors
+
+Special thanks to our sponsors for supporting the project.
+
+- [flyAurora](https://flyaurora.xyz/):
+
+<a href='https://flyaurora.xyz/'> 
+  <img height=150 src='https://pbs.twimg.com/profile_images/1142307497115443200/whbHhb9B_400x400.jpg'> 
+</a>
+<br>
+<br>
+
+Become a [sponsor](https://patreon.com/kyber).
+
 ## Plugins
 
 Modmail supports the use of third-party plugins to extend or add functionality to the bot. This allows the introduction of niche features as well as anything else outside of the scope of the core functionality of Modmail. A list of third party plugins can be found using the `plugins registry` command. To develop your own, check out the [documentation](https://github.com/kyb3r/modmail/wiki/Plugins) for plugins.

cogs/utility.py

@@ -227,11 +227,24 @@ def cog_unload(self):
     @commands.command()
     @checks.has_permissions(PermissionLevel.REGULAR)
     @trigger_typing
-    async def changelog(self, ctx):
+    async def changelog(self, ctx, version: str.lower = ''):
         """Shows the changelog of the Modmail."""
         changelog = await Changelog.from_url(self.bot)
+        version = version.lstrip("vV") if version else changelog.latest_version.version
+
+        try:
+            index = [v.version for v in changelog.versions].index(version)
+        except ValueError:
+            return await ctx.send(
+                embed=Embed(
+                    color=Color.red(),
+                    description=f"The specified version `{version}` could not be found.",
+                )
+            )
+
         try:
             paginator = PaginatorSession(ctx, *changelog.embeds)
+            paginator.current = index
             await paginator.run()
         except Exception:
             await ctx.send(changelog.CHANGELOG_URL)

core/thread.py

@@ -320,7 +320,7 @@ async def _close(
             else:
                 message = self.bot.config["thread_close_response"]
 
-        message = message.format(closer=closer, loglink=log_url, logkey=log_data["key"])
+        message = message.format(closer=closer, loglink=log_url, logkey=log_data["key"] if log_data else None)
 
         embed.description = message
         footer = self.bot.config["thread_close_footer"]
@@ -763,7 +763,7 @@ async def find(
     ) -> Thread:
         """Finds a thread from cache or from discord channel topics."""
         if recipient is None and channel is not None:
-            return await self._find_from_channel(channel)
+            return self._find_from_channel(channel)
 
         thread = None
 
@@ -789,7 +789,7 @@ async def find(
                 thread.ready = True
         return thread
 
-    async def _find_from_channel(self, channel):
+    def _find_from_channel(self, channel):
         """
         Tries to find a thread from a channel channel topic,
         if channel topic doesnt exist for some reason, falls back to
@@ -801,23 +801,6 @@ async def _find_from_channel(self, channel):
         if channel.topic:
             user_id = match_user_id(channel.topic)
 
-        # BUG: When discord fails to create channel topic.
-        # search through message history
-        elif channel.topic is None:
-            try:
-                async for message in channel.history(limit=100):
-                    if message.author != self.bot.user:
-                        continue
-                    if message.embeds:
-                        embed = message.embeds[0]
-                        if embed.footer.text:
-                            user_id = match_user_id(embed.footer.text)
-                            if user_id != -1:
-                                break
-            except discord.NotFound:
-                # When the channel's deleted.
-                pass
-
         if user_id != -1:
             if user_id in self.cache:
                 return self.cache[user_id]