From 0793c3a033f80440308b3ddcb2406b7bb5dd9629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Tue, 22 Mar 2022 21:36:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B8=D0=BD=D0=B0=D0=BC=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=84=D0=B0=D0=B9=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 79ced36..b0534f1 100644 --- a/main.py +++ b/main.py @@ -9,6 +9,8 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker from sqlalchemy.exc import IntegrityError from models import Allowed_user, Token, Messages_to_delete, Base +from aiogram.utils.markdown import escape_md + logging.basicConfig(level=logging.INFO) DELAY_TIME = int(os.getenv("GBOT_DELAY_TIME")) @@ -158,27 +160,29 @@ async def send_question(message: types.Message): @dp.message_handler(commands=["get_invite"]) -async def get_invite(message: types.Message): - - if message["from"]["id"] not in ADMINS: - return +@only_admins +async def get_invite(message: types.Message) -> None: token = secrets.token_urlsafe(16) + bot_info = await bot.get_me() + bot_link = "@" + str(bot_info.username) + exp = datetime.now() + timedelta(minutes=5) test = Token(token=token, expire=exp) session.add(test) session.commit() + msg = f"Новый токен: *{token}*\nБудет действителен 5 минут\n\nЧтобы вступить в чат напиши боту {escape_md(bot_link)} \n`/add_me {token}`" await message.reply( - f"Новый токен: *{token}* \nБудет действителен 5 минут\n\nЧтобы вступить в чат напиши боту [@GorgorodBot](https://t.me/GorgorodBot)\n`/add_me {token}`", + msg, reply=False, parse_mode="Markdown", ) @dp.message_handler(commands=["add_me"]) -async def add_me(message: types.Message): +async def add_me(message: types.Message) -> None: """Добавление юзера в чат. Когда бот получает токен, он проверяет его на валидность (есть ли