xync-bot 0.0.8__tar.gz → 0.0.9__tar.gz

{xync-bot-0.0.8 → xync-bot-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-bot
-Version: 0.0.8
+Version: 0.0.9
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

{xync-bot-0.0.8 → xync-bot-0.0.9}/pyproject.toml

@@ -15,11 +15,11 @@ dependencies = [
     "tortoise-api-model",
     "python-wireguard"
 ]
-version = "0.0.8"
+version = "0.0.9"
 
 [project.urls]
 Homepage = "https://gitlab.com/xync/back/tg-bot"
 Repository = "https://gitlab.com/xync/back/tg-bot"
 
 [tool.setuptools]
-packages = ["xync_bot"]
+packages = ["xync_bot", "xync_bot.handlers"]

{xync-bot-0.0.8 → xync-bot-0.0.9}/xync_bot/handlers/main.py

@@ -38,7 +38,7 @@ async def fraud_handler(msg: Message):
 @main.message(CommandStart())
 async def start_no_ref_handler(msg: Message):
     me = msg.from_user
-    # client, cr = await user_upsert(me) # baskdoor for first user
+    # client, cr = await user_upsert(me) # todo: baskdoor for first user
     logging.info(f'Start: {me.id}. Msg: {msg}')
     await msg.answer(f'Sorry {me.full_name}, we do not accept only persons who has a guarantor.\n'
                      'https://telegra.ph/XyncNet-02-13')
@@ -50,7 +50,7 @@ async def ref_link_handler(msg: Message):
     cl = await Client.get(user_id=my_id)
     link = await create_start_link(msg.bot, str(cl.id), encode=True)
     logging.info(f'Start: {my_id}. Msg: {msg}')
-    await msg.answer(f"Give it to your protege: {link}!")
+    await msg.answer(f"Give it to your protege: {link}")
 
 
 async def user_upsert(u: TgUser, status: UserStatus = None) -> (Client, bool):

xync-bot-0.0.9/xync_bot/handlers/vpn.py

@@ -0,0 +1,38 @@
+from aiogram.types import MenuButtonWebApp, WebAppInfo
+import logging
+from os import getenv as env
+from dotenv import load_dotenv
+from aiogram import Bot, Dispatcher
+from tortoise.backends.asyncpg import AsyncpgDBClient
+
+from xync_bot.handlers import main, vpn
+
+load_dotenv()
+
+TOKEN = env('TOKEN')
+logging.basicConfig(filemode='a', level=logging.DEBUG)
+bot = Bot(token=TOKEN, parse_mode='Markdown')
+dp = Dispatcher(bot=bot)
+dp.include_routers(vpn)
+dp.include_routers(main)
+
+
+async def on_startup(wh_url: str, twa_url: str, cn: AsyncpgDBClient, mbt: str = 'Go!'):
+    """ SET DEISPATCHER GLOBAL WORKFLOW DATA FOR DB Connection """
+    dp['dbc'] = cn
+    """ WEBHOOK SETUP """
+    webhook_info = await bot.get_webhook_info()
+    if webhook_info.url != wh_url:
+        await bot.set_webhook(url=wh_url)
+    """ WEBAPP URL SETUP IN MENU """
+    await bot.set_chat_menu_button(menu_button=MenuButtonWebApp(text=mbt, web_app=WebAppInfo(url=twa_url)))
+
+
+async def on_shutdown():
+    """ CLOSE BOT SESSION """
+    await bot.delete_webhook()
+    await bot.session.close()
+
+
+dp.startup.register(on_startup)
+dp.shutdown.register(on_shutdown)

{xync-bot-0.0.8 → xync-bot-0.0.9}/xync_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-bot
-Version: 0.0.8
+Version: 0.0.9
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

xync-bot-0.0.8/xync_bot/handlers/vpn.py

@@ -1,18 +0,0 @@
-from aiogram import Router
-from aiogram.filters import Command
-from aiogram.types import Message
-from antifragility_schema.models import Client, Vpn
-from python_wireguard import Key
-
-vpn = Router()
-
-
-@vpn.message(Command('get_vpn'))
-async def get_vpn(msg: Message):
-    my_id = msg.from_user.id
-    cl = await Client.get(user_id=my_id).prefetch_related('vpn')
-    if not cl.vpn:
-        private, public = Key.key_pair()
-        await Vpn.create(priv=private, pub=public, client=cl)
-    await msg.answer(f"Take your file!")
-    pass