PEP

handlers/admin/add_post.py

@@ -1,15 +1,13 @@
-import io
-
 from aiogram import types
-from aiogram.types import ContentType
 from aiogram.dispatcher import FSMContext
+from aiogram.types import ContentType
 
-from load import bot, dp, messages
-from utils.helper import download_file
 from keyboard.default.admin.main_menu import base_menu, continue_btn, all_right
 from keyboard.default.main_menu import back_to_main_menu
+from load import bot, dp, messages
 from state.post import Post
 from utils.database.market import add_item
+from utils.helper import download_file
 
 
 @dp.message_handler(lambda x: x.text == messages.add_post, is_admin=True)
@@ -37,7 +35,7 @@ async def admin_form_desk(message: types.Message, state: FSMContext):
 
 @dp.message_handler(is_admin=True, state=Post.price)
 async def admin_form_price(message: types.message, state: FSMContext):
-    if not message.text.replace('.','').replace(',', '').isdigit():
+    if not message.text.replace('.', '').replace(',', '').isdigit():
         await Post.price.set()
     await state.update_data(price=float(message.text.replace(",", ".")))
     await bot.send_message(message.chat.id, "Отправьте фото товара")
@@ -45,7 +43,7 @@ async def admin_form_price(message: types.message, state: FSMContext):
 
 
 @dp.message_handler(is_admin=True, state=Post.image, content_types=[ContentType.PHOTO])
-async def admin_form_image(message:types.Message, state: FSMContext):
+async def admin_form_image(message: types.Message, state: FSMContext):
     file_id = message.photo[-1].file_id
     file_info = await bot.get_file(file_id)
     photo = await download_file(file_info.file_path)
@@ -55,10 +53,10 @@ async def admin_form_image(message:types.Message, state: FSMContext):
         "Все данные для поста были заполнены",
         reply_markup=continue_btn
     )
-    await Post.finish.set()
+    await state.set_state("finish_post")
 
 
-@dp.message_handler(lambda x:x.text == messages.continue_, state=Post.finish, is_admin=True)
+@dp.message_handler(lambda x: x.text == messages.continue_, state="finish_post", is_admin=True)
 async def finish(message: types.Message, state: FSMContext):
     data = await state.get_data()
     await bot.send_photo(
@@ -73,7 +71,8 @@ async def finish(message: types.Message, state: FSMContext):
         parse_mode='Markdown'
     )
 
-@dp.message_handler(lambda x: x.text == messages.all_right_message, is_admin=True, state=Post.finish)
+
+@dp.message_handler(lambda x: x.text == messages.all_right_message, is_admin=True, state="finish_post")
 async def write_on_db(message: types.Message, state: FSMContext):
     data = await state.get_data()
     add_item(**data)

handlers/admin/panel.py

@@ -7,4 +7,3 @@ from keyboard.default.admin.main_menu import main_menu
 @dp.message_handler(lambda x: x.text == messages.admin_panel, is_admin=True)
 async def cmd_menu(message: types.Message):
     await bot.send_message(message.chat.id, "Admin panel", reply_markup=main_menu())
-

handlers/admin/user_control/adding.py

@@ -7,13 +7,12 @@ from keyboard.default.admin.main_menu import base_menu
 from keyboard.default.main_menu import back_to_main_menu
 
 
-
 @dp.message_handler(lambda x: x.text == messages.add_admin, is_admin=True)
 async def add_admin(message: types.Message):
     await bot.send_message(
         message.chat.id,
         ("Отправьте user_id пользователя\n"
-        "Его можно узнать зайдя в информацию о пользователе"),
+         "Его можно узнать зайдя в информацию о пользователе"),
         reply_markup=base_menu()
     )
     await AddUser.user_id.set()
@@ -34,4 +33,3 @@ async def add_admin1(message: types.Message, state):
         return
     Register.register_admin(user)
     await bot.send_message(message.chat.id, "Администратор добавлен!", reply_markup=back_to_main_menu)
-

handlers/admin/user_control/delete.py

@@ -4,7 +4,8 @@ from load import dp, bot, messages
 from keyboard.inline.admin.user import item_list
 from utils.database.base import get_full_admin
 
-@dp.message_handler(lambda x: x.text==messages.del_admin, is_admin=True)
+
+@dp.message_handler(lambda x: x.text == messages.del_admin, is_admin=True)
 async def del_admin(message: types.Message):
     admins = get_full_admin()
     admin = admins[0]
@@ -13,5 +14,5 @@ async def del_admin(message: types.Message):
         message.chat.id,
         result,
         parse_mode="Markdown",
-        reply_markup=item_list(items=len(admins)-1)
+        reply_markup=item_list(items=len(admins) - 1)
     )