From d3cdec3965279cb61ab99b361010b0aa4afecde7 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Tue, 13 Aug 2024 22:42:52 +0100
Subject: [PATCH] Move the cogs into a subdir

---
 py/{ => cogs}/match_button.py   | 0
 py/{ => cogs}/matchy_cog.py     | 0
 py/{ => cogs}/owner_cog.py      | 0
 py/{ => cogs}/owner_cog_test.py | 0
 py/matchy.py                    | 6 +++---
 py/util.py                      | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename py/{ => cogs}/match_button.py (100%)
 rename py/{ => cogs}/matchy_cog.py (100%)
 rename py/{ => cogs}/owner_cog.py (100%)
 rename py/{ => cogs}/owner_cog_test.py (100%)

diff --git a/py/match_button.py b/py/cogs/match_button.py
similarity index 100%
rename from py/match_button.py
rename to py/cogs/match_button.py
diff --git a/py/matchy_cog.py b/py/cogs/matchy_cog.py
similarity index 100%
rename from py/matchy_cog.py
rename to py/cogs/matchy_cog.py
diff --git a/py/owner_cog.py b/py/cogs/owner_cog.py
similarity index 100%
rename from py/owner_cog.py
rename to py/cogs/owner_cog.py
diff --git a/py/owner_cog_test.py b/py/cogs/owner_cog_test.py
similarity index 100%
rename from py/owner_cog_test.py
rename to py/cogs/owner_cog_test.py
diff --git a/py/matchy.py b/py/matchy.py
index 490ef6c..e0a688a 100755
--- a/py/matchy.py
+++ b/py/matchy.py
@@ -6,9 +6,9 @@ import discord
 from discord.ext import commands
 import config
 import state
-from matchy_cog import MatchyCog
-from owner_cog import OwnerCog
-import match_button
+from cogs.matchy_cog import MatchyCog
+from cogs.owner_cog import OwnerCog
+import cogs.match_button as match_button
 
 State = state.load_from_file()
 
diff --git a/py/util.py b/py/util.py
index 4d3973c..9b28f6d 100644
--- a/py/util.py
+++ b/py/util.py
@@ -21,7 +21,7 @@ def format_day(time: datetime) -> str:
     return f"{day} {num}"
 
 
-def format_list(list) -> str:
+def format_list(list: list) -> str:
     """Format a list into a human readable format of foo, bar and bob"""
     if len(list) > 1:
         return f"{', '.join(list[:-1])} and {list[-1]}"