xync-bot 0.3.26__py3-none-any.whl → 0.3.27__py3-none-any.whl

xync_bot/routers/main/handler.py

@@ -16,10 +16,13 @@ from aiogram.utils.deep_linking import create_start_link
 from xync_schema import models
 
 from xync_bot.shared import NavCallbackData
-from xync_bot.store import Store
 
 mr = Router(name="main")
 
+txt = "Добро пожаловать в XyncPay, приветственный бонус: комиссия 0% на первые $10 000"
+url = "https://pay.xync.net"
+rm = InlineKeyboardMarkup(inline_keyboard=[[InlineKeyboardButton(text="Pay", web_app=WebAppInfo(url=url))]])
+
 
 class RrCallbackData(CallbackData, prefix="reg_res"):  # registration response
     to: int
@@ -37,54 +40,49 @@ home_btns = InlineKeyboardMarkup(
 )
 
 
-@mr.message(CommandStart(deep_link=True, deep_link_encoded=True))
-async def start_handler(msg: Message, command: CommandObject):
-    me: User = msg.from_user
-    ref_id: int = command.args.isnumeric() and int(command.args)
-    user = await models.User.get(username_id=me.id, blocked=False)
-    rm = None
-    logging.info(msg, {"src": "start"})
-    if user:
-        rs, rm = f"{me.full_name}, you have registered already😉", home_btns
-    elif not (ref := await models.User.get_or_none(id=ref_id)):
-        rs = f"No registered user #{ref_id}😬"
-    else:  # new user created
-        user, cr = await models.User.tg2in(me, False)
-        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)
+# @mr.message(CommandStart(deep_link=True, deep_link_encoded=True))
+# async def start_handler(msg: Message, command: CommandObject):
+#     me: User = msg.from_user
+#     ref_id: int = command.args.isnumeric() and int(command.args)
+#     user = await models.User.get(username_id=me.id, blocked=False)
+#     rm = None
+#     logging.info(msg, {"src": "start"})
+#     if user:
+#         rs, rm = f"{me.full_name}, you have registered already😉", home_btns
+#     elif not (ref := await models.User.get_or_none(id=ref_id)):
+#         rs = f"No registered user #{ref_id}😬"
+#     else:  # new user created
+#         user, cr = await models.User.tg2in(me, False)
+#         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)
 
 
 @mr.message(CommandStart(deep_link=True))  # attempt to reg by fake link
-async def fraud_handler(msg: Message):
+async def arg_handler(msg: Message, command: CommandObject):
     logging.warning(f"Start: {msg.from_user.id}. Msg: {msg}")
-    # todo: alert to admins! Fraud attempt!
-    await msg.answer("🤔")
+    arg: dict[str, int | str] = {"id": int(command.args)} if command.args.isnumeric() else {"username": command.args}
+    if ref := await models.Username.get_or_none(**arg):
+        txt = f"Вас пригласил {ref.username and '@'+ref.username or ref.id}, бонус: комиссия 0% на первые $100 000"
+    await msg.answer(txt, reply_markup=rm, parse_mode="Markdown")
 
 
 @mr.message(CommandStart())  # обычный /start
-async def home(msg: Message, store: Store):
+async def home(msg: Message):
     me = msg.from_user
-    user, is_new = await models.User.tg_upsert(me, False)
-
-    rr = "сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13"
-    if is_new:  # 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)
+    await models.User.tg_upsert(me, False)
+    await msg.answer(txt, reply_markup=rm, parse_mode="Markdown")
 
 
 @mr.callback_query(RrCallbackData.filter())

{xync_bot-0.3.26.dist-info → xync_bot-0.3.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.26
+Version: 0.3.27
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later

{xync_bot-0.3.26.dist-info → xync_bot-0.3.27.dist-info}/RECORD

@@ -11,13 +11,13 @@ xync_bot/routers/xicon.png,sha256=O57_kvzhVcCXSoGYZ61m0dW9pizY6gxR8Yj5aeCP0RQ,42
 xync_bot/routers/cond/__init__.py,sha256=AUP_V1TGUIa8GFTC_V2LF5YYEBrXdfrSm_O8ew5sXU8,4214
 xync_bot/routers/cond/func.py,sha256=m0NWDKunbqDJQmhv_5UnpjxjRzn78GFG94ThOFLVlQo,4720
 xync_bot/routers/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_bot/routers/main/handler.py,sha256=IDvHPcj1Z-MpL6DSlgibxxCZmaaVN3OhByIZZyrK2FM,8758
+xync_bot/routers/main/handler.py,sha256=j9RkTkVkHv0Js71WzN98TLd4ZXA_tv6QSovc1MILRgc,8819
 xync_bot/routers/pay/cd.py,sha256=yu5U0j8f1RncfagiuycCeUFWwZtLmbT-Mx8G8whfdg8,927
 xync_bot/routers/pay/dep.py,sha256=WvIkLsMHsy6Z8qeQYB0uvHi9xgJ-pCjRad0dSp_GQS0,3956
 xync_bot/routers/pay/handler.py,sha256=mvxubzZ6BipmmPcvQC2MPl-66doZcFoU7kYmshHBjLo,10677
 xync_bot/routers/pay/window.py,sha256=YKRwhw6J7gQVABgVEgUs-JmpvGoEyKMgbPtSCnuXQmE,11163
 xync_bot/routers/send/__init__.py,sha256=Mccf__w_nF7CbDN7gndqXEQ985oCcKX4j7NCcgvq2Ok,3793
-xync_bot-0.3.26.dist-info/METADATA,sha256=XqTalInMjopGf351z4FHDe2UU8DSWf5ll1aJEKrsf6E,746
-xync_bot-0.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_bot-0.3.26.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.3.26.dist-info/RECORD,,
+xync_bot-0.3.27.dist-info/METADATA,sha256=JF2m7KoPXK5szEa0Rb-894UnYGCes6SZd5kD3FgfVLA,746
+xync_bot-0.3.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_bot-0.3.27.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.3.27.dist-info/RECORD,,