Fix previous commit.

- Return only if hosting method is HEROKU.
- Try to get the response error message first if any.

Author: Jerrie-Aries

bot.py

@@ -1594,17 +1594,22 @@ async def autoupdate(self):
         latest = changelog.latest_version
 
         if self.version < parse_version(latest.version):
+            error = None
+            data = {}
             try:
                 # update fork if gh_token exists
                 data = await self.api.update_repository()
             except InvalidConfigError:
-                data = {}
+                pass
             except ClientResponseError as exc:
-                logger.error(f"Autoupdate failed! Status {exc.status}.")
-                logger.error(f"Message: {exc.message}")
-                self.autoupdate.cancel()
-                return
+                error = exc
             if self.hosting_method == HostingMethod.HEROKU:
+                if error is not None:
+                    logger.error(f"Autoupdate failed! Status: {error.status}.")
+                    logger.error(f"Error message: {error.message}")
+                    self.autoupdate.cancel()
+                    return
+
                 commit_data = data.get("data")
                 if not commit_data:
                     return
@@ -1681,15 +1686,18 @@ async def before_autoupdate(self):
         if self.config.get("disable_autoupdates"):
             logger.warning("Autoupdates disabled.")
             self.autoupdate.cancel()
+            return
 
         if self.hosting_method == HostingMethod.DOCKER:
             logger.warning("Autoupdates disabled as using Docker.")
             self.autoupdate.cancel()
+            return
 
         if not self.config.get("github_token") and self.hosting_method == HostingMethod.HEROKU:
             logger.warning("GitHub access token not found.")
             logger.warning("Autoupdates disabled.")
             self.autoupdate.cancel()
+            return
 
     def format_channel_name(self, author, exclude_channel=None, force_null=False):
         """Sanitises a username for use with text channel names

cogs/utility.py

@@ -1951,20 +1951,24 @@ async def update(self, ctx, *, flag: str = ""):
                 embed.set_author(name=user["username"], icon_url=user["avatar_url"], url=user["url"])
             await ctx.send(embed=embed)
         else:
+            error = None
+            data = {}
             try:
                 # update fork if gh_token exists
                 data = await self.bot.api.update_repository()
             except InvalidConfigError:
-                data = {}
+                pass
             except ClientResponseError as exc:
-                embed = discord.Embed(
-                    title="Update failed",
-                    description=f"Error status {exc.status}. {exc.message}",
-                    color=self.bot.error_color,
-                )
-                return await ctx.send(embed=embed)
+                error = exc
 
             if self.bot.hosting_method == HostingMethod.HEROKU:
+                if error is not None:
+                    embed = discord.Embed(
+                        title="Update failed",
+                        description=f"Error status: {error.status}.\nError message: {error.message}",
+                        color=self.bot.error_color,
+                    )
+                    return await ctx.send(embed=embed)
                 if not data:
                     # invalid gh_token
                     embed = discord.Embed(

core/clients.py

@@ -130,10 +130,18 @@ async def request(
                     await resp.read()
                 return resp
 
-            try:
-                return await resp.json()
-            except (JSONDecodeError, ClientResponseError):
-                return await resp.text()
+            return await self._get_response_data(resp)
+
+    @staticmethod
+    async def _get_response_data(response: ClientResponse) -> Union[Dict[str, Any], str]:
+        """
+        Internal method to convert the response data to `dict` if the data is a
+        json object, or to `str` (raw response) if the data is not a valid json.
+        """
+        try:
+            return await response.json()
+        except (JSONDecodeError, ClientResponseError):
+            return await response.text()
 
     def filter_valid(self, data) -> Dict[str, Any]:
         """
@@ -198,14 +206,20 @@ async def update_repository(self, sha: str = None) -> Dict[str, Any]:
         # source https://docs.github.com/en/rest/branches/branches#merge-a-branch
 
         status = resp.status
+        data = await self._get_response_data(resp)
         if status in (201, 204):
-            try:
-                return await resp.json()
-            except (JSONDecodeError, ClientResponseError):
-                return await resp.text()
+            return data
 
         args = (resp.request_info, resp.history)
-        kwargs = {"status": status, "message": status_map.get(status)}
+        try:
+            # try to get the response error message if any
+            message = data.get("message")
+        except AttributeError:
+            message = None
+        kwargs = {
+            "status": status,
+            "message": message if message else status_map.get(status),
+        }
         # just raise
         raise ClientResponseError(*args, **kwargs)