Fix a bug in update related commands

Author: fourjr

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
-# v3.7.0-dev17
+# v3.7.0-dev18
 
 ### Added
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.7.0-dev17"
+__version__ = "3.7.0-dev18"
 
 
 import asyncio

cogs/utility.py

@@ -1835,13 +1835,18 @@ async def github(self, ctx):
         """Shows the GitHub user your Github_Token is linked to."""
         data = await self.bot.api.get_user_info()
 
-        embed = discord.Embed(
-            title="GitHub", description="Current User", color=self.bot.main_color
-        )
-        user = data["user"]
-        embed.set_author(name=user["username"], icon_url=user["avatar_url"], url=user["url"])
-        embed.set_thumbnail(url=user["avatar_url"])
-        await ctx.send(embed=embed)
+        if data:
+            embed = discord.Embed(
+                title="GitHub", description="Current User", color=self.bot.main_color
+            )
+            user = data["user"]
+            embed.set_author(name=user["username"], icon_url=user["avatar_url"], url=user["url"])
+            embed.set_thumbnail(url=user["avatar_url"])
+            await ctx.send(embed=embed)
+        else:
+            await ctx.send(embed=discord.Embed(
+                title="Invalid Github Token", color=self.bot.error_color
+            ))
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -1869,7 +1874,7 @@ async def update(self, ctx, *, flag: str = ""):
             )
 
             data = await self.bot.api.get_user_info()
-            if not data.get("error"):
+            if data:
                 user = data["user"]
                 embed.set_author(
                     name=user["username"], icon_url=user["avatar_url"], url=user["url"]

core/clients.py

@@ -11,7 +11,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo.errors import ConfigurationError
 
-from core.models import getLogger
+from core.models import InvalidConfigError, getLogger
 
 logger = getLogger(__name__)
 
@@ -201,11 +201,15 @@ async def login(cls, bot) -> "GitHub":
         """
         self = cls(bot, bot.config.get("github_token"))
         resp: dict = await self.request("https://api.github.com/user")
-        self.username = resp["login"]
-        self.avatar_url = resp["avatar_url"]
-        self.url = resp["html_url"]
-        logger.info(f"GitHub logged in to: {self.username}")
-        return self
+        if resp.get("login"):
+            self.username = resp["login"]
+            self.avatar_url = resp["avatar_url"]
+            self.url = resp["html_url"]
+            logger.info(f"GitHub logged in to: {self.username}")
+            return self
+        else:
+            raise InvalidConfigError("Invalid github token")
+
 
 
 class ApiClient:
@@ -654,10 +658,14 @@ async def update_repository(self) -> dict:
         }
 
     async def get_user_info(self) -> dict:
-        user = await GitHub.login(self.bot)
-        return {
-            "user": {"username": user.username, "avatar_url": user.avatar_url, "url": user.url,}
-        }
+        try:
+            user = await GitHub.login(self.bot)
+        except InvalidConfigError:
+            return None
+        else:
+            return {
+                "user": {"username": user.username, "avatar_url": user.avatar_url, "url": user.url,}
+            }
 
 
 class PluginDatabaseClient: