Oauth - 1.5.0

Author: fourjr

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 '''
 
-__version__ = '1.4.6'
+__version__ = '1.5.0'
 
 from contextlib import redirect_stdout
 from urllib.parse import urlparse
@@ -47,7 +47,6 @@
 from utils.github import Github
 
 
-
 class Modmail(commands.Bot):
 
     def __init__(self):
@@ -237,7 +236,7 @@ async def data_loop(self):
                 "version": __version__
             }
 
-            resp = await self.session.post('https://api.kybr.tk/modmail', json=data)
+            await self.session.post('https://api.kybr.tk/modmail', json=data)
 
             await asyncio.sleep(3600)
 
@@ -250,7 +249,6 @@ async def get_latest_updates(self, limit=3):
             html_url = commit['html_url']
             message = commit['commit']['message']
             author_name = commit['author']['login']
-            author_url = commit['author']['html_url']
 
             latest_commits += f'[`{short_sha}`]({html_url}) {message} - {author_name}\n'
 
@@ -294,8 +292,7 @@ async def about(self, ctx):
         em.description = 'This is an open source discord bot made by kyb3r and '\
                          'improved upon suggestions by the users! This bot serves as a means for members to '\
                          'easily communicate with server leadership in an organised manner.'
-        
-        
+
         try:
             async with self.session.get('https://api.kybr.tk/modmail') as resp:
                 meta = await resp.json()
@@ -334,18 +331,18 @@ async def update(self, ctx):
         '''Updates the bot, this only works with heroku users.'''
         allowed = [int(x) for x in self.config.get('OWNERS', '').split(',')]
 
-        if ctx.author.id not in allowed: 
+        if ctx.author.id not in allowed:
             return
 
         async with self.session.get('https://api.kybr.tk/modmail') as resp:
             data = await resp.json()
-        
+
         em = discord.Embed(
                 title='Already up to date',
                 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__:
@@ -354,36 +351,40 @@ async def update(self, ctx):
                 em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
 
         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)
-            
-            em.set_footer(text=f"Updating modmail v{__version__} -> v{data['latest_version']}")
+            async with self.session.get(f'http://localhost:8000/api/modmail/githubcheck/{ctx.author.id}') as resp:
+                if resp.status == 403:
+                    em.title = 'Unauthorised'
+                    em.description = 'You have not authorised modmail. '\
+                                     'Go to [this]'\
+                                     f'(https://github.com/login/oauth/authorize?client_id=e54e4ff0f234ee9f22aa&scope=public_repo&redirect_uri=http://localhost:8000/api/modmail/github?user_id={ctx.author.id})'\
+                                     ' url to update the bot. In the future, '\
+                                     'the command will work without the url.'
+
+                    em.color = discord.Color.red()
+                    return await ctx.send(embed=em)
+                elif resp.status == 200:
+                    # updated!
+                    new_commit = await resp.json()
+                    commit_data = new_commit['data']
+                else:
+                    raise NotImplementedError(f'Server returned {resp.status}')
 
-            user = await Github.login(self, access_token)
-            data = await user.update_repository()
+            em.set_footer(text=f"Updating modmail v{__version__} -> v{data['latest_version']}")
 
             em.title = 'Success'
-            em.set_author(name=user.username, icon_url=user.avatar_url, url=user.url)
-            
-            if data:
+            em.set_author(name=new_commit['user']['username'], icon_url=new_commit['user']['avatar_url'], url=new_commit['user']['url'])
+
+            if commit_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]
+                message = commit_data['commit']['message']
+                html_url = commit_data["html_url"]
+                short_sha = commit_data['sha'][:6]
                 em.add_field(name='Merge Commit', value=f'[`{short_sha}`]({html_url}) {message} - {user.username}')
             else:
                 em.description = 'Already up to date with master repository.'
-        
+
         em.add_field(name='Latest Commit', value=await self.get_latest_updates(limit=1), inline=False)
-            
+
         await ctx.send(embed=em)
 
     @commands.command()

config.json

@@ -1,6 +1,7 @@
 {
-  "TOKEN": null,
-  "PREFIX": null,
-  "GUILD_ID": null,
-  "STATUS": null
-}
+  "TOKEN": "NDAzNzE1OTMyMTIxMzMzNzYw.DvzrRQ.D-UzEUeZx52-7V9zHQ7wrz1TnGw",
+  "PREFIX": "dev.",
+  "GUILD_ID": 522924682698293281,
+  "STATUS": "DM ganugajgnag",
+  "OWNERS": "325012556940836864,180314310298304512"
+}

utils/github.py

@@ -3,22 +3,22 @@ class Github:
     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=None, username=None):
-        self.bot = bot
-        self.session = bot.session
+    def __init__(self, app, access_token=None, username=None):
+        self.app = app
+        self.session = app.session
         self.access_token = access_token
         self.username = username
         self.avatar_url = None
         self.url = None
         self.headers = None
         if self.access_token:
-            self.headers = {'Authorization': 'Bearer '+ str(access_token)}
-    
+            self.headers = {'Authorization': 'token ' + str(access_token)}
+
     async def get_latest_commits(self, limit=3):
         resp = await self.request(self.commit_url)
         for index in range(limit):
             yield resp[index]
-    
+
     async def update_repository(self, sha=None):
         if sha is None:
             resp = await self.request(self.head)
@@ -42,12 +42,12 @@ async def request(self, url, method='GET', payload=None):
                 return await resp.json()
             except:
                 return await resp.text()
-    
+
     @classmethod
     async def login(cls, bot, access_token):
         self = cls(bot, access_token)
         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
+        return self