From 57f401ee5f4587f42dd9d7a4b4e1399c26b26850 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Oct 2023 23:30:16 +0700 Subject: [PATCH] code reformat --- config.py | 3 ++- db/models.py | 3 ++- db/requests.py | 3 ++- main.py | 4 +++- routes/delete_msg.py | 32 ++++++++++++++++---------------- routes/game_handler.py | 7 ++++--- routes/info_bot.py | 9 ++++----- routes/rewards.py | 3 ++- 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/config.py b/config.py index ee4a7b9..c85ab48 100644 --- a/config.py +++ b/config.py @@ -1,4 +1,5 @@ from vkbottle.user import Message + from main import user TOKEN = "test" @@ -19,5 +20,5 @@ async def edit_message( kwargs.setdefault('dont_parse_links', False) return await user.api.messages.edit( - **kwargs + **kwargs ) diff --git a/db/models.py b/db/models.py index 651db5e..eb2f9ea 100644 --- a/db/models.py +++ b/db/models.py @@ -9,6 +9,7 @@ class Base(DeclarativeBase): class UsersTokens(Base): __tablename__ = "users_tokens" - id = Column("id", BigInteger, Identity(start=1, increment=1, minvalue=1, cycle=False, cache=1), nullable=False, primary_key=True) + id = Column("id", BigInteger, Identity(start=1, increment=1, minvalue=1, cycle=False, cache=1), nullable=False, + primary_key=True) vkid = Column("vkid", BigInteger, nullable=False) token = Column("token", Text, nullable=False) diff --git a/db/requests.py b/db/requests.py index f340804..a5ff858 100644 --- a/db/requests.py +++ b/db/requests.py @@ -1,5 +1,6 @@ from loguru import logger -from sqlalchemy import select, update +from sqlalchemy import select + import db diff --git a/main.py b/main.py index 8d24b1a..b66d2f1 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,11 @@ import asyncio import sys + +from loguru import logger from vkbottle.user import User + import db.requests from routes import labelers -from loguru import logger logger.add(sys.stderr, format="{time} {level} {message}", filter="my_module", level="INFO") user = None diff --git a/routes/delete_msg.py b/routes/delete_msg.py index 859d658..c46416b 100644 --- a/routes/delete_msg.py +++ b/routes/delete_msg.py @@ -17,32 +17,32 @@ DD_SCRIPT = ( @bl.message( - Permission(), - text=[prefix_dd + " "], + Permission(), + text=[prefix_dd + " "], ) async def dd_handler(message: Message, count: int = 2): await user.api.execute( - DD_SCRIPT % ( - count, - message.peer_id, - message.from_id, - int(datetime.datetime.now().timestamp()) - ) + DD_SCRIPT % ( + count, + message.peer_id, + message.from_id, + int(datetime.datetime.now().timestamp()) + ) ) @bl.message( - Permission(), - text=["все", "всё"], + Permission(), + text=["все", "всё"], ) async def dd_all_handler(message: Message): count = 1000 await user.api.execute( - DD_SCRIPT % ( - count, - message.peer_id, - message.from_id, - int(datetime.datetime.now().timestamp()) - ) + DD_SCRIPT % ( + count, + message.peer_id, + message.from_id, + int(datetime.datetime.now().timestamp()) + ) ) diff --git a/routes/game_handler.py b/routes/game_handler.py index 95b1174..11d7fad 100644 --- a/routes/game_handler.py +++ b/routes/game_handler.py @@ -1,15 +1,16 @@ import asyncio + from vkbottle.user import Message, UserLabeler + from config import prefix_bot, edit_message from custom_rules.permission import Permission - bl = UserLabeler(custom_rules=Permission) @bl.message( - Permission(), - text=[prefix_bot + " игра"], + Permission(), + text=[prefix_bot + " игра"], ) async def game(message: Message): loader = ( diff --git a/routes/info_bot.py b/routes/info_bot.py index b7dd033..b4c811b 100644 --- a/routes/info_bot.py +++ b/routes/info_bot.py @@ -1,11 +1,10 @@ -import pytz import git - -from custom_rules.permission import Permission +import pytz from vkbottle.user import Message, UserLabeler -from config import edit_message, prefix_bot -from utils import rewards_list +from config import edit_message, prefix_bot +from custom_rules.permission import Permission +from utils import rewards_list bl = UserLabeler(custom_rules=Permission) diff --git a/routes/rewards.py b/routes/rewards.py index dd100ba..55d6a5e 100644 --- a/routes/rewards.py +++ b/routes/rewards.py @@ -1,6 +1,7 @@ -from custom_rules.permission import Permission from vkbottle.user import Message, UserLabeler + from config import edit_message, prefix_bot +from custom_rules.permission import Permission from utils import rewards_list listToStr = ' '.join(map(str, rewards_list))