diff --git a/Client.py b/Client.py index 5aa02c0..9e7ad60 100644 --- a/Client.py +++ b/Client.py @@ -1,11 +1,11 @@ import os import platform -from loguru import logger +from typing import Optional import discord from discord.ext import bridge, commands -from discord.ext.commands import TextChannelConverter, EmojiConverter -from typing import Optional +from discord.ext.commands import EmojiConverter, TextChannelConverter +from loguru import logger from lib import metadata diff --git a/config/parser.py b/config/parser.py index 82f8602..324a13a 100644 --- a/config/parser.py +++ b/config/parser.py @@ -1,4 +1,5 @@ import json + import yaml from loguru import logger diff --git a/db/database.py b/db/database.py index 679aa25..42f2b49 100644 --- a/db/database.py +++ b/db/database.py @@ -1,8 +1,9 @@ -from lib.constants import CONST -from loguru import logger import mysql.connector +from loguru import logger from mysql.connector import pooling +from lib.constants import CONST + def create_connection_pool(name: str, size: int) -> pooling.MySQLConnectionPool: return pooling.MySQLConnectionPool( diff --git a/handlers/error_handler.py b/handlers/error_handler.py index db54c8d..64bc8fd 100644 --- a/handlers/error_handler.py +++ b/handlers/error_handler.py @@ -1,13 +1,13 @@ import sys import traceback -from loguru import logger from discord.ext import commands from discord.ext.commands import Cog +from loguru import logger -from lib.exceptions import LumiExceptions -from lib.embed_builder import EmbedBuilder from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from lib.exceptions import LumiExceptions async def on_command_error(ctx, error): diff --git a/handlers/event_handler.py b/handlers/event_handler.py index 60d61f7..f239159 100644 --- a/handlers/event_handler.py +++ b/handlers/event_handler.py @@ -1,11 +1,10 @@ -from loguru import logger - from discord.ext.commands import Cog +from loguru import logger import lib.embeds.boost from lib.embeds.greet import Greet -from services.config_service import GuildConfig from services.blacklist_service import BlacklistUserService +from services.config_service import GuildConfig class EventHandler(Cog): diff --git a/handlers/reaction_handler.py b/handlers/reaction_handler.py index 4475baa..f202857 100644 --- a/handlers/reaction_handler.py +++ b/handlers/reaction_handler.py @@ -2,8 +2,8 @@ from discord import Message from discord.ext.commands import Cog from loguru import logger -from services.reactions_service import CustomReactionsService from services.blacklist_service import BlacklistUserService +from services.reactions_service import CustomReactionsService class ReactionHandler: diff --git a/handlers/xp_handler.py b/handlers/xp_handler.py index 78e39b3..8a94be3 100644 --- a/handlers/xp_handler.py +++ b/handlers/xp_handler.py @@ -6,13 +6,13 @@ from typing import Optional import discord from discord.ext import commands -from Client import LumiBot +from Client import LumiBot from config.parser import JsonCache from lib import formatter -from services.config_service import GuildConfig -from services.xp_service import XpService, XpRewardService from services.blacklist_service import BlacklistUserService +from services.config_service import GuildConfig +from services.xp_service import XpRewardService, XpService _strings = JsonCache.read_json("strings") _messages = JsonCache.read_json("levels") diff --git a/lib/constants.py b/lib/constants.py index ed14ef4..9fd031a 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -1,8 +1,10 @@ import os -from config.parser import JsonCache from typing import Optional, Set + from dotenv import load_dotenv +from config.parser import JsonCache + # Load environment variables from .env file load_dotenv() diff --git a/lib/embed_builder.py b/lib/embed_builder.py index 308f1f7..b83f079 100644 --- a/lib/embed_builder.py +++ b/lib/embed_builder.py @@ -1,7 +1,9 @@ -import discord -from lib.constants import CONST import datetime +import discord + +from lib.constants import CONST + class EmbedBuilder: @staticmethod diff --git a/lib/embeds/error.py b/lib/embeds/error.py index 2ebee2f..3ea5459 100644 --- a/lib/embeds/error.py +++ b/lib/embeds/error.py @@ -1,7 +1,7 @@ import discord -from lib.constants import CONST from lib import formatter +from lib.constants import CONST def clean_error_embed(ctx): diff --git a/lib/embeds/triggers.py b/lib/embeds/triggers.py index 620ca25..9236aef 100644 --- a/lib/embeds/triggers.py +++ b/lib/embeds/triggers.py @@ -1,8 +1,10 @@ -import discord +import datetime from typing import Optional + +import discord + from config.parser import JsonCache from lib import formatter -import datetime resources = JsonCache.read_json("art") diff --git a/modules/admin/__init__.py b/modules/admin/__init__.py index 0da7a3d..6515648 100644 --- a/modules/admin/__init__.py +++ b/modules/admin/__init__.py @@ -1,9 +1,10 @@ -import discord -from discord.ext import commands, bridge - -from modules.admin import award, sql, blacklist from typing import Optional +import discord +from discord.ext import bridge, commands + +from modules.admin import award, blacklist, sql + class BotAdmin(commands.Cog, name="Bot Admin"): """ diff --git a/modules/admin/blacklist.py b/modules/admin/blacklist.py index 225988e..e3c3537 100644 --- a/modules/admin/blacklist.py +++ b/modules/admin/blacklist.py @@ -1,7 +1,9 @@ -import discord -from services.blacklist_service import BlacklistUserService from typing import Optional + +import discord + from config.parser import JsonCache +from services.blacklist_service import BlacklistUserService resources = JsonCache.read_json("art") exclaim_icon = resources["icons"]["exclaim"] diff --git a/modules/birthdays/__init__.py b/modules/birthdays/__init__.py index 1e1def6..32634fa 100644 --- a/modules/birthdays/__init__.py +++ b/modules/birthdays/__init__.py @@ -1,13 +1,13 @@ -from loguru import logger import asyncio import random import discord from discord.commands import SlashCommandGroup from discord.ext import commands, tasks +from loguru import logger +from lib import checks, time from lib.constants import CONST -from lib import time, checks from modules.birthdays import birthday from services.birthday_service import Birthday from services.config_service import GuildConfig diff --git a/modules/config/__init__.py b/modules/config/__init__.py index dd60ce1..0e09c25 100644 --- a/modules/config/__init__.py +++ b/modules/config/__init__.py @@ -1,6 +1,6 @@ import discord from discord.commands import SlashCommandGroup -from discord.ext import commands, bridge +from discord.ext import bridge, commands from config.parser import JsonCache from lib import formatter diff --git a/modules/economy/__init__.py b/modules/economy/__init__.py index fc68481..9b63859 100644 --- a/modules/economy/__init__.py +++ b/modules/economy/__init__.py @@ -1,8 +1,8 @@ import discord -from discord.ext import commands, bridge +from discord.ext import bridge, commands from lib import checks -from modules.economy import blackjack, slots, balance, give, daily +from modules.economy import balance, blackjack, daily, give, slots class Economy(commands.Cog): diff --git a/modules/economy/blackjack.py b/modules/economy/blackjack.py index fda2c85..5d609fd 100644 --- a/modules/economy/blackjack.py +++ b/modules/economy/blackjack.py @@ -1,15 +1,14 @@ -from loguru import logger import random from datetime import datetime import discord import pytz from discord.ext import commands +from loguru import logger from config.parser import JsonCache from lib import interaction -from lib.embeds.error import EconErrors -from lib.embeds.error import GenericErrors +from lib.embeds.error import EconErrors, GenericErrors from services.currency_service import Currency from services.stats_service import BlackJackStats diff --git a/modules/economy/daily.py b/modules/economy/daily.py index e4e6d63..b7777a4 100644 --- a/modules/economy/daily.py +++ b/modules/economy/daily.py @@ -1,10 +1,10 @@ from datetime import datetime, timedelta import lib.time +from lib.constants import CONST from lib.embed_builder import EmbedBuilder from services.currency_service import Currency from services.daily_service import Dailies -from lib.constants import CONST async def cmd(ctx) -> None: diff --git a/modules/help/__init__.py b/modules/help/__init__.py index 219f1bb..1957e2f 100644 --- a/modules/help/__init__.py +++ b/modules/help/__init__.py @@ -1,6 +1,6 @@ from discord.ext import commands -from lib import formatter, embed_builder, constants +from lib import constants, embed_builder, formatter class Help(commands.Cog): diff --git a/modules/levels/__init__.py b/modules/levels/__init__.py index b2c8690..93a6af4 100644 --- a/modules/levels/__init__.py +++ b/modules/levels/__init__.py @@ -1,7 +1,7 @@ -from discord.ext import commands, bridge +from discord.ext import bridge, commands from lib import checks -from modules.levels import level, leaderboard +from modules.levels import leaderboard, level class Levels(commands.Cog): diff --git a/modules/levels/leaderboard.py b/modules/levels/leaderboard.py index 64dad43..381f26b 100644 --- a/modules/levels/leaderboard.py +++ b/modules/levels/leaderboard.py @@ -1,12 +1,13 @@ -import discord -from discord.ext import bridge from datetime import datetime +import discord +from discord.ext import bridge + +from lib.constants import CONST from lib.embed_builder import EmbedBuilder from services.currency_service import Currency from services.daily_service import Dailies from services.xp_service import XpService -from lib.constants import CONST async def cmd(ctx: bridge.Context) -> None: diff --git a/modules/levels/level.py b/modules/levels/level.py index 842ae8b..e3c4e13 100644 --- a/modules/levels/level.py +++ b/modules/levels/level.py @@ -1,5 +1,6 @@ from discord import Embed from discord.ext import bridge + from lib.constants import CONST from lib.embed_builder import EmbedBuilder from services.xp_service import XpService diff --git a/modules/misc/__init__.py b/modules/misc/__init__.py index a4424f9..405185e 100644 --- a/modules/misc/__init__.py +++ b/modules/misc/__init__.py @@ -2,12 +2,12 @@ from datetime import datetime import discord from discord.commands import SlashCommandGroup -from discord.ext import commands, bridge, tasks +from discord.ext import bridge, commands, tasks -from lib import checks from Client import LumiBot +from lib import checks from modules.config import set_prefix -from modules.misc import avatar, introduction, invite, backup, info, xkcd, ping +from modules.misc import avatar, backup, info, introduction, invite, ping, xkcd class Misc(commands.Cog): diff --git a/modules/misc/avatar.py b/modules/misc/avatar.py index a527493..1d8424c 100644 --- a/modules/misc/avatar.py +++ b/modules/misc/avatar.py @@ -1,9 +1,9 @@ from io import BytesIO from typing import Optional +import httpx from discord import File, Member from discord.ext import bridge -import httpx client: httpx.AsyncClient = httpx.AsyncClient() diff --git a/modules/misc/backup.py b/modules/misc/backup.py index fe94b2d..4604348 100644 --- a/modules/misc/backup.py +++ b/modules/misc/backup.py @@ -1,11 +1,12 @@ -from lib.constants import CONST -from loguru import logger import subprocess from datetime import datetime from typing import List, Optional import dropbox from dropbox.files import FileMetadata +from loguru import logger + +from lib.constants import CONST # Initialize Dropbox client if instance is "main" _dbx: Optional[dropbox.Dropbox] = None diff --git a/modules/misc/introduction.py b/modules/misc/introduction.py index 8f330e7..0702386 100644 --- a/modules/misc/introduction.py +++ b/modules/misc/introduction.py @@ -1,5 +1,5 @@ import asyncio -from typing import Optional, Dict +from typing import Dict, Optional import discord from discord.ext import bridge @@ -7,8 +7,8 @@ from discord.ext import bridge from lib.constants import CONST from lib.embed_builder import EmbedBuilder from lib.interactions.introduction import ( - IntroductionStartButtons, IntroductionFinishButtons, + IntroductionStartButtons, ) diff --git a/modules/misc/invite.py b/modules/misc/invite.py index 58515cb..79df5e0 100644 --- a/modules/misc/invite.py +++ b/modules/misc/invite.py @@ -1,9 +1,9 @@ from discord import ButtonStyle -from discord.ui import View, Button from discord.ext import bridge +from discord.ui import Button, View -from lib.embed_builder import EmbedBuilder from lib.constants import CONST +from lib.embed_builder import EmbedBuilder async def cmd(ctx: bridge.BridgeContext) -> None: diff --git a/modules/misc/ping.py b/modules/misc/ping.py index a327b9f..d45c5c8 100644 --- a/modules/misc/ping.py +++ b/modules/misc/ping.py @@ -1,8 +1,10 @@ -from discord.ext import bridge -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST from datetime import datetime +from discord.ext import bridge + +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder + async def ping(self, ctx: bridge.BridgeContext) -> None: embed = EmbedBuilder.create_success_embed( diff --git a/modules/misc/xkcd.py b/modules/misc/xkcd.py index 857c072..0b88120 100644 --- a/modules/misc/xkcd.py +++ b/modules/misc/xkcd.py @@ -1,9 +1,11 @@ -from services.xkcd_service import Client, HttpError -from lib.embed_builder import EmbedBuilder -from lib.constants import CONST -from discord.ext import bridge from typing import Optional +from discord.ext import bridge + +from lib.constants import CONST +from lib.embed_builder import EmbedBuilder +from services.xkcd_service import Client, HttpError + _xkcd = Client() diff --git a/modules/moderation/__init__.py b/modules/moderation/__init__.py index 7561e25..1b09f30 100644 --- a/modules/moderation/__init__.py +++ b/modules/moderation/__init__.py @@ -1,5 +1,5 @@ import discord -from discord.ext import commands, bridge +from discord.ext import bridge, commands from modules.moderation import ban diff --git a/modules/triggers/__init__.py b/modules/triggers/__init__.py index 3a86c50..562a2b1 100644 --- a/modules/triggers/__init__.py +++ b/modules/triggers/__init__.py @@ -1,6 +1,6 @@ +import discord from discord.commands import SlashCommandGroup from discord.ext import commands -import discord from Client import LumiBot from modules.triggers.add import add_reaction diff --git a/modules/triggers/add.py b/modules/triggers/add.py index 76e9e8d..e8e0cf5 100644 --- a/modules/triggers/add.py +++ b/modules/triggers/add.py @@ -1,7 +1,9 @@ -from discord.ext import bridge from typing import Optional -from services.reactions_service import CustomReactionsService + +from discord.ext import bridge + from lib.embeds.triggers import create_creation_embed, create_failure_embed +from services.reactions_service import CustomReactionsService async def add_reaction( diff --git a/modules/triggers/delete.py b/modules/triggers/delete.py index dd3b09e..b9e9c90 100644 --- a/modules/triggers/delete.py +++ b/modules/triggers/delete.py @@ -1,10 +1,11 @@ from discord.ext import bridge -from services.reactions_service import CustomReactionsService + from lib.embeds.triggers import ( create_deletion_embed, create_failure_embed, create_not_found_embed, ) +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 f8ce338..af7d9d1 100644 --- a/modules/triggers/list.py +++ b/modules/triggers/list.py @@ -1,9 +1,11 @@ +import datetime + import discord from discord.ext import bridge, pages -from services.reactions_service import CustomReactionsService -from lib.embeds.triggers import create_no_triggers_embed + from config.parser import JsonCache -import datetime +from lib.embeds.triggers import create_no_triggers_embed +from services.reactions_service import CustomReactionsService resources = JsonCache.read_json("art") diff --git a/services/blacklist_service.py b/services/blacklist_service.py index bc4ae12..7ca40ac 100644 --- a/services/blacklist_service.py +++ b/services/blacklist_service.py @@ -1,5 +1,6 @@ +from typing import List, Optional, Tuple + from db import database -from typing import List, Tuple, Optional class BlacklistUserService: diff --git a/services/daily_service.py b/services/daily_service.py index 04ff196..38d75e9 100644 --- a/services/daily_service.py +++ b/services/daily_service.py @@ -1,5 +1,5 @@ from datetime import datetime, timedelta -from typing import List, Tuple, Optional +from typing import List, Optional, Tuple import pytz diff --git a/services/item_service.py b/services/item_service.py index 6ba46c1..72fc5f4 100644 --- a/services/item_service.py +++ b/services/item_service.py @@ -1,4 +1,5 @@ import sqlite3 + from loguru import logger from db import database diff --git a/services/reactions_service.py b/services/reactions_service.py index d5462d7..87c0980 100644 --- a/services/reactions_service.py +++ b/services/reactions_service.py @@ -1,5 +1,6 @@ -from typing import Optional, Dict, Any, List from datetime import datetime +from typing import Any, Dict, List, Optional + from db import database diff --git a/services/xp_service.py b/services/xp_service.py index d08cfa1..8cf7b31 100644 --- a/services/xp_service.py +++ b/services/xp_service.py @@ -1,10 +1,10 @@ -from lib.constants import CONST import time from typing import Callable, Dict, List, Optional, Tuple from discord.ext import commands from db import database +from lib.constants import CONST class XpService: