Add github commands

Author: kyb3r

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 '''
 
-__version__ = '1.5.0'
+__version__ = '1.4.8'
 
 from contextlib import redirect_stdout
 from urllib.parse import urlparse
@@ -44,7 +44,7 @@
 import aiohttp
 
 from utils.paginator import PaginatorSession
-from utils.github import Github
+from utils.api import Github, ModmailApiClient
 
 
 class Modmail(commands.Bot):
@@ -325,6 +325,76 @@ async def about(self, ctx):
 
         await ctx.send(embed=em)
 
+    @commands.group(invoke_without_subcommand=True)
+    async def github(self, ctx):
+        if ctx.invoked_subcommand:
+            return
+
+        client = ModmailApiClient(self)
+        data = await client.get_user_info()
+
+        prefix = self.config.get('PREFIX', 'm.')
+
+        em = discord.Embed(
+            title='Github',
+            color=discord.Color.red(),
+            description=f'Not logged in, do `{prefix}github login` to login with GitHub.'
+            )
+
+        if not data['error']:
+            user = data['user']
+            em.color = discord.Color.green()
+            em.description = f"Currently logged in."
+            em.set_author(name=user['username'], icon_url=user['avatar_url'], url=user['url'])
+            em.set_thumbnail(url=user['avatar_url'])
+            await ctx.send(embed=em)
+        else:
+            await ctx.send(embed=em)
+    
+    @github.command(name='login')
+    async def _login(self, ctx):
+        client = ModmailApiClient(self)
+
+        oauth_url = 'https://github.com/login/oauth/authorize?client_id' \
+                    '=e54e4ff0f234ee9f22aa&scope=public_repo&redirect_uri=' \
+                    'https://api.kybr.tk/modmail/github/callback' \
+                   f'?token={client.token}'
+
+        em = discord.Embed(
+            color=discord.Color.green(),
+            title='Login with GitHub',
+            description='In order to use the update command, you need ' \
+            'to have fork the [repo](https://github.com/kyb3r/modmail) and ' \
+            'login with GitHub so that we can update your fork to ' \
+            'match the main repository whenever there is an update.' \
+            'Click the link below to be taken to log in with github to authorize Modmail.'
+        )
+        em.set_thumbnail(url='https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png')
+
+        em.add_field(name='Login', value=f'[Click Here]({oauth_url})', inline=False)
+        em.add_field(name='Warning', value='Dont share this link as it contains sensitive information.')
+        await ctx.author.send(embed=em)
+    
+    @github.command(name='logout')
+    async def _logout(self, ctx):
+        client = ModmailApiClient(self)
+        data = await client.logout()
+
+        em = discord.Embed(
+            color=discord.Color.green(),
+            title='Logged out',
+            description='Successfully logged out.'
+            )
+
+        if data['error']:
+            em.color = discord.Color.red()
+            em.title = 'Error'
+            em.description = 'You are not logged in already.'
+        
+        await ctx.send(embed=em)
+
+            
+
 
     @commands.command()
     async def update(self, ctx):
@@ -334,65 +404,44 @@ async def update(self, ctx):
         if ctx.author.id not in allowed:
             return
 
-        async with self.session.get('https://api.kybr.tk/modmail') as resp:
-            data = await resp.json()
+        client = ModmailApiClient(self)
+
+        metadata = await client.get_metadata()
 
         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()
         )
 
-        oauth_url = f'https://github.com/login/oauth/authorize?client_id=e54e4ff0f234ee9f22aa&scope=public_repo&redirect_uri=https://api.kybr.tk/modmail/github/callback?user_id={self.user.id}'
-
-        if data['latest_version'] == __version__:
-            async with self.session.get(f'https://api.kybr.tk/modmail/github/user/{self.user.id}') as resp:
-                if resp.status == 403:
-                    em.title = 'Unauthorised'
-                    em.description = 'You have not authorised modmail. '\
-                                     'Ask the user who setup modmail to go '\
-                                     f'to [this]({oauth_url}) url to authorise the '\
-                                     'bot. Come back for the command later.'
-
-                    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}')
-                em.set_author(name=new_commit['user']['username'], icon_url=new_commit['user']['avatar_url'], url=new_commit['user']['url'])
-
-        if data['latest_version'] != __version__:
-            async with self.session.get(f'https://api.kybr.tk/modmail/github/pull/{self.user.id}') as resp:
-                if resp.status == 403:
-                    em.title = 'Unauthorised'
-                    em.description = 'You have not authorised modmail. '\
-                                     'Ask the user who setup modmail to go '\
-                                     f'to [this]({oauth_url}) url to authorise the '\
-                                     'bot. Come back for the command later.'
-
-                    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}')
-
-            em.set_footer(text=f"Updating modmail v{__version__} -> v{data['latest_version']}")
+        if metadata['latest_version'] == __version__:
+            data = await client.get_user_info()
+            if not data['error']:
+                user = data['user']
+                em.set_author(name=user['username'], icon_url=user['avatar_url'], url=user['url'])
+
+        if metadata['latest_version'] != __version__:
+            data = await client.update_repository()
+
+            if data['error']:
+                prefix = self.config.get('PREFIX', 'm.')
+                em.title = 'Unauthorised'
+                em.description = f"You haven't logged in with github yet. Type the command `{prefix}github login` to authorize this bot."
+                em.color = discord.Color.red()
+                return await ctx.send(embed=em)
 
+            commit_data = data['data']
+            user = data['user']
             em.title = 'Success'
-            em.set_author(name=new_commit['user']['username'], icon_url=new_commit['user']['avatar_url'], url=new_commit['user']['url'])
+            em.set_author(name=user['username'], icon_url=user['avatar_url'], url=user['url'])
+            em.set_footer(text=f"Updating modmail v{__version__} -> v{metadata['latest_version']}")  
 
             if commit_data:
                 em.description = 'Bot successfully updated, the bot will restart momentarily'
                 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} - {new_commit['user']['username']}")
+                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.'
 

utils/github.py utils/api.pyutils/github.py renamed to utils/api.py

@@ -1,19 +1,42 @@
-class Github:
+from hashlib import sha256
+
+class ApiClient:
+    def __init__(self, app):
+        self.app = app 
+        self.session = app.session
+        self.headers = None
+    
+    async def request(self, url, method='GET', payload=None):
+        async with self.session.request(method, url, headers=self.headers, json=payload) as resp:
+            try:
+                return await resp.json()
+            except:
+                return await resp.text()
+    
+
+class Github(ApiClient):
     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, app, access_token=None, username=None):
-        self.app = app
-        self.session = app.session
-        self.access_token = access_token
-        self.username = username
+    def __init__(self, app, access_token=None):
+        super().__init__(app)
+        self.username = None
         self.avatar_url = None
         self.url = None
         self.headers = None
-        if self.access_token:
+        if access_token:
             self.headers = {'Authorization': 'token ' + str(access_token)}
 
+    @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
+
     async def get_latest_commits(self, limit=3):
         resp = await self.request(self.commit_url)
         for index in range(limit):
@@ -36,18 +59,26 @@ async def update_repository(self, sha=None):
         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:
-            try:
-                return await resp.json()
-            except:
-                return await resp.text()
+class ModmailApiClient(ApiClient):
 
-    @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
+    base = 'https://api.kybr.tk/modmail'
+    github = base + '/github'
+
+    def __init__(self, bot):
+        super().__init__(bot)
+        self.token = str(sha256(bot.token.encode()).hexdigest()) # added security
+        self.headers = {
+            'Authorization': 'Bearer ' + self.token
+        }
+    
+    def get_user_info(self):
+        return self.request(self.github + '/userinfo')
+    
+    def update_repository(self):
+        return self.request(self.github + '/update-repository')
+    
+    def logout(self):
+        return self.request(self.github + '/logout')
+    
+    def get_metadata(self):
+        return self.request(self.base)