Heavily improve update command

Author: kyb3r

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 '''
 
-__version__ = '1.3.9'
+__version__ = '1.4.0'
 
 from contextlib import redirect_stdout
 from urllib.parse import urlparse
@@ -319,12 +319,15 @@ async def update(self, ctx):
                 description=f'The latest version is [`{__version__}`](https://github.com/kyb3r/modmail/blob/master/bot.py#L25)',
                 color=discord.Color.green()
             )
+        
+        access_token = self.config.get('GITHUB_ACCESS_TOKEN')
 
         if data['latest_version'] == __version__:
+            if access_token:
+                user = await Github.login(self, access_token)
+                em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
             return await ctx.send(embed=em)
 
-        access_token = self.config.get('GITHUB_ACCESS_TOKEN')
-
         if not access_token:
             em.title = 'Invalid Access Token'
             em.description = 'You have not properly set up GitHub credentials. '\
@@ -337,14 +340,29 @@ async def update(self, ctx):
             return await ctx.send(embed=em)
 
         user = await Github.login(self, access_token)
-        url = await user.update_repository()
+        resp = await user.request(user.head)
+        sha, commit_url = resp['object']['sha'], resp['object']['url']
+        data = await user.update_repository(sha)
+
+        latest_update = await user.request(commit_url)
+
         em.title = 'Success'
+        em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
 
-        if url:
+        if data:
             em.description = 'Bot successfully updated, the bot will restart momentarily'
-            em.add_field(name='Commit', value=f'[Click Here]({url})')
+            message = data['commit']['message']
+            html_url = data["html_url"]
+            short_sha = data['sha'][:6]
+            em.add_field(name='Merge Commit', value=f'[`{short_sha}`]({html_url}) - {message}')
         else:
             em.description = 'Already up to date with master repository.'
+        
+
+        short_sha = latest_update['sha'][:6]
+        html_url = latest_update['html_url']
+        message = latest_update['message']
+        em.add_field(name='Latest Commit', value=f'[`{short_sha}`]({html_url}) - {message}')
 
         await ctx.send(embed=em)
 

utils/github.py

@@ -7,20 +7,26 @@ def __init__(self, bot, access_token, username=None):
         self.session = bot.session
         self.access_token = access_token
         self.username = username
+        self.avatar_url = None
+        self.url = None
         self.headers = {'Authorization': 'Bearer '+access_token}
 
-    async def update_repository(self):
-        sha = (await self.request(self.head))['object']['sha']
+    async def update_repository(self, sha=None):
+        if sha is None:
+            resp = await self.request(self.head)
+            sha = resp['object']['sha']
+
         payload = {
             'base': 'master',
             'head': sha,
             'commit_message': 'Updating bot'
         }
+        
         merge_url = self.merge_url.format(username=self.username)
 
-        r = await self.request(merge_url, method='POST', payload=payload)
-        if isinstance(r, dict):
-            return r['html_url']
+        resp = await self.request(merge_url, method='POST', payload=payload)
+        if isinstance(resp, dict):
+            return resp
 
     async def request(self, url, method='GET', payload=None):
         async with self.session.request(method, url, headers=self.headers, json=payload) as resp:
@@ -32,5 +38,8 @@ async def request(self, url, method='GET', payload=None):
     @classmethod
     async def login(cls, bot, access_token):
         self = cls(bot, access_token)
-        self.username = (await self.request('https://api.github.com/user'))['login']
+        resp = await self.request('https://api.github.com/user')
+        self.username = resp['login']
+        self.avatar_url = resp['avatar_url']
+        self.url = resp['html_url']
         return self