PEP

dist.env

@@ -3,10 +3,10 @@
 
 token = "123:adminadmin"
 
-skip_update = False #
+skip_update = True #
-use_webhook = True #
+use_webhook = False #
 #telegram_api_server = "" #
-#permission_file = ""
+#permission_file = "" #
 
 app_host = "127.0.0.1"
 app_port = 2001

filters/__init__.py

@@ -1,6 +1,8 @@
 from load import dp
 
 from .admin import IsAdmin
+from .operator import IsOperator
 
 
 dp.filters_factory.bind(IsAdmin)
+dp.filters_factory.bind(IsOperator)

handlers/__init__.py

@@ -1,3 +1,4 @@
 from . import user
 from . import admin
 from . import callback
+from . import operator

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)
@@ -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,7 +7,6 @@ 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(
@@ -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,6 +4,7 @@ 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)
 async def del_admin(message: types.Message):
     admins = get_full_admin()

handlers/callback/__init__.py

@@ -2,3 +2,4 @@ from . import null
 from . import catalog
 from . import cart
 from . import admin
+from . import operator

handlers/callback/admin/catalog.py

@@ -28,6 +28,7 @@ async def next_item_adm(callback: types.CallbackQuery):
         reply_markup=item_list(count, len(items) - 1, int(data[2]))
     )
 
+
 @dp.callback_query_handler(lambda c: c.data.split("|")[0] == 'delete_post', is_admin=True)
 async def delete_post_adm(callback: types.CallbackQuery):
     data = callback.data.split("|")

handlers/callback/admin/user.py

@@ -1,4 +1,3 @@
-from subprocess import call
 from aiogram import types
 
 from load import dp, messages
@@ -20,6 +19,7 @@ async def next_item_adm(callback: types.CallbackQuery):
     )
     await callback.answer()
 
+
 @dp.callback_query_handler(lambda x: x.data.split("|")[0] == "delete_admin")
 async def delete_admin(callback: types.CallbackQuery):
     data = callback.data.split("|")

handlers/callback/cart.py

@@ -11,7 +11,8 @@ from keyboard.default.main_menu import back_to_main_menu
 
 @dp.callback_query_handler(lambda c: c.data.split("|")[0] == "add_to_cart")
 async def add_cart(callback: types.CallbackQuery):
-    item_id = callback.data.split("|")[1]
+    item = int(callback.data.split("|")[1])
+    item_id = Catalog.get_catalog()[item]["id"]
     add_to_cart(callback.from_user.id, item_id)
     await callback.answer("Товар добавлен!")
 

handlers/callback/catalog.py

@@ -26,4 +26,3 @@ async def next_item(callback: types.CallbackQuery):
         ),
         reply_markup=item_list(count, len(items)-1, int(data[2]))
     )
-

handlers/callback/null.py

@@ -2,6 +2,7 @@ from aiogram.types import CallbackQuery
 
 from load import dp
 
+
 @dp.callback_query_handler(lambda c: c.data == "null")
 async def null(callback: CallbackQuery):
     await callback.answer()

handlers/user/__init__.py

@@ -3,3 +3,4 @@ from . import catalog
 from . import cart
 from . import checkout
 from . import ordering
+from . import support

handlers/user/checkout.py

@@ -22,14 +22,14 @@ async def checkout(message:types.Message):
     await UserState.confirm.set()
 
 
-@dp.message_handler(lambda x: x.text == messages.all_right_message)
+@dp.message_handler(lambda x: x.text == messages.all_right_message, state="save_or_continue")
-async def continue_user_form(message: types.Message):
+async def continue_user_form():
     pass
 
 
-@dp.message_handler(lambda x: x.text == messages.save_and_continue, state="*")
+@dp.message_handler(lambda x: x.text == messages.save_and_continue, state="save_or_continue")
 async def save_user_info(message: types.Message):
     state = dp.current_state(chat=message.chat.id, user=message.from_user.id)
     info = await state.get_data()
     save_info(user_id=message.from_user.id, **info)
-    await continue_user_form(message)
+    await continue_user_form()

handlers/user/ordering.py

@@ -20,24 +20,23 @@ async def confirm(message: types.Message, state: FSMContext):
         "Может у вас есть сохраненные данные?",
         reply_markup=load_info(bool(info))
     )
