Merge branch 'modmail-api' of https://github.com/verixx/modmail into modmail-api

Author: kyb3r

core/api.py

@@ -1,21 +1,20 @@
 import discord
-import secrets
 
-from hashlib import sha256
 
 class ApiClient:
     def __init__(self, app):
-        self.app = 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):
     commit_url = 'https://api.github.com/repos/kyb3r/modmail/commits'
 
@@ -39,13 +38,13 @@ def __init__(self, bot):
             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')
-    
+
     def get_metadata(self):
         return self.request(self.base + '/metadata')
 
@@ -54,10 +53,10 @@ def get_user_logs(self, user_id):
 
     def get_log(self, channel_id):
         return self.request(self.logs + '/' + str(channel_id))
-    
+
     def get_config(self):
         return self.request(self.config)
-    
+
     def update_config(self, data):
         valid_keys = ['prefix', 'status', 'guild_id', 'mention', 'snippets', 'aliases', 'autoupdates', 'modmail_guild_id']
         data = {k: v for k, v in data.items() if k in valid_keys}

core/paginator.py

@@ -1,8 +1,6 @@
 import discord
-from discord.ext import commands
-from collections import OrderedDict
 import asyncio
-import inspect
+
 
 class PaginatorSession:
     """
@@ -39,16 +37,15 @@ def __init__(self, ctx, *embeds, **options):
             '▶': self.next_page,
             '⏭': self.last_page,
             # '⏹': self.close
-            }
-            
+        }
+
         if options.get('edit_footer', True) and len(self.embeds) > 1:
             for i, em in enumerate(self.embeds):
                 footer_text = f'Page {i+1} of {len(self.embeds)}'
                 if em.footer.text:
                     footer_text = footer_text + ' • ' + em.footer.text
                 em.set_footer(text=footer_text, icon_url=em.footer.icon_url)
 
-
     def add_page(self, embed):
         if isinstance(embed, discord.Embed):
             self.embeds.append(embed)
@@ -60,7 +57,7 @@ async def create_base(self, embed):
 
         if len(self.embeds) == 1:
             self.running = False
-            return 
+            return
 
         self.running = True
         for reaction in self.reaction_map.keys():
@@ -99,15 +96,14 @@ async def run(self):
                 await self.base.remove_reaction(reaction, user)
             except:
                 pass
-            
-            
+
     def previous_page(self):
         """Go to the previous page."""
-        return self.show_page(self.current-1)
+        return self.show_page(self.current - 1)
 
     def next_page(self):
         """Go to the next page"""
-        return self.show_page(self.current+1)
+        return self.show_page(self.current + 1)
 
     async def close(self, delete=True):
         """Delete this embed."""
@@ -120,7 +116,7 @@ async def close(self, delete=True):
 
         if delete:
             return await self.base.delete()
-            
+
         try:
             await self.base.clear_reactions()
         except:
@@ -132,4 +128,4 @@ def first_page(self):
 
     def last_page(self):
         """Go to immediately to the last page"""
-        return self.show_page(len(self.embeds)-1)
+        return self.show_page(len(self.embeds) - 1)

core/thread.py

@@ -50,7 +50,7 @@ async def _edit_thread_message(self, channel, message_id, message):
                 continue
             embed = msg.embeds[0]
             if embed and embed.author:
-                if message_id == int(re.findall('\d+', embed.author.url)[0]):
+                if message_id == int(re.findall(r'\d+', embed.author.url)[0]):
                     if ' - (Edited)' not in embed.footer.text:
                         embed.set_footer(text=embed.footer.text + ' - (Edited)')
                     embed.description = message