Resolved more TODO's

Author: Taaku18

bot.py

@@ -30,7 +30,7 @@
 from discord.ext.commands.view import StringView
 
 from os import listdir
-from asyncio import sleep, Event
+import asyncio
 from textwrap import dedent
 from datetime import datetime
 from types import SimpleNamespace
@@ -62,7 +62,7 @@ def __init__(self):
         self._threads = None
         self._session = None
         self._config = None
-        self._connected = Event()
+        self._connected = asyncio.Event()
         self._db = None
 
         if self.self_hosted:
@@ -570,7 +570,7 @@ async def data_loop(self):
             }
 
             await self.api.post_metadata(data)
-            await sleep(3600)
+            await asyncio.sleep(3600)
 
     async def autoupdate_loop(self):
         await self.wait_until_ready()
@@ -619,7 +619,7 @@ async def autoupdate_loop(self):
                     channel = self.log_channel
                     await channel.send(embed=embed)
 
-            await sleep(3600)
+            await asyncio.sleep(3600)
 
     async def get_latest_updates(self, limit=3):
         latest_commits = ''

core/paginator.py

@@ -40,7 +40,6 @@ def __init__(self, ctx: commands.Context, *embeds, **options):
             '▶': self.next_page,
             '⏭': self.last_page,
             # '⏹': self.close
-            # TODO: implement self.close
         }
 
         if options.get('edit_footer', True) and len(self.embeds) > 1:

core/thread.py

@@ -1,17 +1,16 @@
 import discord
-from discord.ext.commands import UserInputError
+from discord.ext.commands import UserInputError, CommandError
 
 import re
 import string
 import asyncio
 import typing
 from io import BytesIO
-from urllib.parse import urlparse
 from datetime import datetime, timedelta
 from traceback import print_exc
 
 from core.decorators import async_executor
-from core.utils import is_image_url, days
+from core.utils import is_image_url, days, match_user_id, parse_image_url
 from core.objects import Bot, ThreadManagerABC, ThreadABC
 
 from colorthief import ColorThief
@@ -24,10 +23,12 @@ def __init__(self, manager: 'ThreadManager',
                  recipient: typing.Union[discord.Member, discord.User],
                  channel: typing.Union[discord.DMChannel,
                                        discord.TextChannel]):
+        if recipient.bot:
+            raise CommandError('Recipient cannot be a bot.')
+
         self.manager = manager
         self.bot = manager.bot
         self._id = recipient.id
-        # TODO: recipient should not be bot
         self._recipient = recipient
         self._channel = channel
         self._ready_event = asyncio.Event()
@@ -465,21 +466,19 @@ async def _find_from_channel(self, channel):
         """
         user_id = None
 
-        if channel.topic and 'User ID: ' in channel.topic:
-            user_id = int(re.findall(r'\d+', channel.topic)[0])
+        if channel.topic:
+            user_id = match_user_id(channel.topic)
 
         # BUG: When discord fails to create channel topic.
         # search through message history
         elif channel.topic is None:
-            async for message in channel.history(limit=50):
+            async for message in channel.history(limit=100):
                 if message.embeds:
                     embed = message.embeds[0]
-                    # TODO: use re.search instead
-                    matches = re.findall(r'User ID: (\d+)',
-                                         str(embed.footer.text))
-                    if matches:
-                        user_id = int(matches[0])
-                        break
+                    if embed.footer.text:
+                        user_id = match_user_id(embed.footer.text)
+                        if user_id is not None:
+                            break
 
         if user_id is not None:
             if user_id in self.cache:
@@ -536,7 +535,7 @@ async def create(self, recipient, *, creator=None, category=None):
         self.cache[recipient.id] = thread
 
         log_url = await self.bot.api.create_log_entry(recipient, channel,
-                                                      creator or recipient),
+                                                      creator or recipient)
 
         log_data = await self.bot.api.get_user_logs(recipient.id)
         # await self.get_dominant_color(recipient.avatar_url)
@@ -565,27 +564,17 @@ async def find_or_create(self, recipient):
         return await self.find(recipient=recipient) or \
                await self.create(recipient)
 
-    @staticmethod
-    def valid_image_url(url):
-        """Checks if a url leads to an image."""
-        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 ''
-
     @async_executor()
     def _do_get_dc(self, image, quality):
         with BytesIO(image) as f:
             return ColorThief(f).get_color(quality=quality)
 
     async def get_dominant_color(self, url=None, quality=10):
         """
-        Returns the dominant color of an image from a url
+        Returns the dominant color of an image from a URL
         (misc)
         """
-        url = self.valid_image_url(url)
+        url = parse_image_url(url)
 
         if not url:
             raise ValueError('Invalid image url passed.')

core/utils.py

@@ -1,8 +1,9 @@
 from discord import Object
 from discord.ext import commands
 
+import re
 import typing
-from urllib.parse import urlparse
+from urllib import parse
 
 
 class User(commands.IDConverter):
@@ -25,11 +26,18 @@ def truncate(c: str) -> str:
     return c[:47].strip() + '...' if len(c) > 50 else c
 
 
-def is_image_url(u: str, _=None) -> bool:
-    for x in {'.png', '.jpg', '.gif', '.jpeg', '.webp'}:
-        if urlparse(u.lower()).path.endswith(x):
-            return True
-    return False
+def is_image_url(url: str, _=None) -> bool:
+    return bool(parse_image_url(url))
+
+
+def parse_image_url(url: str) -> str:
+    """Checks if a url leads to an image."""
+    types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
+    url = parse.urlsplit(url)
+
+    if any(url.path.lower().endswith(i) for i in types):
+        return parse.urlunsplit((*url[:3], 'size=128', url[-1]))
+    return ''
 
 
 def days(d: typing.Union[str, int]) -> str:
@@ -47,3 +55,9 @@ def cleanup_code(content: str) -> str:
 
     # remove `foo`
     return content.strip('` \n')
+
+
+def match_user_id(s: str) -> typing.Optional[int]:
+    match = re.match(r'^User ID: (\d+)$', s)
+    if match is not None:
+        return int(match.group(1))