Skip to content

Commit

Permalink
isort
Browse files Browse the repository at this point in the history
  • Loading branch information
salko-ua committed Jan 3, 2024
1 parent 7cdb97a commit edb5243
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 25 deletions.
4 changes: 3 additions & 1 deletion control_db/premium_operations.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from control_db.create_db import BaseDBPart
from datetime import datetime, timedelta
from typing import Iterable

from aiosqlite import Row

from control_db.create_db import BaseDBPart


class PremiumOperations(BaseDBPart):
async def update_premium_operations(
Expand Down
6 changes: 4 additions & 2 deletions control_db/premium_user.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
from control_db.create_db import BaseDBPart
from typing import Iterable

from aiosqlite import Row
from dateutil.relativedelta import relativedelta

from control_db.create_db import BaseDBPart


class PremiumUser(BaseDBPart):
Expand Down
5 changes: 3 additions & 2 deletions handlers/admin.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import asyncio

from aiogram import Bot, F, Router
from aiogram.filters import Command
from aiogram.filters.state import State, StatesGroup
from aiogram.fsm.context import FSMContext
from aiogram.types import CallbackQuery, Message
import asyncio

from config import ADMINS
from control_db import Database
from keyboards.admin import send_alarm, admin_kb
from keyboards.admin import admin_kb, send_alarm
from keyboards.menu import hide_kb
from main import bot

Expand Down
4 changes: 2 additions & 2 deletions handlers/payments.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from aiogram import F, Router
from aiogram.types import CallbackQuery

from main import bot
from config import MERCHANT_ACCOUNT, MERCHANT_DOMAIN_NAME, SECRET_KEY
from control_db import Database
from keyboards.menu import hide_kb
from keyboards.premium import buy_url
from config import SECRET_KEY, MERCHANT_ACCOUNT, MERCHANT_DOMAIN_NAME
from main import bot

router = Router()

Expand Down
12 changes: 7 additions & 5 deletions handlers/task.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from main import scheduler
import aiohttp
from handlers.payments import check_status_invoice, get_payment_info
from control_db import Database
import asyncio
from datetime import datetime, timedelta

import aiohttp

from config import MERCHANT_ACCOUNT
import asyncio
from control_db import Database
from handlers.payments import check_status_invoice, get_payment_info
from main import scheduler


async def check_all_invoice(lock):
Expand Down
8 changes: 2 additions & 6 deletions keyboards/admin.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
from aiogram.types import (
InlineKeyboardButton,
InlineKeyboardMarkup,
KeyboardButton,
ReplyKeyboardMarkup,
)
from aiogram.types import (InlineKeyboardButton, InlineKeyboardMarkup,
KeyboardButton, ReplyKeyboardMarkup)
from aiogram.utils.keyboard import InlineKeyboardBuilder, ReplyKeyboardBuilder


Expand Down
6 changes: 3 additions & 3 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

from aiogram import Bot, Dispatcher
from apscheduler.schedulers.asyncio import AsyncIOScheduler
from middleware import CheckConnectioError, CheckPrivateChat
from config import TOKEN

from config import TOKEN
from middleware import CheckConnectioError, CheckPrivateChat

bot = Bot(token=TOKEN, parse_mode="HTML")
scheduler = AsyncIOScheduler(timezone="Europe/Kiev")
dp = Dispatcher()

from handlers import admin, menu, parsing, telegram, payments, task
from handlers import admin, menu, parsing, payments, task, telegram


async def register_handlers():
Expand Down
8 changes: 4 additions & 4 deletions middleware.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Callable, Dict, Any, Awaitable
from aiogram import BaseMiddleware
from aiogram.types import TelegramObject, CallbackQuery, Message
from typing import Any, Awaitable, Callable, Dict

import aiohttp
from aiogram import F
from aiogram import BaseMiddleware, F
from aiogram.types import CallbackQuery, Message, TelegramObject


class CheckConnectioError(BaseMiddleware):
Expand Down

0 comments on commit edb5243

Please sign in to comment.