use jump_url

Author: fourjr

bot.py

@@ -36,13 +36,12 @@
 from discord.ext.commands.view import StringView
 from colorama import init, Fore, Style
 
-init()
-
 from core.api import Github, ModmailApiClient
 from core.thread import ThreadManager
 from core.config import ConfigManager
 
 
+init()
 
 line = Fore.BLACK + Style.BRIGHT + '-------------------------' + Style.RESET_ALL
 
@@ -60,7 +59,7 @@ def __init__(self):
         self.data_task = self.loop.create_task(self.data_loop())
         self.autoupdate_task = self.loop.create_task(self.autoupdate_loop())
         self._add_commands()
-    
+
     def _add_commands(self):
         """Adds commands automatically"""
         self.remove_command('help')
@@ -151,7 +150,6 @@ async def on_connect(self):
         status = self.config.get('status')
         if status:
             await self.change_presence(activity=discord.Game(status))
-        
 
     async def on_ready(self):
         """Bot startup, sets uptime."""
@@ -227,7 +225,7 @@ async def get_context(self, message, *, cls=commands.Context):
         return ctx
 
     async def on_message(self, message):
-        if message.type == discord.MessageType.pins_add and message.author == self.user: 
+        if message.type == discord.MessageType.pins_add and message.author == self.user:
             await message.delete()
         if message.author.bot:
             return
@@ -246,7 +244,7 @@ async def on_message(self, message):
     async def on_message_delete(self, message):
         """Support for deleting linked messages"""
         if message.embeds and not isinstance(message.channel, discord.DMChannel):
-            matches = re.findall(r'\d+', str(message.embeds[0].author.url))
+            matches = int(str(message.embeds[0].author.url).split('/')[-1])
             if matches:
                 thread = await self.threads.find(channel=message.channel)
 
@@ -256,7 +254,7 @@ async def on_message_delete(self, message):
                 async for msg in channel.history():
                     if msg.embeds and msg.embeds[0].author:
                         url = msg.embeds[0].author.url
-                        if message_id == re.findall(r'\d+', url)[0]:
+                        if message_id == url.split('/')[-1]:
                             return await msg.delete()
 
     async def on_message_edit(self, before, after):
@@ -267,8 +265,8 @@ async def on_message_edit(self, before, after):
             async for msg in thread.channel.history():
                 if msg.embeds:
                     embed = msg.embeds[0]
-                    matches = re.findall(r'\d+', str(embed.author.url))
-                    if matches and int(matches[0]) == before.id:
+                    matches = embed.author.url.split('/')
+                    if matches and int(matches[-1]) == before.id:
                         if ' - (Edited)' not in embed.footer.text:
                             embed.set_footer(text=embed.footer.text + ' - (Edited)')
                         embed.description = after.content
@@ -295,9 +293,9 @@ def overwrites(self, ctx):
         return overwrites
 
     async def validate_api_token(self):
-        valid = True 
+        valid = True
         try:
-            token = self.config.modmail_api_token
+            self.config.modmail_api_token
         except KeyError:
             print('MODMAIL_API_TOKEN not found.')
             print('Set a config variable called MODMAIL_API_TOKEN with a token from https://dashboard.modmail.tk')
@@ -311,7 +309,7 @@ async def validate_api_token(self):
                 await self.logout()
             else:
                 print(Style.RESET_ALL + Fore.CYAN + 'Validated API token.' + Style.RESET_ALL)
-        
+
     async def data_loop(self):
         await self.wait_until_ready()
 

cogs/modmail.py

@@ -3,7 +3,6 @@
 from discord.ext import commands
 import datetime
 import dateutil.parser
-import re
 from typing import Optional, Union
 from core.decorators import trigger_typing
 from core.paginator import PaginatorSession
@@ -255,11 +254,11 @@ async def edit(self, ctx, message_id: Optional[int]=None, *, new_message):
                 em = msg.embeds[0]
                 if 'Moderator' not in str(em.footer.text):
                     continue
-                linked_message_id = int(re.findall(r'\d+', em.author.url)[0])
+                linked_message_id = int(em.author.url.split('/')[-1])
                 break
             elif message_id and msg.id == message_id:
                 url = msg.embeds[0].author.url
