From 964e1c8f84e7420ee8edcf9e7d34b5698c334bb9 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Fri, 16 Aug 2024 23:23:18 +0100
Subject: [PATCH] Move state back out of it's own lil module

---
 matchy.py                   | 2 +-
 matchy/cogs/matchy.py       | 2 +-
 matchy/cogs/owner.py        | 2 +-
 matchy/files/__init__.py    | 0
 matchy/matching.py          | 2 +-
 matchy/{files => }/state.py | 0
 matchy/views/match.py       | 2 +-
 tests/matching_test.py      | 2 +-
 tests/owner_cog_test.py     | 2 +-
 tests/state_test.py         | 2 +-
 10 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 matchy/files/__init__.py
 rename matchy/{files => }/state.py (100%)

diff --git a/matchy.py b/matchy.py
index 9eb70b7..060e433 100644
--- a/matchy.py
+++ b/matchy.py
@@ -5,7 +5,7 @@ import logging
 import discord
 from discord.ext import commands
 import os
-from matchy.files.state import load_from_file
+from matchy.state import load_from_file
 import matchy.cogs.matchy
 import matchy.cogs.owner
 
diff --git a/matchy/cogs/matchy.py b/matchy/cogs/matchy.py
index d63fe23..1080374 100644
--- a/matchy/cogs/matchy.py
+++ b/matchy/cogs/matchy.py
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta, time
 
 import matchy.views.match as match
 import matchy.matching as matching
-from matchy.files.state import State, AuthScope
+from matchy.state import State, AuthScope
 import matchy.util as util
 
 logger = logging.getLogger("cog")
diff --git a/matchy/cogs/owner.py b/matchy/cogs/owner.py
index bbd9336..2893631 100644
--- a/matchy/cogs/owner.py
+++ b/matchy/cogs/owner.py
@@ -3,7 +3,7 @@ Owner bot cog
 """
 import logging
 from discord.ext import commands
-from matchy.files.state import State, AuthScope
+from matchy.state import State, AuthScope
 
 logger = logging.getLogger("owner")
 logger.setLevel(logging.INFO)
diff --git a/matchy/files/__init__.py b/matchy/files/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/matchy/matching.py b/matchy/matching.py
index 94d84f5..b1fa114 100644
--- a/matchy/matching.py
+++ b/matchy/matching.py
@@ -3,7 +3,7 @@ import logging
 import discord
 from datetime import datetime
 from typing import Protocol, runtime_checkable
-from matchy.files.state import State, ts_to_datetime
+from matchy.state import State, ts_to_datetime
 import matchy.util as util
 
 
diff --git a/matchy/files/state.py b/matchy/state.py
similarity index 100%
rename from matchy/files/state.py
rename to matchy/state.py
diff --git a/matchy/views/match.py b/matchy/views/match.py
index 7fc759e..8751a13 100644
--- a/matchy/views/match.py
+++ b/matchy/views/match.py
@@ -5,7 +5,7 @@ import logging
 import discord
 import re
 
-import matchy.files.state as state
+import matchy.state as state
 import matchy.matching as matching
 
 logger = logging.getLogger("match_button")
diff --git a/tests/matching_test.py b/tests/matching_test.py
index 0a1dc05..1ff2c81 100644
--- a/tests/matching_test.py
+++ b/tests/matching_test.py
@@ -5,7 +5,7 @@ import discord
 import pytest
 import random
 import matchy.matching as matching
-import matchy.files.state as state
+import matchy.state as state
 import copy
 import itertools
 from datetime import datetime, timedelta
diff --git a/tests/owner_cog_test.py b/tests/owner_cog_test.py
index f10100d..009faa8 100644
--- a/tests/owner_cog_test.py
+++ b/tests/owner_cog_test.py
@@ -2,7 +2,7 @@ import discord
 import discord.ext.commands as commands
 import pytest
 import pytest_asyncio
-import matchy.files.state as state
+import matchy.state as state
 import discord.ext.test as dpytest
 
 from matchy.cogs.owner import OwnerCog
diff --git a/tests/state_test.py b/tests/state_test.py
index d078046..5ff11d9 100644
--- a/tests/state_test.py
+++ b/tests/state_test.py
@@ -1,7 +1,7 @@
 """
     Test functions for the state module
 """
-import matchy.files.state as state
+import matchy.state as state
 import tempfile
 import os