From c27ba95c1401c710c0506e48509d0c861564e907 Mon Sep 17 00:00:00 2001 From: wlinator Date: Sun, 18 Aug 2024 11:16:18 +0200 Subject: [PATCH] Optimize imports --- Luminara.py | 6 +++--- db/database.py | 7 ++++--- handlers/reaction_handler.py | 1 + lib/exceptions/LumiExceptions.py | 1 + lib/formatter.py | 4 ++-- modules/admin/award.py | 1 + modules/admin/blacklist.py | 3 ++- modules/admin/sql.py | 4 ++-- modules/admin/sync.py | 3 ++- modules/birthdays/__init__.py | 3 ++- modules/birthdays/birthday.py | 2 +- modules/birthdays/daily_check.py | 4 +++- modules/config/__init__.py | 3 ++- modules/config/c_birthday.py | 3 ++- modules/config/c_boost.py | 9 +++++---- modules/config/c_level.py | 7 ++++--- modules/config/c_moderation.py | 5 +++-- modules/config/c_prefix.py | 2 +- modules/config/c_show.py | 6 ++++-- modules/config/xp_reward.py | 2 +- modules/economy/__init__.py | 3 ++- modules/economy/blackjack.py | 4 ++-- modules/economy/slots.py | 3 +-- modules/levels/__init__.py | 2 +- modules/misc/__init__.py | 2 +- modules/moderation/ban.py | 5 +++-- modules/moderation/cases.py | 12 +++++++----- modules/moderation/kick.py | 5 +++-- modules/moderation/softban.py | 4 +++- modules/moderation/timeout.py | 9 +++++---- modules/moderation/utils/actionable.py | 3 ++- modules/moderation/utils/case_embed.py | 12 +++++++----- modules/moderation/utils/case_handler.py | 8 +++++--- modules/moderation/warn.py | 12 +++++++----- modules/triggers/__init__.py | 2 +- modules/triggers/add.py | 7 ++++--- modules/triggers/delete.py | 5 +++-- modules/triggers/list.py | 9 +++++---- services/daily_service.py | 1 + services/help_service.py | 2 +- services/moderation/case_service.py | 3 ++- services/moderation/modlog_service.py | 3 ++- 42 files changed, 114 insertions(+), 78 deletions(-) diff --git a/Luminara.py b/Luminara.py index 3e2f121..be5177f 100644 --- a/Luminara.py +++ b/Luminara.py @@ -9,10 +9,10 @@ import Client import config.parser import services.config_service import services.help_service -from lib.constants import CONST -from services.blacklist_service import BlacklistUserService -from lib.exceptions.LumiExceptions import Blacklisted from db.database import run_migrations +from lib.constants import CONST +from lib.exceptions.LumiExceptions import Blacklisted +from services.blacklist_service import BlacklistUserService # Remove the default logger configuration logger.remove() diff --git a/db/database.py b/db/database.py index febe2e7..0277edc 100644 --- a/db/database.py +++ b/db/database.py @@ -1,10 +1,11 @@ -import mysql.connector -from loguru import logger -from mysql.connector import pooling import os import pathlib import re +import mysql.connector +from loguru import logger +from mysql.connector import pooling + from lib.constants import CONST diff --git a/handlers/reaction_handler.py b/handlers/reaction_handler.py index 4fd57bf..177efe8 100644 --- a/handlers/reaction_handler.py +++ b/handlers/reaction_handler.py @@ -1,4 +1,5 @@ import contextlib + from discord import Message from discord.ext.commands import Cog from loguru import logger diff --git a/lib/exceptions/LumiExceptions.py b/lib/exceptions/LumiExceptions.py index cb6bfe0..0136e31 100644 --- a/lib/exceptions/LumiExceptions.py +++ b/lib/exceptions/LumiExceptions.py @@ -1,4 +1,5 @@ from discord.ext import commands + from lib.constants import CONST diff --git a/lib/formatter.py b/lib/formatter.py index 3b2ae17..019613b 100644 --- a/lib/formatter.py +++ b/lib/formatter.py @@ -3,9 +3,9 @@ import textwrap import discord from discord.ext import commands from pytimeparse import parse -from lib.exceptions.LumiExceptions import LumiException -from lib.constants import CONST +from lib.constants import CONST +from lib.exceptions.LumiExceptions import LumiException from services.config_service import GuildConfig diff --git a/modules/admin/award.py b/modules/admin/award.py index 979afab..9cd18ab 100644 --- a/modules/admin/award.py +++ b/modules/admin/award.py @@ -1,4 +1,5 @@ import discord + from lib.constants import CONST from lib.embed_builder import EmbedBuilder from services.currency_service import Currency diff --git a/modules/admin/blacklist.py b/modules/admin/blacklist.py index 7333491..815f649 100644 --- a/modules/admin/blacklist.py +++ b/modules/admin/blacklist.py @@ -1,9 +1,10 @@ from typing import Optional import discord + from lib.constants import CONST -from services.blacklist_service import BlacklistUserService from lib.embed_builder import EmbedBuilder +from services.blacklist_service import BlacklistUserService async def blacklist_user( diff --git a/modules/admin/sql.py b/modules/admin/sql.py index f1f179a..fd16daa 100644 --- a/modules/admin/sql.py +++ b/modules/admin/sql.py @@ -1,10 +1,10 @@ import mysql.connector + +from db import database from lib.constants import CONST from lib.embed_builder import EmbedBuilder from lib.formatter import shorten -from db import database - async def select_cmd(ctx, query: str): if query.lower().startswith("select "): diff --git a/modules/admin/sync.py b/modules/admin/sync.py index 0b722fd..8195ede 100644 --- a/modules/admin/sync.py +++ b/modules/admin/sync.py @@ -1,7 +1,8 @@ import discord + +from lib.constants import CONST from lib.embed_builder import EmbedBuilder from lib.exceptions.LumiExceptions import LumiException -from lib.constants import CONST async def sync_commands(client, ctx): diff --git a/modules/birthdays/__init__.py b/modules/birthdays/__init__.py index 6ea0c0f..2605e2f 100644 --- a/modules/birthdays/__init__.py +++ b/modules/birthdays/__init__.py @@ -1,9 +1,10 @@ import datetime -import pytz import discord +import pytz from discord.commands import SlashCommandGroup from discord.ext import commands, tasks + from lib import checks from lib.constants import CONST from modules.birthdays import birthday, daily_check diff --git a/modules/birthdays/birthday.py b/modules/birthdays/birthday.py index 404bbcb..6fe136c 100644 --- a/modules/birthdays/birthday.py +++ b/modules/birthdays/birthday.py @@ -4,8 +4,8 @@ import datetime import discord from discord.ext import commands -from lib.embed_builder import EmbedBuilder from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from services.birthday_service import Birthday diff --git a/modules/birthdays/daily_check.py b/modules/birthdays/daily_check.py index 1754827..0abd10b 100644 --- a/modules/birthdays/daily_check.py +++ b/modules/birthdays/daily_check.py @@ -1,10 +1,12 @@ import asyncio import random + from loguru import logger + from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from services.birthday_service import Birthday from services.config_service import GuildConfig -from lib.embed_builder import EmbedBuilder async def daily_birthday_check(client): diff --git a/modules/config/__init__.py b/modules/config/__init__.py index c1d8c96..b2cff77 100644 --- a/modules/config/__init__.py +++ b/modules/config/__init__.py @@ -1,7 +1,8 @@ import discord -from discord.ext.commands import guild_only from discord.commands import SlashCommandGroup from discord.ext import bridge, commands +from discord.ext.commands import guild_only + from modules.config import ( c_birthday, c_boost, diff --git a/modules/config/c_birthday.py b/modules/config/c_birthday.py index 0bf4d93..5a74f22 100644 --- a/modules/config/c_birthday.py +++ b/modules/config/c_birthday.py @@ -1,6 +1,7 @@ import discord -from lib.embed_builder import EmbedBuilder + from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from services.config_service import GuildConfig diff --git a/modules/config/c_boost.py b/modules/config/c_boost.py index 62b6931..ff0c271 100644 --- a/modules/config/c_boost.py +++ b/modules/config/c_boost.py @@ -1,9 +1,10 @@ import discord -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST -from services.config_service import GuildConfig -from lib.exceptions.LumiExceptions import LumiException + import lib.formatter +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from lib.exceptions.LumiExceptions import LumiException +from services.config_service import GuildConfig async def set_boost_channel(ctx, channel: discord.TextChannel): diff --git a/modules/config/c_level.py b/modules/config/c_level.py index e8ee746..c9c1bef 100644 --- a/modules/config/c_level.py +++ b/modules/config/c_level.py @@ -1,8 +1,9 @@ import discord -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST -from services.config_service import GuildConfig + from lib import formatter +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from services.config_service import GuildConfig async def set_level_channel(ctx, channel: discord.TextChannel): diff --git a/modules/config/c_moderation.py b/modules/config/c_moderation.py index 37396ef..d9003d0 100644 --- a/modules/config/c_moderation.py +++ b/modules/config/c_moderation.py @@ -1,8 +1,9 @@ import discord -from lib.embed_builder import EmbedBuilder + from lib.constants import CONST -from services.moderation.modlog_service import ModLogService +from lib.embed_builder import EmbedBuilder from lib.exceptions.LumiExceptions import LumiException +from services.moderation.modlog_service import ModLogService async def set_mod_log_channel(ctx, channel: discord.TextChannel): diff --git a/modules/config/c_prefix.py b/modules/config/c_prefix.py index cfe5eb1..655c520 100644 --- a/modules/config/c_prefix.py +++ b/modules/config/c_prefix.py @@ -1,5 +1,5 @@ -from lib.embed_builder import EmbedBuilder from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from services.config_service import GuildConfig diff --git a/modules/config/c_show.py b/modules/config/c_show.py index efeb6e0..c19f9ed 100644 --- a/modules/config/c_show.py +++ b/modules/config/c_show.py @@ -1,8 +1,10 @@ -import discord from typing import List, Tuple, Optional + +import discord from discord import Guild -from lib.embed_builder import EmbedBuilder + from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from services.config_service import GuildConfig from services.moderation.modlog_service import ModLogService diff --git a/modules/config/xp_reward.py b/modules/config/xp_reward.py index 678b11d..bb9eafd 100644 --- a/modules/config/xp_reward.py +++ b/modules/config/xp_reward.py @@ -1,7 +1,7 @@ import discord -from services.xp_service import XpRewardService from lib.constants import CONST +from services.xp_service import XpRewardService async def show(ctx): diff --git a/modules/economy/__init__.py b/modules/economy/__init__.py index 9e3f5ae..6727395 100644 --- a/modules/economy/__init__.py +++ b/modules/economy/__init__.py @@ -1,6 +1,7 @@ import discord -from discord.ext.commands import guild_only from discord.ext import bridge, commands +from discord.ext.commands import guild_only + from modules.economy import balance, blackjack, daily, give, slots diff --git a/modules/economy/blackjack.py b/modules/economy/blackjack.py index 96cf9f9..1e2bb76 100644 --- a/modules/economy/blackjack.py +++ b/modules/economy/blackjack.py @@ -7,10 +7,10 @@ from discord.ext import commands from loguru import logger from lib import interaction +from lib.constants import CONST +from lib.exceptions.LumiExceptions import LumiException from services.currency_service import Currency from services.stats_service import BlackJackStats -from lib.exceptions.LumiExceptions import LumiException -from lib.constants import CONST est = pytz.timezone("US/Eastern") active_blackjack_games = {} diff --git a/modules/economy/slots.py b/modules/economy/slots.py index d5fda8c..20512f8 100644 --- a/modules/economy/slots.py +++ b/modules/economy/slots.py @@ -7,11 +7,10 @@ import discord import pytz from discord.ext import commands +from lib.constants import CONST from services.currency_service import Currency from services.stats_service import SlotsStats -from lib.constants import CONST - est = pytz.timezone("US/Eastern") diff --git a/modules/levels/__init__.py b/modules/levels/__init__.py index 3b85800..8a4d488 100644 --- a/modules/levels/__init__.py +++ b/modules/levels/__init__.py @@ -1,6 +1,6 @@ import discord -from discord.ext.commands import guild_only from discord.ext import bridge, commands +from discord.ext.commands import guild_only from modules.levels import leaderboard, level diff --git a/modules/misc/__init__.py b/modules/misc/__init__.py index 41f61e0..77844c3 100644 --- a/modules/misc/__init__.py +++ b/modules/misc/__init__.py @@ -1,9 +1,9 @@ from datetime import datetime import discord -from discord.ext.commands import guild_only from discord.commands import SlashCommandGroup from discord.ext import bridge, commands, tasks +from discord.ext.commands import guild_only from Client import LumiBot from modules.config import c_prefix diff --git a/modules/moderation/ban.py b/modules/moderation/ban.py index b15fd55..4eedbd0 100644 --- a/modules/moderation/ban.py +++ b/modules/moderation/ban.py @@ -1,13 +1,14 @@ import asyncio +from typing import Optional + import discord +from discord.ext.commands import MemberConverter from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder from modules.moderation.utils.actionable import async_actionable from modules.moderation.utils.case_handler import create_case -from typing import Optional -from discord.ext.commands import MemberConverter async def ban_user(cog, ctx, target: discord.User, reason: Optional[str] = None): diff --git a/modules/moderation/cases.py b/modules/moderation/cases.py index c0ff5bc..5d56c58 100644 --- a/modules/moderation/cases.py +++ b/modules/moderation/cases.py @@ -1,16 +1,18 @@ import asyncio + import discord +from discord.ext import pages from discord.ext.commands import UserConverter -from services.moderation.case_service import CaseService + +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from lib.formatter import format_case_number from modules.moderation.utils.case_embed import ( create_case_embed, create_case_list_embed, ) -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST -from discord.ext import pages -from lib.formatter import format_case_number from modules.moderation.utils.case_handler import edit_case_modlog +from services.moderation.case_service import CaseService case_service = CaseService() diff --git a/modules/moderation/kick.py b/modules/moderation/kick.py index 3b3eafb..87e5d76 100644 --- a/modules/moderation/kick.py +++ b/modules/moderation/kick.py @@ -1,13 +1,14 @@ import asyncio +from typing import Optional + import discord +from discord.ext.commands import UserConverter, MemberConverter from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder from modules.moderation.utils.actionable import async_actionable from modules.moderation.utils.case_handler import create_case -from typing import Optional -from discord.ext.commands import UserConverter, MemberConverter async def kick_user(cog, ctx, target: discord.Member, reason: Optional[str] = None): diff --git a/modules/moderation/softban.py b/modules/moderation/softban.py index 91958a6..a6c3b07 100644 --- a/modules/moderation/softban.py +++ b/modules/moderation/softban.py @@ -1,7 +1,9 @@ import asyncio -import discord from typing import Optional + +import discord from discord.ext.commands import MemberConverter, UserConverter + from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder diff --git a/modules/moderation/timeout.py b/modules/moderation/timeout.py index 6e1c705..5075f8e 100644 --- a/modules/moderation/timeout.py +++ b/modules/moderation/timeout.py @@ -1,15 +1,16 @@ import asyncio -import discord import datetime +from typing import Optional + +import discord +from discord.ext.commands import UserConverter, MemberConverter from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder +from lib.formatter import format_duration_to_seconds, format_seconds_to_duration_string from modules.moderation.utils.actionable import async_actionable from modules.moderation.utils.case_handler import create_case -from typing import Optional -from discord.ext.commands import UserConverter, MemberConverter -from lib.formatter import format_duration_to_seconds, format_seconds_to_duration_string async def timeout_user( diff --git a/modules/moderation/utils/actionable.py b/modules/moderation/utils/actionable.py index cb9dcb7..5b0d811 100644 --- a/modules/moderation/utils/actionable.py +++ b/modules/moderation/utils/actionable.py @@ -1,6 +1,7 @@ import discord -from lib.exceptions.LumiExceptions import LumiException + from lib.constants import CONST +from lib.exceptions.LumiExceptions import LumiException async def async_actionable( diff --git a/modules/moderation/utils/case_embed.py b/modules/moderation/utils/case_embed.py index ae079b9..c0bd3fd 100644 --- a/modules/moderation/utils/case_embed.py +++ b/modules/moderation/utils/case_embed.py @@ -1,9 +1,11 @@ -import discord -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST -from lib.formatter import format_case_number -from typing import Optional import datetime +from typing import Optional + +import discord + +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from lib.formatter import format_case_number from lib.formatter import format_seconds_to_duration_string diff --git a/modules/moderation/utils/case_handler.py b/modules/moderation/utils/case_handler.py index 1f6e00e..024e040 100644 --- a/modules/moderation/utils/case_handler.py +++ b/modules/moderation/utils/case_handler.py @@ -1,10 +1,12 @@ +from typing import Optional + import discord +from discord.ext.commands import TextChannelConverter, UserConverter from loguru import logger + +from modules.moderation.utils.case_embed import create_case_embed from services.moderation.case_service import CaseService from services.moderation.modlog_service import ModLogService -from modules.moderation.utils.case_embed import create_case_embed -from typing import Optional -from discord.ext.commands import TextChannelConverter, UserConverter case_service = CaseService() modlog_service = ModLogService() diff --git a/modules/moderation/warn.py b/modules/moderation/warn.py index 8dfbf68..6b50f57 100644 --- a/modules/moderation/warn.py +++ b/modules/moderation/warn.py @@ -1,11 +1,13 @@ -import discord -from typing import Optional -from discord.ext.commands import UserConverter, MemberConverter import asyncio -from lib.embed_builder import EmbedBuilder +from typing import Optional + +import discord +from discord.ext.commands import UserConverter, MemberConverter + from lib.constants import CONST -from modules.moderation.utils.case_handler import create_case +from lib.embed_builder import EmbedBuilder from modules.moderation.utils.actionable import async_actionable +from modules.moderation.utils.case_handler import create_case async def warn_user(ctx, target: discord.Member, reason: Optional[str]): diff --git a/modules/triggers/__init__.py b/modules/triggers/__init__.py index ea8d9c8..7a664d5 100644 --- a/modules/triggers/__init__.py +++ b/modules/triggers/__init__.py @@ -1,7 +1,7 @@ import discord -from discord.ext.commands import guild_only from discord.commands import SlashCommandGroup from discord.ext import commands +from discord.ext.commands import guild_only from Client import LumiBot from modules.triggers.add import add_reaction diff --git a/modules/triggers/add.py b/modules/triggers/add.py index b208f9b..81a9819 100644 --- a/modules/triggers/add.py +++ b/modules/triggers/add.py @@ -1,11 +1,12 @@ from typing import Optional from discord.ext import bridge -from services.reactions_service import CustomReactionsService -from lib.exceptions.LumiExceptions import LumiException + +from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder -from lib import formatter +from lib.exceptions.LumiExceptions import LumiException +from services.reactions_service import CustomReactionsService async def add_reaction( diff --git a/modules/triggers/delete.py b/modules/triggers/delete.py index 94358bd..91fe0c5 100644 --- a/modules/triggers/delete.py +++ b/modules/triggers/delete.py @@ -1,8 +1,9 @@ from discord.ext import bridge -from services.reactions_service import CustomReactionsService -from lib.embed_builder import EmbedBuilder + from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from lib.exceptions.LumiExceptions import LumiException +from services.reactions_service import CustomReactionsService async def delete_reaction(ctx: bridge.Context, reaction_id: int) -> None: diff --git a/modules/triggers/list.py b/modules/triggers/list.py index 9914552..6dcf064 100644 --- a/modules/triggers/list.py +++ b/modules/triggers/list.py @@ -1,11 +1,12 @@ +from typing import Any, Dict, List + +import discord from discord.ext import bridge, pages + +from lib import formatter from lib.constants import CONST from lib.embed_builder import EmbedBuilder from services.reactions_service import CustomReactionsService -from typing import Any, Dict, List -from lib import formatter - -import discord async def list_reactions(ctx: bridge.Context) -> None: diff --git a/services/daily_service.py b/services/daily_service.py index 4b47285..9e5e119 100644 --- a/services/daily_service.py +++ b/services/daily_service.py @@ -2,6 +2,7 @@ from datetime import datetime, timedelta from typing import List, Optional, Tuple import pytz + from db import database from lib.constants import CONST from services.currency_service import Currency diff --git a/services/help_service.py b/services/help_service.py index 4dcd529..757c231 100644 --- a/services/help_service.py +++ b/services/help_service.py @@ -1,8 +1,8 @@ import discord from discord.ext import commands -from lib.embed_builder import EmbedBuilder from lib.constants import CONST +from lib.embed_builder import EmbedBuilder from lib.exceptions.LumiExceptions import LumiException diff --git a/services/moderation/case_service.py b/services/moderation/case_service.py index d9e8c40..aaaf25b 100644 --- a/services/moderation/case_service.py +++ b/services/moderation/case_service.py @@ -1,6 +1,7 @@ -from db.database import execute_query, select_query_one, select_query_dict from typing import Optional, Dict, Any, List +from db.database import execute_query, select_query_one, select_query_dict + class CaseService: def __init__(self): diff --git a/services/moderation/modlog_service.py b/services/moderation/modlog_service.py index b87f452..558efd9 100644 --- a/services/moderation/modlog_service.py +++ b/services/moderation/modlog_service.py @@ -1,6 +1,7 @@ -from db.database import execute_query, select_query_one from typing import Optional +from db.database import execute_query, select_query_one + class ModLogService: def __init__(self):