From d09604dd4b1d593b87f256939789c3922d853631 Mon Sep 17 00:00:00 2001 From: djimbo Date: Mon, 15 Aug 2022 09:06:26 +0300 Subject: [PATCH] Update --- main.py | 2 +- tgbot/routers/admin/admin_menu.py | 2 +- tgbot/services/api_sqlite.py | 2 +- tgbot/utils/const_functions.py | 5 ++--- tgbot/utils/misc/bot_commands.py | 2 +- tgbot/utils/misc/bot_filters.py | 2 +- tgbot/utils/misc/bot_logging.py | 2 +- tgbot/utils/misc_functions.py | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index c34d51f..667c01a 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,7 @@ import sys import colorama from aiogram import Bot, Dispatcher -from tgbot.config import BOT_TOKEN, scheduler, get_admins +from tgbot.data.config import BOT_TOKEN, scheduler, get_admins from tgbot.middlewares import register_all_middlwares from tgbot.routers import register_all_routers from tgbot.services.api_session import RequestsSession diff --git a/tgbot/routers/admin/admin_menu.py b/tgbot/routers/admin/admin_menu.py index 03801b1..011716f 100644 --- a/tgbot/routers/admin/admin_menu.py +++ b/tgbot/routers/admin/admin_menu.py @@ -2,7 +2,7 @@ from aiogram import Router, Bot from aiogram.types import FSInputFile, Message -from tgbot.config import PATH_DATABASE, PATH_LOGS +from tgbot.data.config import PATH_DATABASE, PATH_LOGS from tgbot.data.config import PATH_DATABASE, PATH_LOGS from tgbot.keyboards.inline_misc import admin_inl from tgbot.keyboards.reply_misc import admin_rep diff --git a/tgbot/services/api_sqlite.py b/tgbot/services/api_sqlite.py index c96985c..1ca9993 100644 --- a/tgbot/services/api_sqlite.py +++ b/tgbot/services/api_sqlite.py @@ -1,7 +1,7 @@ # - *- coding: utf- 8 - *- import sqlite3 -from tgbot.config import PATH_DATABASE +from tgbot.data.config import PATH_DATABASE from tgbot.utils.const_functions import get_unix, get_date diff --git a/tgbot/utils/const_functions.py b/tgbot/utils/const_functions.py index bca6e9f..0bbde7f 100644 --- a/tgbot/utils/const_functions.py +++ b/tgbot/utils/const_functions.py @@ -5,12 +5,11 @@ from datetime import datetime from aiogram import Bot, types from aiogram.types import InlineKeyboardButton, KeyboardButton +from tgbot.data.config import get_admins + ######################################## AIOGRAM ######################################## # Генерация реплай кнопки -from tgbot.config import get_admins - - def rkb(text): return KeyboardButton(text=text) diff --git a/tgbot/utils/misc/bot_commands.py b/tgbot/utils/misc/bot_commands.py index 239f0b8..a584cbc 100644 --- a/tgbot/utils/misc/bot_commands.py +++ b/tgbot/utils/misc/bot_commands.py @@ -2,7 +2,7 @@ from aiogram import Bot from aiogram.types import BotCommand, BotCommandScopeChat, BotCommandScopeDefault -from tgbot.config import get_admins +from tgbot.data.config import get_admins # Команды для юзеров user_commands = [ diff --git a/tgbot/utils/misc/bot_filters.py b/tgbot/utils/misc/bot_filters.py index 59668af..271c37e 100644 --- a/tgbot/utils/misc/bot_filters.py +++ b/tgbot/utils/misc/bot_filters.py @@ -2,7 +2,7 @@ from aiogram.dispatcher.filters import BaseFilter from aiogram.types import Message -from tgbot.config import get_admins +from tgbot.data.config import get_admins # Проверка на админа diff --git a/tgbot/utils/misc/bot_logging.py b/tgbot/utils/misc/bot_logging.py index ff27b7e..1246e97 100644 --- a/tgbot/utils/misc/bot_logging.py +++ b/tgbot/utils/misc/bot_logging.py @@ -3,7 +3,7 @@ import logging as bot_logger import colorlog -from tgbot.config import PATH_LOGS +from tgbot.data.config import PATH_LOGS # Формат логгирования log_formatter_file = bot_logger.Formatter("%(levelname)s | %(asctime)s | %(filename)s:%(lineno)d | %(message)s") diff --git a/tgbot/utils/misc_functions.py b/tgbot/utils/misc_functions.py index 15c70f2..3eef745 100644 --- a/tgbot/utils/misc_functions.py +++ b/tgbot/utils/misc_functions.py @@ -2,7 +2,7 @@ from aiogram import Bot from aiogram.types import FSInputFile -from tgbot.config import get_admins, PATH_DATABASE +from tgbot.data.config import get_admins, PATH_DATABASE from tgbot.utils.const_functions import get_date, send_admins