diff options
author | 2021-11-03 21:01:36 -0400 | |
---|---|---|
committer | 2021-11-03 21:01:36 -0400 | |
commit | 6869fa330ea67bced27df68d3b730e5fdbdb7aa4 (patch) | |
tree | c665399a5ea86d821013852d2d21a35a35d1d95a | |
parent | fix: return None if no name match is found (diff) |
fix: use and handle conversions with name value
-rw-r--r-- | bot/exts/utilities/color.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bot/exts/utilities/color.py b/bot/exts/utilities/color.py index 9c801413..56036cd0 100644 --- a/bot/exts/utilities/color.py +++ b/bot/exts/utilities/color.py @@ -151,13 +151,16 @@ class Colour(commands.Cog): def get_colour_conversions(self, rgb: tuple[int, int, int]) -> dict[str, str]: """Create a dictionary mapping of colour types and their values.""" + colour_name = self._rgb_to_name(rgb) + if colour_name is None: + colour_name = "No match found" return { "RGB": rgb, "HSV": self._rgb_to_hsv(rgb), "HSL": self._rgb_to_hsl(rgb), "CMYK": self._rgb_to_cmyk(rgb), "Hex": self._rgb_to_hex(rgb), - "Name": self._rgb_to_name(rgb) + "Name": colour_name } @staticmethod @@ -182,7 +185,7 @@ class Colour(commands.Cog): rgb_list = [val / 255.0 for val in rgb] if not any(rgb_list): return 0, 0, 0, 100 - k = 1 - max(val for val in rgb_list) + k = 1 - max(rgb_list) c = round((1 - rgb_list[0] - k) * 100 / (1 - k)) m = round((1 - rgb_list[1] - k) * 100 / (1 - k)) y = round((1 - rgb_list[2] - k) * 100 / (1 - k)) |