-    await Checkout.loaded.set()
+    await state.set_state(state="load_data")
 
 
-@dp.message_handler(lambda x: x.text == messages.load_data, state=Checkout.loaded)
+@dp.message_handler(lambda x: x.text == messages.load_data, state="load_data")
 async def load_form(message: types.message, state: FSMContext):
     info = get_info(message.from_user.id)
     await state.update_data(
-        loaded=True,
         first_name=info["first_name"],
         last_name=info["last_name"],
         phone_number=info["phone_number"],
         address=info["address"]
     )
     await bot.send_message(message.chat.id, "Ваши данные загружены!", reply_markup=continue_btn)
-    await Checkout.finish.set()
+    await state.set_state("finish_send_form")
 
 
-@dp.message_handler(lambda x: x.text == messages.rewrite_data, state=Checkout.loaded)
+@dp.message_handler(lambda x: x.text == messages.rewrite_data, state="load_data")
 async def new_form(message: types.Message, state: FSMContext = None):
     await state.update_data(loaded=False)
     await bot.send_message(
@@ -75,24 +74,26 @@ async def form_first_name(message: types.Message, state: FSMContext):
 async def form_phone(message: types.Message, state: FSMContext):
     if message.contact is not None:
         phone = message.contact.phone_number
-    else: phone=message.text
+    else:
-    if len(phone) in [10,12,13]:
+        phone = message.text
+    if len(phone) not in [10, 12, 13]:
+        await bot.send_message(message.chat.id, "Номер телефона не правильный!")
+        await Checkout.phone_number.set()
+        return
+
     await state.update_data(phone_number=phone)
     await bot.send_message(message.chat.id, "Отправте адрес доставки", reply_markup=cancel_btn)
     await Checkout.address.set()
-    else: 
-        await bot.send_message(message.chat.id, "Номер телефона не правильный!")
-        await Checkout.phone_number.set()
 
 
 @dp.message_handler(state=Checkout.address)
 async def form_address(message: types.Message, state: FSMContext):
     await state.update_data(address=message.text)
-    await bot.send_message(message.chat.id, "Отлично заявка заполнена!", reply_markup=continue_btn)
+    await bot.send_message(message.chat.id, "Отлично, заявка заполнена!", reply_markup=continue_btn)
-    await Checkout.finish.set()
+    await state.set_state("finish_send_form")
 
 
-@dp.message_handler(state=Checkout.finish)
+@dp.message_handler(state="finish_send_form")
 async def finish_form(message: types.Message, state: FSMContext):
     data = await state.get_data()
 
@@ -106,3 +107,4 @@ async def finish_form(message: types.Message, state: FSMContext):
         text,
         reply_markup=confirm_all_info()
     )
+    await state.set_state("save_or_continue")

handlers/user/start.py

@@ -18,6 +18,7 @@ async def start(message: types.Message):
         reply_markup=main_menu(admin=is_bot_admin, operator=is_operator)
     )
 
+
 @dp.message_handler(lambda x: x.text == messages.back)
 async def back_to_menu(message: types.Message):
     is_bot_admin = message.from_user.id in get_admins()
@@ -40,7 +41,7 @@ async def cancel(message: types.Message):
 async def userinfo(message: types.Message):
     await bot.send_message(
         message.chat.id,
-        ("User_id: <code>{user_id}</code>").format(user_id=message.from_user.id),
+        "User_id: <code>{user_id}</code>".format(user_id=message.from_user.id),
         parse_mode="HTML"
     )
 

keyboard/default/checkout.py

@@ -2,12 +2,14 @@ from aiogram.types.reply_keyboard import ReplyKeyboardMarkup, KeyboardButton
 
 from load import messages
 
+
 def checkout_btn() -> ReplyKeyboardMarkup:
     return ReplyKeyboardMarkup([[
         KeyboardButton(messages.all_right_message),
         KeyboardButton(messages.cancel_message)
     ]], resize_keyboard=True)
 
+
 def confirm_all_info():
     markup = ReplyKeyboardMarkup(resize_keyboard=True)
     markup.add(KeyboardButton(messages.all_right_message))

keyboard/default/main_menu.py

@@ -13,10 +13,11 @@ def main_menu(admin=False, operator=False):
         ],
         resize_keyboard=True
     ).add(KeyboardButton(messages.info))
