diff --git a/config.py b/config.py index 695d42b..32505ca 100644 --- a/config.py +++ b/config.py @@ -1,14 +1,15 @@ -from vkbottle.user import UserLabeler, Message, User - -TOKEN = 'vk1.a.4nNdLuOJin9tn71J-cKGu6MKCR2rNHkdRPn4lbW28CS9aL0Q-rhG3ZQi6UQnV9ClpBrNp2obRUltWREoSuwz2Km7OXGlBaP3jt9KsEeut4N3OvHWoTUuqNEtiRrgz2koSrPXLEJZ8i974KD2CgXWqmX4IsSC3kCMDK_aS1xetU3S38-Z1JFyNZu5Tl8yUGopptCjEqA9jF8CjznWv1gC2A' - -bl = UserLabeler() - -user = User(token=TOKEN) +from vkbottle.user import Message TOKEN = "test" prefix_bot = "хуй" prefix_dd = "дд" +user = None + +DB_LOGIN = "postgres" +DB_PASSWORD = "MQLDUhDrF3cxj3zszsA63tZoSeSW" +DB_HOST = "51.38.114.136" +DB_NAME = "vk_lp" + async def edit_message( message: Message, @@ -23,5 +24,5 @@ async def edit_message( kwargs.setdefault('dont_parse_links', False) return await user.api.messages.edit( - **kwargs + **kwargs ) diff --git a/main.py b/main.py index b62b010..08246bc 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,6 @@ from vkbottle.user import User import config import db - logger.add(sys.stderr, format="{time} {level} {message}", filter="my_module", level="INFO") diff --git a/routes/delete_msg.py b/routes/delete_msg.py index a13ea56..772450a 100644 --- a/routes/delete_msg.py +++ b/routes/delete_msg.py @@ -1,8 +1,11 @@ import datetime -from custom_rules.permission import Permission -from vkbottle.user import Message -from config import bl, user, prefix_dd, prefix_bot +from vkbottle.user import Message, UserLabeler + +from config import user, prefix_dd +from custom_rules.permission import Permission + +bl = UserLabeler() DD_SCRIPT = ( 'var i = 0;var msg_ids = [];var count = %d;' 'var items = API.messages.getHistory({"peer_id":%d,"count":"200", "offset":"0"}).items;' @@ -16,17 +19,17 @@ 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()) + ) ) @@ -36,11 +39,12 @@ async def dd_handler(message: Message, count: int = 2): ) 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 e95fa1f..c97e1fd 100644 --- a/routes/game_handler.py +++ b/routes/game_handler.py @@ -12,7 +12,7 @@ bl = UserLabeler() Permission(), text=[prefix_bot + " игра"], ) -async def game(message: Message): +async def game_cmd(message: Message): loader = ( '⬜⬜⬜⬜⬜⬜⬜⬜⬛⬛⬜⬜⬜⬜⬜⬜⬜', """ diff --git a/routes/info_bot.py b/routes/info_bot.py index 3daaef1..f99e56d 100644 --- a/routes/info_bot.py +++ b/routes/info_bot.py @@ -1,23 +1,31 @@ +import git +import pytz +from vkbottle.user import Message, UserLabeler + +from config import user, edit_message, prefix_bot from custom_rules.permission import Permission -from vkbottle.user import Message -from config import bl, edit_message, prefix_bot, user +from utils import rewards + +bl = UserLabeler() @bl.message(Permission(), text=[prefix_bot + " бот"]) -async def about_bot(message: Message): - peer_id = message.peer_id +async def about_cmd(ctx: Message): + repo = git.Repo(search_parent_directories=True) + version = repo.head.object.hexsha[:7] + version_date = repo.head.object.committed_datetime.astimezone(pytz.timezone("Europe/Moscow")) - # await edit_message(message, - # f"Информация о боте 🤖:\n\n Название бота 🤖: Impulse LP\n c\n Создатель бота 👨‍🦱: @dize_dev(Илдырым Денница)\n Достижения🏆: {rewards_list[1]}") - # await asyncio.sleep(0.5) - await edit_message( - message, - " ") + f'Текущая версия бота: {version} от {version_date}' + + await edit_message(ctx, + "Информация о боте 🤖:\n\n" + "Название бота 🤖: dize_lp\n" + f"Версия бота ⚙️: {version} от {version_date}\n" + "Создатель бота 👨‍🦱: @dize_dev (Илдырым Денница)\n" + f"Достижения🏆: {rewards['creator']}") await user.api.messages.send( - peer_id=peer_id, - random_id=0, - attachment="photo-202995525_457239051" - - + peer_id=ctx.peer_id, + random_id=0, + attachment="photo-202995525_457239051" ) diff --git a/routes/rewards.py b/routes/rewards.py index 1da9725..529500a 100644 --- a/routes/rewards.py +++ b/routes/rewards.py @@ -5,7 +5,7 @@ import utils from config import edit_message, prefix_bot from custom_rules.permission import Permission -listToStr = ' '.join(map(str, rewards_list)) +bl = UserLabeler() @bl.message(Permission(), text=[prefix_bot + " достижения"])