Changed the brute forced "obj" converter and moved lambda-ike functions into utils.py

Author: Taaku18

cogs/modmail.py

@@ -9,6 +9,7 @@
 from core.decorators import trigger_typing
 from core.paginator import PaginatorSession
 from core.time import UserFriendlyTime, human_timedelta
+from core.utils import User, truncate
 
 
 class Modmail:
@@ -17,9 +18,6 @@ class Modmail:
     def __init__(self, bot):
         self.bot = bot
 
-    def obj(arg):
-        return discord.Object(int(arg))
-
     @commands.command()
     @trigger_typing
     @commands.has_permissions(administrator=True)
@@ -342,10 +340,8 @@ async def nsfw(self, ctx):
     @commands.command(aliases=['threads'])
     @commands.has_permissions(manage_messages=True)
     @trigger_typing
-    async def logs(self, ctx, *,
-                   member: Union[discord.Member, discord.User, obj] = None):
+    async def logs(self, ctx, *, member: User = None):
         """Shows a list of previous Modmail thread logs of a member."""
-        # TODO: find a better way of that Union ^
         if not member:
             thread = await self.bot.threads.find(channel=ctx.channel)
             if not thread:
@@ -397,10 +393,6 @@ async def logs(self, ctx, *,
             else:
                 log_url = self.bot.config.log_url.strip('/') + f'/logs/{key}'
 
-            # TODO: Move all the lambda-like functions to a utils.py
-            def truncate(c):
-                return c[:47].strip() + '...' if len(c) > 50 else c
-
             if entry['messages']:
                 short_desc = truncate(entry['messages'][0]['content'])
                 if not short_desc:
@@ -545,9 +537,7 @@ async def blocked(self, ctx):
     @commands.command()
     @trigger_typing
     @commands.has_permissions(manage_channels=True)
-    async def block(self, ctx,
-                    user: Union[discord.Member, discord.User, obj] = None,
-                    *, reason=None):
+    async def block(self, ctx, user: User = None, *, reason=None):
         """Block a user from using Modmail."""
 
         if user is None:
@@ -580,8 +570,7 @@ async def block(self, ctx,
     @commands.command()
     @trigger_typing
     @commands.has_permissions(manage_channels=True)
-    async def unblock(self, ctx, *,
-                      user: Union[discord.Member, discord.User, obj] = None):
+    async def unblock(self, ctx, *, user: User = None):
         """Unblocks a user from using Modmail."""
 
         if user is None:

cogs/utility.py

@@ -17,6 +17,7 @@
 from core.paginator import PaginatorSession
 from core.decorators import auth_required, owner_only, trigger_typing
 from core.changelog import ChangeLog
+from core.utils import cleanup_code
 
 
 class Utility:
@@ -599,15 +600,6 @@ async def eval_(self, ctx, *, body):
 
         env.update(globals())
 
-        def cleanup_code(content):
-            """Automatically removes code blocks from the code."""
-            # remove ```py\n```
-            if content.startswith('```') and content.endswith('```'):
-                return '\n'.join(content.split('\n')[1:-1])
-
-            # remove `foo`
-            return content.strip('` \n')
-
         body = cleanup_code(body)
         stdout = StringIO()
 

core/thread.py

@@ -10,6 +10,8 @@
 from traceback import print_exc
 
 from core.decorators import async_executor
+from core.utils import is_image_url, days
+
 from colorthief import ColorThief
 
 
@@ -270,14 +272,6 @@ async def send(self, message, destination=None,
                 url=message.jump_url
             )
 
-        image_types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
-
-        def is_image_url(u, _):
-            for x in image_types:
-                if urlparse(u.lower()).path.endswith(x):
-                    return True
-            return False
-
         delete_message = not bool(message.attachments)
 
         attachments = [(a.url, a.filename) for a in message.attachments]
@@ -521,9 +515,10 @@ async def find_or_create(self, recipient):
     @staticmethod
     def valid_image_url(url):
         """Checks if a url leads to an image."""
-        types = ['.png', '.jpg', '.gif', '.webp']
+        types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
         parsed = urlparse(url)
         if any(parsed.path.endswith(i) for i in types):
+            # TODO: Replace this logic with urlsplit/urlunsplit
             return url.replace(parsed.query, 'size=128')
         return False
 
@@ -588,11 +583,6 @@ def _format_info_embed(self, user, creator, log_url, log_count, dc):
                               description=user.mention,
                               timestamp=time)
 
-        def days(d):
-            if d == '0':
-                return '**today**'
-            return f'{d} day ago' if d == '1' else f'{d} days ago'
-
         created = str((time - user.created_at).days)
         # if not role_names:
         #     embed.add_field(name='Mention', value=user.mention)

core/utils.py

@@ -0,0 +1,47 @@
+from discord import Object
+from discord.ext import commands
+
+from urllib.parse import urlparse
+
+
+class User(commands.IDConverter):
+    async def convert(self, ctx, argument):
+        try:
+            return await commands.MemberConverter.convert(self, ctx, argument)
+        except commands.BadArgument:
+            pass
+        try:
+            return await commands.UserConverter.convert(self, ctx, argument)
+        except commands.BadArgument:
+            pass
+        match = self._get_id_match(argument)
+        if match is None:
+            raise commands.BadArgument('User "{}" not found'.format(argument))
+        return Object(int(match.group(1)))
+
+
+def truncate(c):
+    return c[:47].strip() + '...' if len(c) > 50 else c
+
+
+def is_image_url(u, _):
+    for x in {'.png', '.jpg', '.gif', '.jpeg', '.webp'}:
+        if urlparse(u.lower()).path.endswith(x):
+            return True
+    return False
+
+
+def days(d):
+    if d == '0':
+        return '**today**'
+    return f'{d} day ago' if d == '1' else f'{d} days ago'
+
+
+def cleanup_code(content):
+    """Automatically removes code blocks from the code."""
+    # remove ```py\n```
+    if content.startswith('```') and content.endswith('```'):
+        return '\n'.join(content.split('\n')[1:-1])
+
+    # remove `foo`
+    return content.strip('` \n')