Show latest updates even without access_token

Author: kyb3r

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 '''
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 from contextlib import redirect_stdout
 from urllib.parse import urlparse
@@ -122,7 +122,6 @@ async def on_ready(self):
         ---------------
         '''))
 
-
     async def on_message(self, message):
         if message.author.bot:
             return
@@ -326,43 +325,47 @@ async def update(self, ctx):
             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)
+        
+        latest_commits = ''
 
-        if not access_token:
-            em.title = 'Invalid Access Token'
-            em.description = 'You have not properly set up GitHub credentials. '\
-                             'Create a config variable named `GITHUB_ACCESS_TOKEN`'\
-                             ' and set the value as your personal access token which'\
-                             ' can be generated in your GitHub account\'s [developer '\
-                             'settings](https://github.com/settings/tokens).'
+        async for commit in Github(self).get_latest_commits():
 
-            em.color = discord.Color.red()
-            return await ctx.send(embed=em)
-        
-        user = await Github.login(self, access_token)
-        resp = await user.request(user.head)
-        sha, commit_url = resp['object']['sha'], resp['object']['url']
-        data = await user.update_repository(sha)
+            short_sha = commit['sha'][:6]
+            html_url = commit['html_url']
+            message = commit['commit']['message']
+            author_name = commit['author']['login']
+            author_url = commit['author']['html_url']
 
-        latest_update = await user.request(commit_url)
+            latest_commits += f'[`{short_sha}`]({html_url}) {message} - [`{author_name}`]({author_url})\n'
 
-        em.title = 'Success'
-        em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
-        
-        if data:
-            em.description = 'Bot successfully updated, the bot will restart momentarily'
-            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}', inline=False)
+        if data['latest_version'] != __version__:
+            if not access_token:
+                em.title = 'Invalid Access Token'
+                em.description = 'You have not properly set up GitHub credentials. '\
+                                'Create a config variable named `GITHUB_ACCESS_TOKEN`'\
+                                ' and set the value as your personal access token which'\
+                                ' can be generated in your GitHub account\'s [developer '\
+                                'settings](https://github.com/settings/tokens).'
+
+                em.color = discord.Color.red()
+                return await ctx.send(embed=em)
+            user = await Github.login(self, access_token)
+            data = await user.update_repository()
+
+            em.title = 'Success'
+            em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
+            
+            if data:
+                em.description = 'Bot successfully updated, the bot will restart momentarily'
+                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} - [`{user.name}`]({user.url})')
+            else:
+                em.description = 'Already up to date with master repository.'
+
+        em.add_field(name='Latest Updates', value=latest_commits, inline=False)
 
         await ctx.send(embed=em)
 

utils/github.py

@@ -1,15 +1,24 @@
 class Github:
     head = 'https://api.github.com/repos/kyb3r/modmail/git/refs/heads/master'
     merge_url = 'https://api.github.com/repos/{username}/modmail/merges'
+    commit_url = 'https://api.github.com/repos/kyb3r/modmail/commits'
 
-    def __init__(self, bot, access_token, username=None):
+    def __init__(self, bot, access_token=None, username=None):
         self.bot = bot
         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}
+        self.headers = None
+        if self.access_token:
+            self.headers = {'Authorization': 'Bearer '+ str(access_token)}
+    
+    async def get_latest_commits(self, limit=3):
+        resp = await self.request(self.commit_url)
+        print(resp)
+        for index in range(limit):
+            yield resp[index]
 
     async def update_repository(self, sha=None):
         if sha is None:
@@ -21,7 +30,7 @@ async def update_repository(self, sha=None):
             'head': sha,
             'commit_message': 'Updating bot'
         }
-        
+
         merge_url = self.merge_url.format(username=self.username)
 
         resp = await self.request(merge_url, method='POST', payload=payload)