From 1aa630656cba21353c3fe07f46255e3b5b4627ac Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Mon, 18 Dec 2023 17:09:15 -0500 Subject: [PATCH] fix(moderation): hopefully fixed import errors --- moderation/importers/galacticbot.py | 2 +- moderation/importers/moderation.py | 2 +- moderation/moderation.py | 10 +++++----- moderation/{utils => utilities}/config.py | 0 moderation/{utils => utilities}/database.py | 0 moderation/{utils => utilities}/embed_factory.py | 0 moderation/{utils => utilities}/logger.py | 0 moderation/{utils => utilities}/utils.py | 0 moderation/utils/__init__.py | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename moderation/{utils => utilities}/config.py (100%) rename moderation/{utils => utilities}/database.py (100%) rename moderation/{utils => utilities}/embed_factory.py (100%) rename moderation/{utils => utilities}/logger.py (100%) rename moderation/{utils => utilities}/utils.py (100%) delete mode 100644 moderation/utils/__init__.py diff --git a/moderation/importers/galacticbot.py b/moderation/importers/galacticbot.py index 4e4197e..c2d686c 100644 --- a/moderation/importers/galacticbot.py +++ b/moderation/importers/galacticbot.py @@ -2,7 +2,7 @@ from datetime import timedelta import json from redbot.core import commands from discord import Message, ButtonStyle, Interaction, ui -from ..utils.database import connect, create_guild_table, mysql_log +from ..utilities.database import connect, create_guild_table, mysql_log class ImportGalacticBotView(ui.View): def __init__(self, timeout, ctx, message): diff --git a/moderation/importers/moderation.py b/moderation/importers/moderation.py index 96c705d..6980eb7 100644 --- a/moderation/importers/moderation.py +++ b/moderation/importers/moderation.py @@ -3,7 +3,7 @@ import json from typing import Dict from redbot.core import commands from discord import Message, ButtonStyle, Interaction, ui -from ..utils.database import connect, create_guild_table, mysql_log +from ..utilities.database import connect, create_guild_table, mysql_log class ImportModerationView(ui.View): diff --git a/moderation/moderation.py b/moderation/moderation.py index 9fea05f..871a4f1 100644 --- a/moderation/moderation.py +++ b/moderation/moderation.py @@ -19,11 +19,11 @@ from pytimeparse2 import disable_dateutil, parse from redbot.core import app_commands, checks, commands, data_manager from redbot.core.app_commands import Choice -from .utils.config import config, register_config -from .utils.database import connect, create_guild_table, fetch_case, mysql_log -from .utils.embed_factory import embed_factory -from .utils.logger import logger -from .utils.utils import check_conf, check_permissions, check_moddable, fetch_channel_dict, fetch_user_dict, generate_dict, log +from .utilities.config import config, register_config +from .utilities.database import connect, create_guild_table, fetch_case, mysql_log +from .utilities.embed_factory import embed_factory +from .utilities.logger import logger +from .utilities.utils import check_conf, check_permissions, check_moddable, fetch_channel_dict, fetch_user_dict, generate_dict, log from .importers.galacticbot import ImportGalacticBotView from .importers.moderation import ImportModerationView diff --git a/moderation/utils/config.py b/moderation/utilities/config.py similarity index 100% rename from moderation/utils/config.py rename to moderation/utilities/config.py diff --git a/moderation/utils/database.py b/moderation/utilities/database.py similarity index 100% rename from moderation/utils/database.py rename to moderation/utilities/database.py diff --git a/moderation/utils/embed_factory.py b/moderation/utilities/embed_factory.py similarity index 100% rename from moderation/utils/embed_factory.py rename to moderation/utilities/embed_factory.py diff --git a/moderation/utils/logger.py b/moderation/utilities/logger.py similarity index 100% rename from moderation/utils/logger.py rename to moderation/utilities/logger.py diff --git a/moderation/utils/utils.py b/moderation/utilities/utils.py similarity index 100% rename from moderation/utils/utils.py rename to moderation/utilities/utils.py diff --git a/moderation/utils/__init__.py b/moderation/utils/__init__.py deleted file mode 100644 index e69de29..0000000