From 29246e7b97b3eb89ff99da8c23cc2d096de2126c Mon Sep 17 00:00:00 2001 From: bacon Date: Mon, 18 Mar 2024 00:19:14 +0300 Subject: [PATCH] fixed start after move --- bot/cogs/admin.py | 8 ++++---- bot/cogs/audio.py | 6 +++--- bot/cogs/disabled/funny.py | 4 ++-- bot/cogs/disabled/test.py | 4 ++-- bot/cogs/general.py | 2 +- bot/cogs/info.py | 6 +++--- bot/lib/CogsPrep.py | 3 ++- requirements.txt | 2 +- tests/test_bot.py | 1 - 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bot/cogs/admin.py b/bot/cogs/admin.py index 443fadd..5be1e4d 100644 --- a/bot/cogs/admin.py +++ b/bot/cogs/admin.py @@ -2,11 +2,11 @@ from asyncio import sleep import disnake from disnake import Option, OptionType, Localized -from disnake.ext import commands, tasks +from disnake.ext import tasks -from bot.lib.Comands import read_json, write_json -from bot.lib.DB_Worker import fill_bd, prepare_db, work_with_db -from bot.lib.Logger import logger +from lib.Comands import * +from lib.DB_Worker import fill_bd, prepare_db, work_with_db +from lib.Logger import logger class Admin(commands.Cog, name='Admin'): diff --git a/bot/cogs/audio.py b/bot/cogs/audio.py index eb45019..f07dacf 100644 --- a/bot/cogs/audio.py +++ b/bot/cogs/audio.py @@ -4,9 +4,9 @@ import disnake from disnake import OptionChoice, Option, OptionType, Member, VoiceState from disnake.ext import commands -from bot.lib.ListGenerator import ListGenerator -from bot.lib.Logger import logger -from bot.lib.Player import play_audio +from lib.ListGenerator import ListGenerator +from lib.Logger import logger +from lib.Player import play_audio class Audio(commands.Cog, name='Audio'): diff --git a/bot/cogs/disabled/funny.py b/bot/cogs/disabled/funny.py index cc54658..80a5413 100644 --- a/bot/cogs/disabled/funny.py +++ b/bot/cogs/disabled/funny.py @@ -4,8 +4,8 @@ import disnake from disnake import OptionChoice from disnake.ext import commands -from bot.lib.Comands import write_json -from bot.lib.Logger import logger +from lib.Comands import write_json +from lib.Logger import logger class Fun(commands.Cog, name='Fun'): diff --git a/bot/cogs/disabled/test.py b/bot/cogs/disabled/test.py index 259ce02..e835b45 100644 --- a/bot/cogs/disabled/test.py +++ b/bot/cogs/disabled/test.py @@ -2,8 +2,8 @@ import disnake from disnake import Option from disnake.ext import commands -from bot.lib import YandexPlayer -from bot.lib.Logger import logger +from lib import YandexPlayer +from lib.Logger import logger class Testing(commands.Cog, name='Testing'): diff --git a/bot/cogs/general.py b/bot/cogs/general.py index 8cd64bb..ed1ebdf 100644 --- a/bot/cogs/general.py +++ b/bot/cogs/general.py @@ -2,7 +2,7 @@ import disnake from disnake import Option, OptionType, Colour from disnake.ext import commands -from bot.lib.Logger import logger +from lib.Logger import logger class General(commands.Cog): diff --git a/bot/cogs/info.py b/bot/cogs/info.py index 5dd7edf..4cbe854 100644 --- a/bot/cogs/info.py +++ b/bot/cogs/info.py @@ -5,9 +5,9 @@ import psutil from disnake import ApplicationCommandInteraction from disnake.ext import commands -from bot.__init__ import version_info as ver -from bot.lib.Comands import determine_prefix -from bot.lib.Logger import logger +from __init__ import version_info as ver +from lib.Comands import determine_prefix +from lib.Logger import logger class BotInfo(commands.Cog, name='Bot Info'): diff --git a/bot/lib/CogsPrep.py b/bot/lib/CogsPrep.py index 9976ac4..a6c102d 100644 --- a/bot/lib/CogsPrep.py +++ b/bot/lib/CogsPrep.py @@ -7,13 +7,14 @@ work_with_cogs: loads, reloads and unloads cogs files """ from os import listdir, rename +from typing import List from disnake.ext.commands.interaction_bot_base import InteractionBotBase from .Logger import logger -def cog_list(fold: str = './cogs') -> list: +def cog_list(fold: str = './cogs') -> List[str]: cogs_list = [] for _filename in listdir(fold): if _filename.endswith('.py'): diff --git a/requirements.txt b/requirements.txt index fe42ea2..e8c7884 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -disnake[audio] +disnake psutil python-dotenv pytest diff --git a/tests/test_bot.py b/tests/test_bot.py index 77f6b4f..11aff7f 100644 --- a/tests/test_bot.py +++ b/tests/test_bot.py @@ -1,7 +1,6 @@ from disnake import Intents from disnake.ext import commands - intents = Intents(messages=True, message_content=True, )