-    if admin == True:
+
+    if admin:
         markup.add(KeyboardButton(messages.admin_panel))
 
-    if operator == True:
+    if operator:
         markup.add(KeyboardButton(messages.operator_panel))
 
     return markup
@@ -30,6 +31,7 @@ def cart_btn(is_empty=True):
     markup.add(KeyboardButton(messages.back))
     return markup
 
+
 back_to_main_menu = ReplyKeyboardMarkup(keyboard=[[KeyboardButton(messages.back)]], resize_keyboard=True)
 cancel_btn = ReplyKeyboardMarkup([[KeyboardButton(messages.cancel_message)]], resize_keyboard=True)
 get_phone_number = ReplyKeyboardMarkup(

keyboard/default/ordering.py

@@ -2,6 +2,7 @@ from aiogram.types.reply_keyboard import ReplyKeyboardMarkup, KeyboardButton
 
 from load import messages
 
+
 def load_info(data:bool = False):
     markup = ReplyKeyboardMarkup(resize_keyboard=True)
     if data:

keyboard/inline/admin/catalog.py

@@ -3,22 +3,20 @@ from aiogram.types.inline_keyboard import InlineKeyboardMarkup, InlineKeyboardBu
 from load import messages
 
 
-def item_list(item=0, items:int=1, user_count:int=1) -> InlineKeyboardMarkup:
+def item_list(item: int = 0, items: int = 1, user_count: int = 1) -> InlineKeyboardMarkup:
     markup = InlineKeyboardMarkup()
     default = [
-        InlineKeyboardButton(user_count, callback_data='null')
+        InlineKeyboardButton(str(user_count), callback_data='null')
     ]
     back = ['⬅️', f"adm_prev|{item-1}|{user_count-1}"]
     next = ['➡️', f"adm_next|{item+1}|{user_count+1}"]
 
-
     if items < 1 or item >= items:
         next = [" ", "null"]
     
     if item == 0:
         back = [" ", "null"]
 
-
     default.append(InlineKeyboardButton(next[0], callback_data=next[1]))
 
     markup.add(InlineKeyboardButton(back[0], callback_data=back[1]), *default)

keyboard/inline/admin/user.py

@@ -1,22 +1,21 @@
 from aiogram.types.inline_keyboard import InlineKeyboardButton, InlineKeyboardMarkup
 from load import messages
 
-def item_list(item=0, items:int=1, user_count:int=1) -> InlineKeyboardMarkup:
+
+def item_list(item: int = 0, items: int = 1, user_count: int = 1) -> InlineKeyboardMarkup:
     markup = InlineKeyboardMarkup()
     default = [
-        InlineKeyboardButton(user_count, callback_data='null')
+        InlineKeyboardButton(str(user_count), callback_data='null')
     ]
     back = ['⬅️', f"admin_prev|{item-1}|{user_count-1}"]
     next = ['➡️', f"admin_next|{item+1}|{user_count+1}"]
 
-
     if items < 1 or item >= items:
         next = [" ", "null"]
     
     if item == 0:
         back = [" ", "null"]
 
-
     default.append(InlineKeyboardButton(next[0], callback_data=next[1]))
 
     markup.add(InlineKeyboardButton(back[0], callback_data=back[1]), *default)

keyboard/inline/cart.py

@@ -2,15 +2,15 @@ from aiogram.types.inline_keyboard import InlineKeyboardMarkup, InlineKeyboardBu
 
 from load import messages
 
-def cart_list(item=0, items:int=1) -> InlineKeyboardMarkup:
+
+def cart_list(item:int = 0, items: int = 1) -> InlineKeyboardMarkup:
     markup = InlineKeyboardMarkup()
     default = [
-        InlineKeyboardButton(item+1, callback_data='null')
+        InlineKeyboardButton(str(item+1), callback_data='null')
     ]
     back = ['⬅️', f"cart_prev|{item-1}"]
     next = ['➡️', f"cart_next|{item+1}"]
 
-
     if items < 1 or item >= items:
         next = [" ", "null"]
     

keyboard/inline/catalog.py

@@ -3,15 +3,14 @@ from aiogram.types.inline_keyboard import InlineKeyboardMarkup, InlineKeyboardBu
 from load import messages
 
 
-def item_list(item=0, items:int=1, user_count:int=1) -> InlineKeyboardMarkup:
+def item_list(item: int = 0, items: int = 1, user_count: int = 1) -> InlineKeyboardMarkup:
     markup = InlineKeyboardMarkup()
     default = [
-        InlineKeyboardButton(user_count, callback_data='null')
+        InlineKeyboardButton(str(user_count), callback_data='null')
     ]
     back = ['⬅️', f"prev|{item-1}|{user_count-1}"]
     next = ['➡️', f"next|{item+1}|{user_count+1}"]
 
-
     if items < 1 or item >= items:
         next = [" ", "null"]
     

keyboard/inline/checkout.py

@@ -1,15 +1,14 @@
 from aiogram.types.inline_keyboard import InlineKeyboardMarkup, InlineKeyboardButton
 
 
-def cart_list(item=0, items:int=1) -> InlineKeyboardMarkup:
+def cart_list(item: int = 0, items: int = 1) -> InlineKeyboardMarkup:
     markup = InlineKeyboardMarkup()
     default = [
-        InlineKeyboardButton(item+1, callback_data='null')
+        InlineKeyboardButton(str(item+1), callback_data='null')
     ]
     back = ['⬅️', f"cart_prev|{item-1}"]
     next = ['➡️', f"cart_next|{item+1}"]
 
-
     if items < 1 or item >= items:
         next = [" ", "null"]
     

load.py

@@ -10,7 +10,6 @@ from playhouse.db_url import connect
 import config
 from utils import messages  # used, do not delete!
 
-
 # Bot init
 bot = Bot(
     token=config.token,

state/checkout.py

@@ -1,11 +1,8 @@
 from aiogram.dispatcher.filters.state import StatesGroup, State
 
+
 class Checkout(StatesGroup):
     first_name = State()
     last_name = State()
     phone_number = State()
     address = State()
-
-    loaded = State()
-    finish = State()
-    

state/post.py

@@ -1,9 +1,8 @@
 from aiogram.dispatcher.filters.state import StatesGroup, State
 
+
 class Post(StatesGroup):
     name = State()
     description = State()
     price = State()
     image = State()
-
-    finish = State()

state/state.py

@@ -1,5 +1,6 @@
 from aiogram.dispatcher.filters.state import StatesGroup, State
 
+
 class UserState(StatesGroup):
     confirm = State()
 

utils/database/base.py

@@ -14,6 +14,7 @@ def get_operator():
         users.append(i.user_id)
     return users
 
+
 def get_full_admin():
     usr = []
     for i in Admin.select():
@@ -28,3 +29,10 @@ def get_full_admin():
 
 def del_admin(user_id:int):
     Admin.delete().where(Admin.user_id == user_id).execute()
+
+
+def get_active_operator():
+    usr = []
+    for i in Operator.select().where(Operator.active==True):
+        usr.append(i.user_id)
+    return usr

utils/database/cart.py

@@ -16,6 +16,7 @@ def del_from_cart(user_id: int, item_id: int):
 def clean_cart(user_id: int):
     Cart.delete().where(Cart.user_id==user_id).execute()
 
+
 def get_user_cart(user_id:int):
     cart = []
     for i in Cart.select().where(Cart.user_id == user_id):

utils/database/market.py

@@ -1,10 +1,9 @@
-from ast import Mod
 import typing as t
 
 from .model import Catalog as Model
 
 
-class Catalog():
+class Catalog:
     @staticmethod
     def __get_item(item_id: int) -> dict:
         item = {}
@@ -23,18 +22,17 @@ class Catalog():
         return item
     
     @classmethod
-    def get_catalog(self, item_id:int = None, get_count:bool = False) -> t.Union[list, dict]:
+    def get_catalog(cls, item_id:int = None, get_count:bool = False) -> t.Union[list, dict]:
         if item_id:
             if get_count:
-                return self.__get_item(item_id), Model.select().count()
+                return cls.__get_item(item_id), Model.select().count()
-            return self.__get_item(item_id)
+            return cls.__get_item(item_id)
 
         items = []
         for i in Model.select():
-            items.append(self.__get_item(i.id))
+            items.append(cls.__get_item(i.id))
         return items
     
-    
     @staticmethod
     def delete_post(item_id: int):
         return Model.delete_by_id(item_id)

utils/database/model.py

@@ -1,11 +1,11 @@
 from peewee import (Model, BigIntegerField, TextField, BlobField, 
-                    IntegerField, CharField, FloatField, ForeignKeyField)
+                    IntegerField, CharField, FloatField, BooleanField)
 
 from load import db
 
 
 class BaseModel(Model):
-    '''Base model. Abstract Class'''
+    """Base model. Abstract Class"""
     class Meta:
         database = db
 
@@ -22,7 +22,7 @@ class Admin(User):
 
 
 class Operator(User):
-    pass
+    active = BooleanField(default=False)
 
 
 class Catalog(BaseModel):
@@ -45,4 +45,5 @@ class UserInfo(BaseModel):
     phone_number = CharField(15)
     address = TextField()
 
+
 db.create_tables([Cart, Catalog, Operator, Admin, User, UserInfo])

utils/database/ordering.py

@@ -10,6 +10,7 @@ def save_info(user_id: int, last_name:str, first_name:str, phone_number:str, add
         address=address
     ).on_conflict_replace().execute()
 
+
 def get_info(user_id: int):
     output = None
     if UserInfo.select().where(UserInfo.user_id == user_id).exists():

utils/database/user.py

@@ -9,7 +9,7 @@ from utils import types
 class Register:
 
     @classmethod
-    def __register_user(self, model: Model, user: UserType):
+    def __register_user(cls, model: Model, user: UserType):
         model.insert(
             user_id=user.id,
             first_name=user.first_name,
@@ -18,16 +18,16 @@ class Register:
         ).on_conflict_replace().execute()
     
     @classmethod
-    def register_user(self, user: UserType):
+    def register_user(cls, user: UserType):
-        return self.__register_user(UserModel, user)
+        return cls.__register_user(UserModel, user)
     
     @classmethod
-    def register_admin(self, user: UserType):
+    def register_admin(cls, user: UserType):
-        return self.__register_user(Admin, user)
+        return cls.__register_user(Admin, user)
 
     @classmethod
-    def register_operator(self, user: UserType):
+    def register_operator(cls, user: UserType):
-        return self.__register_user(Operator, user)
+        return cls.__register_user(Operator, user)
 
 
 class User:
@@ -43,3 +43,15 @@ class User:
             last_name=data.last_name,
             username=data.username
         )