-                linked_message_id = int(re.findall(r'\d+', url)[0])
+                linked_message_id = int(url.split('/')[-1])
                 break
 
         if not linked_message_id:

core/api.py

@@ -41,11 +41,11 @@ def __init__(self, bot):
             self.headers = {
                 'Authorization': 'Bearer ' + self.token
             }
-    
+
     async def validate_token(self):
         resp = await self.request(self.base + '/token/verify', return_response=True)
         return resp.status == 200
-    
+
     def post_metadata(self, data):
         return self.request(self.metadata, method='POST', payload=data)
 

core/config.py

@@ -1,4 +1,3 @@
-import asyncio
 import os
 import json
 import box
@@ -8,15 +7,13 @@ class ConfigManager:
     """Class that manages a cached configuration"""
 
     valid_keys = {
-        'prefix', 'status', 'guild_id', 
-        'mention', 'disable_autoupdates', 
-        'modmail_guild_id', 'token', 'snippets', 
+        'prefix', 'status', 'guild_id',
+        'mention', 'disable_autoupdates',
+        'modmail_guild_id', 'token', 'snippets',
         'aliases', 'owners', 'modmail_api_token'
-        }
-    
-    
-    allowed_to_change_in_command = valid_keys - {'token', 'snippets', 'aliases', 'owners', 'modmail_api_token'}
+    }
 
+    allowed_to_change_in_command = valid_keys - {'token', 'snippets', 'aliases', 'owners', 'modmail_api_token'}
 
     def __init__(self, bot):
         self.bot = bot

core/decorators.py

@@ -3,13 +3,15 @@
 from discord.ext import commands
 import asyncio
 
+
 def trigger_typing(func):
     @functools.wraps(func)
     async def wrapper(self, ctx, *args, **kwargs):
         await ctx.trigger_typing()
         return await func(self, ctx, *args, **kwargs)
     return wrapper
 
+
 def auth_required(func):
     @functools.wraps(func)
     async def wrapper(self, ctx, *args, **kwargs):
@@ -19,22 +21,25 @@ async def wrapper(self, ctx, *args, **kwargs):
             color=discord.Color.red(),
             title='Unauthorized',
             description='You can only use this command if you have a configured `MODMAIL_API_TOKEN`. Get your token from https://dashboard.modmail.tk'
-            )
+        )
         await ctx.send(embed=em)
-    return wrapper 
+    return wrapper
+
 
 def owner_only():
     async def predicate(ctx):
         allowed = [int(x) for x in str(ctx.bot.config.get('owners', '0')).split(',')]
         return ctx.author.id in allowed
     return commands.check(predicate)
 
+
 def asyncexecutor(loop=None, executor=None):
     loop = loop or asyncio.get_event_loop()
+
     def decorator(func):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             partial = functools.partial(func, *args, **kwargs)
             return loop.run_in_executor(executor, partial)
         return wrapper
-    return decorator
+    return decorator

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(r'\d+', embed.author.url)[0]):
+                if message_id == int(embed.author.url.split('/')[-1]):
                     if ' - (Edited)' not in embed.footer.text:
                         embed.set_footer(text=embed.footer.text + ' - (Edited)')
                     embed.description = message
@@ -90,7 +90,7 @@ async def send(self, message, destination=None, from_mod=False, delete_message=T
             timestamp=message.created_at
         )
 
-        em.set_author(name=str(author), icon_url=author.avatar_url, url=f'https://{message.id}.id')  # store message id in hidden url
+        em.set_author(name=str(author), icon_url=author.avatar_url, url=message.jump_url)  # store message id in hidden url
 
         image_types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
         is_image_url = lambda u: any(urlparse(u.lower()).path.endswith(x) for x in image_types)
@@ -176,7 +176,7 @@ async def _find_from_channel(self, channel):
 
         if channel.topic and 'User ID: ' in channel.topic:
             user_id = int(re.findall(r'\d+', channel.topic)[0])
-        
+
         # BUG: This wont work with multiple categories.
         # elif channel.topic is None:
         #     async for message in channel.history(limit=50):