Merge branch 'development'

Author: fourjr

CHANGELOG.md

@@ -10,6 +10,13 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 
 ### Fixed
 
+- Autoupdate persists despite errors
+- Mention when normal thread created was not working.
+
+# v3.7.5
+
+### Fixed
+
 - Close on emoji was not working.
 
 # v3.7.3

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.7.5"
+__version__ = "3.7.6"
 
 
 import asyncio
@@ -1479,10 +1479,17 @@ async def autoupdate(self):
             else:
                 command = "git pull"
                 proc = await asyncio.create_subprocess_shell(command, stderr=PIPE, stdout=PIPE,)
+                err = await proc.stderr.read()
+                err = err.decode("utf-8").rstrip()
                 res = await proc.stdout.read()
                 res = res.decode("utf-8").rstrip()
 
-                if res != "Already up to date.":
+                if err and not res:
+                    logger.warning(f"Autoupdate failed: {err}")
+                    self.autoupdate_loop.cancel()
+                    return
+
+                elif res != "Already up to date.":
                     logger.info("Bot has been updated.")
                     channel = self.log_channel
                     if self.hosting_method == HostingMethod.PM2:

cogs/utility.py

@@ -3,6 +3,7 @@
 import os
 import random
 import re
+from sys import stdout
 import traceback
 from contextlib import redirect_stdout
 from datetime import datetime
@@ -1920,10 +1921,18 @@ async def update(self, ctx, *, flag: str = ""):
                 command = "git pull"
 
                 proc = await asyncio.create_subprocess_shell(command, stderr=PIPE, stdout=PIPE,)
+                err = await proc.stderr.read()
+                err = err.decode("utf-8").rstrip()
                 res = await proc.stdout.read()
                 res = res.decode("utf-8").rstrip()
 
-                if res != "Already up to date.":
+                if err and not res:
+                    embed = discord.Embed(
+                        title="Update failed", description=err, color=self.bot.error_color
+                    )
+                    await ctx.send(embed=embed)
+
+                elif res != "Already up to date.":
                     logger.info("Bot has been updated.")
 
                     embed = discord.Embed(title="Bot has been updated", color=self.bot.main_color,)

core/thread.py

@@ -155,7 +155,7 @@ async def setup(self, *, creator=None, category=None, initial_message=None):
         await channel.edit(topic=f"User ID: {recipient.id}")
         self.ready = True
 
-        if creator != recipient:
+        if creator is not None and creator != recipient:
             mention = None
         else:
             mention = self.bot.config["mention"]

pyproject.toml

@@ -36,7 +36,7 @@ keywords = ['discord', 'modmail']
 
 [tool.poetry.dependencies]
 python = "^3.7"
-"discord.py" = "./discord.py-1.5.1.tar.gz"
+"discord.py" = "./discord.py-1.5.2.tar.gz"
 uvloop = {version = ">=0.12.0", markers = "sys_platform != 'win32'"}
 python-dotenv = ">=0.10.3"
 parsedatetime = "^2.6"

requirements.min.txt

@@ -6,7 +6,7 @@ aiohttp==3.6.2
 async-timeout==3.0.1
 attrs==19.3.0
 chardet==3.0.4
-./discord.py-1.5.1.tar.gz
+./discord.py-1.5.2.tar.gz
 dnspython==1.16.0
 emoji==0.5.4
 future==0.18.2