+    
+    @staticmethod
+    def get_state(user_id:int):
+        if Operator.select().where(Operator.user_id == user_id).exists():
+            return Operator.get(Operator.user_id == user_id).active
+        return False
+    
+    @staticmethod
+    def set_state(user_id:int, state:bool=False):
+        if Operator.select().where(Operator.user_id == user_id).exists():
+            Operator.update(active=state).where(Operator.user_id == user_id).execute()
+        return None

utils/helper.py

@@ -3,6 +3,7 @@ import typing as t
 
 from load import bot, config
 
+
 async def download_file(file_path, *args, **kw) -> t.Union[io.BytesIO, t.Any]:
     if config.telegram_api_server == "https://api.telegram.org":
         return await bot.download_file(file_path, *args, **kw)

utils/json/model.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel
 
+
 class Permission(BaseModel):
     can_admin_add_admins: bool
     can_admin_del_admins: bool

utils/messages.py

@@ -19,6 +19,9 @@ continue_ = "Продолжить"
 rewrite_data = "Ввести заново"
 load_data = "Загрузить данные"
 
+#Operator
+on_work = "Активировать"
+leave_work = "Выключить"
 
 #Admins \ Moder
 admin_panel = "Админ панель"

utils/types.py

@@ -2,22 +2,22 @@ import typing as t
 from abc import ABC
 
 
-class BaseUserFileds(ABC):
+class BaseUser(ABC):
     id: int
     first_name: str
     last_name: t.Union[str, None] = None
     username: t.Union[str, None] = None
 
 
-class User(BaseUserFileds):
+class User(BaseUser):
 
-    def __new__(self, **kw):
+    def __new__(cls, **kw):
         if "user_id" in kw:
-            self.id = kw["user_id"]
+            cls.id = kw["user_id"]
         if "first_name" in kw:
-            self.first_name = kw["first_name"]
+            cls.first_name = kw["first_name"]
         if "last_name" in kw:
-            self.last_name = kw["last_name"]
+            cls.last_name = kw["last_name"]
         if "username" in kw:
-            self.username = kw["username"]
+            cls.username = kw["username"]
-        return self
+        return cls