Manual merge from master, freezes packages in requirements.txt

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,14 @@ 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).
 
+# v2.6.3
+
+Fixed small issue in thread finding.
+
+# v2.6.2
+
+Fixed log urls for selfhosting users. (This shouldn't affect anyone)
+
 # v2.6.1
 
 ### Fixed

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.6.1'
+__version__ = '2.6.3'
 
 import discord
 from discord.enums import ActivityType
@@ -483,6 +483,7 @@ async def data_loop(self):
                 "owner_id": self.owner.id,
                 "bot_id": self.user.id,
                 "bot_name": str(self.user),
+                "avatar_url": self.user.avatar_url,
                 "guild_id": self.guild_id,
                 "guild_name": self.guild.name,
                 "member_count": len(self.guild.members),
@@ -491,7 +492,7 @@ async def data_loop(self):
                 "latency": f'{self.ws.latency * 1000:.4f}',
                 "version": self.version,
                 "selfhosted": self.selfhosted,
-                "last_updated": str(datetime.datetime.utcnow())
+                "last_updated": str(datetime.utcnow())
             }
 
             await self.modmail_api.post_metadata(data)

cogs/modmail.py

@@ -128,7 +128,7 @@ async def move(self, ctx, *, category: discord.CategoryChannel):
         if not thread:
             return await ctx.send('This is not a modmail thread.')
 
-        await thread.channel.edit(category=category)
+        await thread.channel.edit(category=category, sync_permissions=True)
         await ctx.message.add_reaction('✅')
 
     async def send_scheduled_close_message(self, ctx, after, silent=False):

core/decorators.py

@@ -16,8 +16,8 @@ async def wrapper(self, ctx, *args, **kwargs):
 def auth_required(func):
     @functools.wraps(func)
     async def wrapper(self, ctx, *args, **kwargs):
-        if self.bot.selfhosted and \
-           self.bot.config.get('github_access_token') or \
+        if (self.bot.selfhosted and
+           self.bot.config.get('github_access_token')) or \
            self.bot.config.get('modmail_api_token'):
             return await func(self, ctx, *args, **kwargs)
 

core/thread.py

@@ -105,9 +105,9 @@ async def _close(self, closer, silent=False, delete_channel=True,
             return
 
         if self.bot.selfhosted:
-            log_url = f'{self.bot.config.log_url}/logs/{log_data["_id"]}'
+            log_url = f"{self.bot.config.log_url}/logs/{log_data['key']}"
         else:
-            log_url = f"https://logs.modmail.tk/{log_data['_id']}"
+            log_url = f"https://logs.modmail.tk/{log_data['key']}"
 
         user = self.recipient.mention if self.recipient else f'`{self.id}`'
 
@@ -117,7 +117,7 @@ async def _close(self, closer, silent=False, delete_channel=True,
         else:
             sneak_peak = 'No content'
 
-        desc = f"{user} [`{log_data['_id']}`]({log_url}): {sneak_peak}"
+        desc = f"{user} [`{log_data['key']}`]({log_url}): {sneak_peak}"
 
         em = discord.Embed(description=desc, color=discord.Color.red())
 
@@ -392,7 +392,8 @@ async def _find_from_channel(self, channel):
                 if message.embeds:
                     em = message.embeds[0]
                     # TODO: use re.search instead
-                    matches = re.findall(r'User ID: (\d+)', em.footer.text)
+                    matches = re.findall(r'User ID: (\d+)',
+                                         str(em.footer.text))
                     if matches:
                         user_id = int(matches[0])
                         break

requirements.txt

@@ -1,15 +1,15 @@
-git+https://github.com/Rapptz/discord.py@rewrite
-colorama
-cachetools
-python-dateutil
-python-box
-colorthief
-emoji
-dhooks
-natural
-parsedatetime
-motor
-sanic
-dnspython
-aiohttp
-pymongo
+git+https://github.com/Rapptz/discord.py@7f4c57dd5ad20b7fa10aea485f674a4bc24b9547
+colorama==0.4.1
+cachetools==3.0.0
+python-dateutil==2.7.5
+python-box==3.2.3
+colorthief==0.2.1
+emoji==0.5.1
+dhooks==1.1.0
+natural==0.2.0
+parsedatetime==2.4
+motor==2.0.0
+sanic==18.12.0
+dnspython==1.16.0
+aiohttp==3.4.4
+pymongo==3.7.2