From 888f83170bce384315a0a5c47b87b7ffbfb5d8ea Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Wed, 5 May 2021 13:46:08 -0400
Subject: chore: Add all of the converters into bot/utils/converters.py

---
 bot/utils/converters.py | 77 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 3 deletions(-)

(limited to 'bot/utils/converters.py')

diff --git a/bot/utils/converters.py b/bot/utils/converters.py
index 228714c9..98607087 100644
--- a/bot/utils/converters.py
+++ b/bot/utils/converters.py
@@ -1,11 +1,15 @@
+from datetime import datetime
+from typing import Tuple, Union
+
 import discord
-from discord.ext.commands.converter import MessageConverter
+from discord.ext import commands
 
 
-class WrappedMessageConverter(MessageConverter):
+class WrappedMessageConverter(commands.MessageConverter):
     """A converter that handles embed-suppressed links like <http://example.com>."""
 
-    async def convert(self, ctx: discord.ext.commands.Context, argument: str) -> discord.Message:
+    @staticmethod
+    async def convert(ctx: commands.Context, argument: str) -> discord.Message:
         """Wrap the commands.MessageConverter to handle <> delimited message links."""
         # It's possible to wrap a message in [<>] as well, and it's supported because its easy
         if argument.startswith("[") and argument.endswith("]"):
@@ -14,3 +18,70 @@ class WrappedMessageConverter(MessageConverter):
             argument = argument[1:-1]
 
         return await super().convert(ctx, argument)
+
+
+class CoordinateConverter(commands.Converter):
+    """Converter for Coordinates."""
+
+    @staticmethod
+    async def convert(ctx: commands.Context, coordinate: str) -> Tuple[int, int]:
+        """Take in a coordinate string and turn it into an (x, y) tuple."""
+        if len(coordinate) not in (2, 3):
+            raise commands.BadArgument("Invalid co-ordinate provided.")
+
+        coordinate = coordinate.lower()
+        if coordinate[0].isalpha():
+            digit = coordinate[1:]
+            letter = coordinate[0]
+        else:
+            digit = coordinate[:-1]
+            letter = coordinate[-1]
+
+        if not digit.isdigit():
+            raise commands.BadArgument
+
+        x = ord(letter) - ord("a")
+        y = int(digit) - 1
+
+        if (not 0 <= x <= 9) or (not 0 <= y <= 9):
+            raise commands.BadArgument
+        return x, y
+
+
+SourceType = Union[commands.Command, commands.Cog]
+
+
+class SourceConverter(commands.Converter):
+    """Convert an argument into a command or cog."""
+
+    @staticmethod
+    async def convert(ctx: commands.Context, argument: str) -> SourceType:
+        """Convert argument into source object."""
+        cog = ctx.bot.get_cog(argument)
+        if cog:
+            return cog
+
+        cmd = ctx.bot.get_command(argument)
+        if cmd:
+            return cmd
+
+        raise commands.BadArgument(
+            f"Unable to convert `{argument}` to valid command or Cog."
+        )
+
+
+class DateConverter(commands.Converter):
+    """Parse SOL or earth date (in format YYYY-MM-DD) into `int` or `datetime`. When invalid input, raise error."""
+
+    @staticmethod
+    async def convert(ctx: commands.Context, argument: str) -> Union[int, datetime]:
+        """Parse date (SOL or earth) into `datetime` or `int`. When invalid value, raise error."""
+        if argument.isdigit():
+            return int(argument)
+        try:
+            date = datetime.strptime(argument, "%Y-%m-%d")
+        except ValueError:
+            raise commands.BadArgument(
+                f"Can't convert `{argument}` to `datetime` in format `YYYY-MM-DD` or `int` in SOL."
+            )
+        return date
-- 
cgit v1.2.3


From 4503a3307b989b251826f36e9370bda7471640b3 Mon Sep 17 00:00:00 2001
From: ToxicKidz <elijahjegede4@gmail.com>
Date: Sun, 9 May 2021 17:49:53 -0400
Subject: fix: Use str.isdecimal instead of str.isdigit

---
 bot/utils/__init__.py   | 4 ++--
 bot/utils/converters.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'bot/utils/converters.py')

diff --git a/bot/utils/__init__.py b/bot/utils/__init__.py
index 2fac2086..09a4dfc3 100644
--- a/bot/utils/__init__.py
+++ b/bot/utils/__init__.py
@@ -51,7 +51,7 @@ async def disambiguate(
     choices = (f"{index}: {entry}" for index, entry in enumerate(entries, start=1))
 
     def check(message: discord.Message) -> bool:
-        return (message.content.isdigit()
+        return (message.content.isdecimal()
                 and message.author == ctx.author
                 and message.channel == ctx.channel)
 
@@ -87,7 +87,7 @@ async def disambiguate(
     except asyncio.TimeoutError:
         raise BadArgument("Timed out.")
 
-    # Guaranteed to not error because of isdigit() in check
+    # Guaranteed to not error because of isdecimal() in check
     index = int(result.content)
 
     try:
diff --git a/bot/utils/converters.py b/bot/utils/converters.py
index 98607087..72b64848 100644
--- a/bot/utils/converters.py
+++ b/bot/utils/converters.py
@@ -37,7 +37,7 @@ class CoordinateConverter(commands.Converter):
             digit = coordinate[:-1]
             letter = coordinate[-1]
 
-        if not digit.isdigit():
+        if not digit.isdecimal():
             raise commands.BadArgument
 
         x = ord(letter) - ord("a")
@@ -76,7 +76,7 @@ class DateConverter(commands.Converter):
     @staticmethod
     async def convert(ctx: commands.Context, argument: str) -> Union[int, datetime]:
         """Parse date (SOL or earth) into `datetime` or `int`. When invalid value, raise error."""
-        if argument.isdigit():
+        if argument.isdecimal():
             return int(argument)
         try:
             date = datetime.strptime(argument, "%Y-%m-%d")
-- 
cgit v1.2.3