xync-bot 0.0.10__py3-none-any.whl → 0.2.9__py3-none-any.whl

xync_bot/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.5"
+from aiogram.client.default import DefaultBotProperties
 from aiogram.types import MenuButtonWebApp, WebAppInfo
 import logging
 from os import getenv as env
@@ -10,12 +10,10 @@ 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')
+
+bot = Bot(token=env('TOKEN'), default=DefaultBotProperties(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!'):
@@ -24,16 +22,18 @@ async def on_startup(wh_url: str, twa_url: str, cn: AsyncpgDBClient, mbt: str =
     """ WEBHOOK SETUP """
     webhook_info = await bot.get_webhook_info()
     if webhook_info.url != wh_url:
-        await bot.set_webhook(url=wh_url)
+        await bot.set_webhook(url=wh_url, drop_pending_updates=True)
     """ 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.delete_webhook(drop_pending_updates=True)
     await bot.session.close()
 
 
 dp.startup.register(on_startup)
 dp.shutdown.register(on_shutdown)
+
+dp.include_routers(vpn, main)

xync_bot/handlers/main.py

@@ -1,34 +1,70 @@
 import logging
-from aiogram import Router
-from aiogram.filters import CommandStart, CommandObject, Command
-from aiogram.types import User as TgUser, ChatMemberUpdated, Message
+from aiogram import Router, F
+from aiogram.filters import CommandStart, CommandObject
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import User as TgUser, ChatMemberUpdated, Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
 from aiogram.utils.deep_linking import create_start_link
-from antifragility_schema.models import Client
-from tortoise_api_model import User
-from tortoise_api_model.enum import UserStatus
+from aiogram.utils.web_app import WebAppUser
+from xync_schema.models import User, UserStatus, Lang
+
+from xync_bot.shared import NavCallbackData
 
 main = Router()
 
 
+class RrCallbackData(CallbackData, prefix="reg_res"):  # registration response
+    to: int
+    res: bool
+
+
+home_btns = InlineKeyboardMarkup(
+    inline_keyboard=[[
+        InlineKeyboardButton(text='Invite', callback_data=NavCallbackData(to='ref_link').pack()),
+        InlineKeyboardButton(text='Get VPN', callback_data=NavCallbackData(to='get_vpn').pack()),
+    ]])
+
+
 @main.message(CommandStart(deep_link=True, deep_link_encoded=True))
 async def start_handler(msg: Message, command: CommandObject):
     me: TgUser = msg.from_user
     ref_id: int = command.args.isnumeric() and int(command.args)
-    client: Client
-    client, cr = await user_upsert(me)
-    if cr:
-        rs = 'You have registered already😉'
-    elif client.id == ref_id:
-        rs = 'You can not to ref yourself😒'
-    elif not (ref := await Client.get_or_none(id=ref_id)):
+    user = await User.get_or_none(id=me.id, status__gte=UserStatus.RESTRICTED)
+    rm = None
+    if user:
+        rs, rm = f'{me.full_name}, you have registered already😉', home_btns
+    elif not (ref := await User.get_or_none(id=ref_id)):
         rs = f'No registered user #{ref_id}😬'
+    else:  # new user created
+        user, cr = await user_upsert(me)
+        await user.update_from_dict({'ref': ref}).save()
+        approve_btns = InlineKeyboardMarkup(
+            inline_keyboard=[[
+                InlineKeyboardButton(text='Отклонить', callback_data=RrCallbackData(to=user.id, res=False).pack()),
+                InlineKeyboardButton(text='Одобрить', callback_data=RrCallbackData(to=user.id, res=True).pack())
+            ]])
+        await msg.bot.send_message(ref.id, f'{me.full_name} просит что б Вы взяли за него/ее ответственность', reply_markup=approve_btns)
+        return await msg.answer(f'Please wait for @{ref.username} approving...')
+    return await msg.answer(rs, reply_markup=rm)
+
+
+@main.callback_query(RrCallbackData.filter())
+async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData) -> None:
+    protege = await User[callback_data.to]
+    if callback_data.res:
+        # protege.status = UserStatus.RESTRICTED
+        await protege.save()
+        rs = f'{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}'
     else:
-        rs = f'Please wait for {ref.name} approving...'
-        await client.update_from_dict({'ref': ref}).save()
-    return await msg.answer(rs)
+        rs = f'Вы отклонили запрос юзера "{protege.username}" на Вашу протекцию'
+    res = {True: 'одобрил', False: 'отклонил'}
+    txt = f'{cb.from_user.full_name} {res[callback_data.res]} вашу регистрацию'
+    txt, rm = (f'Поздравляем! {txt}💥', home_btns) if callback_data.res else (f'К сожалению {txt}😢', None)
+    await cb.bot.send_message(protege.id, txt, reply_markup=rm)
+    await cb.answer('👌🏼')
+    await cb.message.edit_text(rs)
 
 
-@main.message(CommandStart(deep_link=True))
+@main.message(CommandStart(deep_link=True))  # attempt to reg by fake link
 async def fraud_handler(msg: Message):
     logging.info(f'Start: {msg.from_user.id}. Msg: {msg}')
     # todo: alert to admins! Fraud attempt!
@@ -38,36 +74,44 @@ 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) # 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')
+    user, cr = await user_upsert(me)
+    rr = 'сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13'
+    if cr:  # has ref and created now
+        await msg.answer(f'Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}')
+    elif not user.ref_id:
+        await msg.answer(rr.capitalize())
+    else:
+        await msg.answer(f'{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼', reply_markup=home_btns)
 
 
-@main.message(Command('ref_link'))
-async def ref_link_handler(msg: Message):
-    my_id = msg.from_user.id
-    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}")
+@main.callback_query(NavCallbackData.filter(F.to == 'ref_link'))
+async def ref_link_handler(cbq: CallbackQuery):
+    me = cbq.from_user
+    if not (u := await User.get_or_none(id=me.id, status__gt=UserStatus.RESTRICTED).prefetch_related('ref')):
+        return await cbq.answer(f"{me.full_name}, сначала сами получите одобрение поручителя😉")
+    link = await create_start_link(cbq.bot, str(u.id), encode=True)
+    logging.info(f'Start: {me.id}. Msg: {cbq}')
+    await cbq.message.answer(f"Your referrer is {u.ref_id and u.ref.username}"
+                             f"\nThis is your invite link: {link}"
+                             f"\nGive it to your protege, and approve his request")
+    await cbq.answer('Wait for your protege request..')
 
 
-async def user_upsert(u: TgUser, status: UserStatus = None) -> (Client, bool):
-    udf = {'username': u.username, 'password': ''}
+async def user_upsert(u: TgUser | WebAppUser, status: UserStatus = None) -> (User, bool):
+    pic = (gpp := await u.get_profile_photos(0, 1)).photos and gpp.photos[0][-1].file_unique_id if type(u) is TgUser else (u.photo_url[0] if u.photo_url else None)
+    udf = {'username': u.username, 'first_name': u.first_name, 'last_name': u.last_name, 'status': UserStatus.MEMBER, 'lang': u.language_code and Lang[u.language_code], 'pic': pic}
     if status:
         udf.update({'status': status})
-    user, is_created = await User.update_or_create(udf, id=u.id)
-    return await Client.update_or_create({'name': u.full_name}, user=user)
+    return await User.update_or_create(udf, id=u.id)
 
 
 @main.my_chat_member()
 async def user_set_status(my_chat_member: ChatMemberUpdated):
     u: TgUser = my_chat_member.from_user
-    new_status = UserStatus[my_chat_member.new_chat_member.status]
+    new_status = my_chat_member.new_chat_member.status
     await user_upsert(u, status=new_status)
 
 
 @main.message()
-async def del_msg(msg: Message):
+async def del_cbq(msg: Message):
     await msg.delete()

xync_bot/handlers/vpn.py

@@ -1,37 +1,48 @@
-from aiogram import Router
-from aiogram.filters import Command
-from aiogram.types import Message, BufferedInputFile, MessageEntity
-from antifragility_schema.models import Client, Vpn
-from python_wireguard import Key
+from aiogram import Router, F
+from aiogram.types import BufferedInputFile, CallbackQuery
+from xync_schema.models import User, Vpn, UserStatus
 from os import getenv as env
 from dotenv import load_dotenv
 
+from xync_bot.shared import NavCallbackData
+
 load_dotenv()
+
 vpn = Router()
-SWGPUB = env('SWGPUB')
 
 
-@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', 'user')
-    if not cl.vpn:
-        private, public = Key.key_pair()
-        v = await Vpn.create(priv=private, pub=public, client=cl)
+@vpn.callback_query(NavCallbackData.filter(F.to == 'get_vpn'))
+async def get_vpn(cbq: CallbackQuery):
+    me = cbq.from_user
+    if not (u := await User.get_or_none(id=me.id, status__gt=UserStatus.RESTRICTED).prefetch_related('vpn')):
+        return await cbq.answer('Этот сервис только для наших доверенных участников. Что бы зарегистрироваться, '
+                                'вы должны перейти в бот по пригласительный ссылке от одного из действующих участников сети,'
+                                'и дождаться пока он одобрит вашу регистрацию.')
+    if not u.vpn:
+        try:
+            from python_wireguard import Key
+            private, public = Key.key_pair()
+        except OSError:
+            private, public = 'local_test_private_key_'+me.username, 'local_test_public_key_'+me.username
+        v = await Vpn.create(priv=private, pub=public, user=u)
     else:
-        v = cl.vpn
+        v = u.vpn
         private = v.priv
-    txt = f'''
-[Interface]
+    txt = f'''[Interface]
 PrivateKey={private}
 Address=10.0.0.{v.id}/24
-DNS=1.1.1.1
+DNS=8.8.8.8
 [Peer]
-PublicKey={SWGPUB}
+PublicKey={env('SWGPUB')}
 AllowedIPs=0.0.0.0/0
 Endpoint=vpn.xync.net:51820
 PersistentKeepalive=60
 '''
-    file = BufferedInputFile(txt.encode(), f'{cl.user.username}_wg.conf')
-    apl = MessageEntity(type='text_link', url='https://apps.apple.com/us/app/wireguard/id1441195209')
-    await msg.answer_document(file, caption=f"Take your file! [ya](https://ya.ru)", caption_entities=[apl])
+    file = BufferedInputFile(txt.encode(), f'XyncVPN_{u.username}.conf')
+    caption = 'Import this config file to Wireguard:\n[iOS](https://apps.apple.com/us/app/wireguard/id1441195209)\n' \
+              '[Android](https://play.google.com/store/apps/details?id=com.wireguard.android)\n' \
+              '[MacOS](https://itunes.apple.com/us/app/wireguard/id1451685025)\n' \
+              '[Windows](https://download.wireguard.com/windows-client/wireguard-installer.exe)\n\n' \
+              '[Instructions](https://graph.org/VPN-02-19)'
+    await cbq.message.answer_document(file, caption=caption)
+    await cbq.answer('Your VPN is ready')

xync_bot/shared.py

@@ -0,0 +1,5 @@
+from aiogram.filters.callback_data import CallbackData
+
+
+class NavCallbackData(CallbackData, prefix="nav"):  # navigate menu
+    to: str

{xync_bot-0.0.10.dist-info → xync_bot-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-bot
-Version: 0.0.10
+Version: 0.2.9
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -10,8 +10,7 @@ Keywords: aiogram,xync-net
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aiogram
-Requires-Dist: antifragility-schema
 Requires-Dist: python-dotenv
-Requires-Dist: tortoise-api-model
-Requires-Dist: python-wireguard
+Requires-Dist: tortoise-api
+Requires-Dist: xync-schema
 

xync_bot-0.2.9.dist-info/RECORD

@@ -0,0 +1,9 @@
+xync_bot/__init__.py,sha256=A4PNsNVDgj5Cg4nIAhyhWbWLODalM3xQyrAzM6Cl2n0,1238
+xync_bot/shared.py,sha256=MlKkTrsT29l7fF6-qAN9FO14cSuXuOuYxbNY5F4S2w4,137
+xync_bot/handlers/__init__.py,sha256=lGPndTeEl1oLFMzFMtKNG2XLL8IecUFj1YIGzkZ55M8,78
+xync_bot/handlers/main.py,sha256=AfWoTjBk_kzZCkR_7XfWYzWT2KV9ni_7TguRiJzxGcg,5757
+xync_bot/handlers/vpn.py,sha256=qKK55UrjEZeDvu7ljWXNUFBFgXTPTIEaCT2OAmKWky4,2219
+xync_bot-0.2.9.dist-info/METADATA,sha256=PPBi6pMNLKpNGyZRnewk7k8GtDfm8kEFEtu92O1_Pkg,478
+xync_bot-0.2.9.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+xync_bot-0.2.9.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.2.9.dist-info/RECORD,,

{xync_bot-0.0.10.dist-info → xync_bot-0.2.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xync_bot-0.0.10.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_bot/__init__.py,sha256=LP2rp5DT1vL5blk1Ye9ZwwzjlyqdJM7ZOwJyhlgLr2A,1153
-xync_bot/handlers/__init__.py,sha256=lGPndTeEl1oLFMzFMtKNG2XLL8IecUFj1YIGzkZ55M8,78
-xync_bot/handlers/main.py,sha256=_nDUnyDmXhuMRXBGqzA7DLBrUuEwUjleXWPp1MYf_e4,2624
-xync_bot/handlers/vpn.py,sha256=hY3jRkuo7EJtVb08h11-C3k-3ngrTKbiP0c6P6CcAmo,1150
-xync_bot-0.0.10.dist-info/METADATA,sha256=ot5MV8UEgKfMDSJ3jlzlnlNn_1uuRCQP2GpuY-lDnhA,526
-xync_bot-0.0.10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xync_bot-0.0.10.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.0.10.dist-info/RECORD,,