xync-bot 0.3.26.dev0__py3-none-any.whl → 0.3.28__py3-none-any.whl

xync_bot/__init__.py

@@ -0,0 +1,28 @@
+from PGram import Bot
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import UpdateType
+
+from xync_bot.store import Store
+from xync_bot.routers import last
+from xync_bot.routers.main.handler import mr
+from xync_bot.routers.pay.handler import pr
+from xync_bot.routers.cond import cr
+from xync_bot.routers.send import sd
+
+
+au = [
+    UpdateType.MESSAGE,
+    UpdateType.CALLBACK_QUERY,
+    UpdateType.CHAT_MEMBER,
+    UpdateType.MY_CHAT_MEMBER,
+]  # , UpdateType.CHAT_JOIN_REQUEST
+
+
+class XyncBot(Bot):
+    def __init__(self, token, cn):
+        super().__init__(token, cn, [sd, cr, pr, mr, last], Store(), DefaultBotProperties(parse_mode="HTML"))
+
+    async def start(self, wh_host: str = None):
+        await super().start(au, wh_host)
+        self.dp.workflow_data["store"].glob = await Store.Global()  # todo: refact store loading
+        return self

xync_bot/__main__.py

@@ -3,7 +3,6 @@ from asyncio import run
 
 from PGram import Bot
 from aiogram.client.default import DefaultBotProperties
-from aiogram.enums import UpdateType
 from x_model import init_db
 
 from xync_bot.store import Store
@@ -12,26 +11,19 @@ from xync_bot.routers.cond import cr
 from xync_bot.routers.pay.handler import pr
 from xync_bot.routers import last
 from xync_bot.routers.send import sd
+from xync_bot.loader import TOKEN
 
-au = [
-    UpdateType.MESSAGE,
-    UpdateType.CALLBACK_QUERY,
-    UpdateType.CHAT_MEMBER,
-    UpdateType.MY_CHAT_MEMBER,
-]  # , UpdateType.CHAT_JOIN_REQUEST
-bot = Bot([sd, cr, pr, mr, last], Store(), au, default=DefaultBotProperties(parse_mode="HTML"))
 
 if __name__ == "__main__":
-    from xync_bot.loader import TOKEN, TORM
+    from xync_bot.loader import TORM
 
     logging.basicConfig(level=logging.INFO)
 
     async def main() -> None:
         cn = await init_db(TORM)
+        bot = Bot(TOKEN, cn, [sd, cr, pr, mr, last], DefaultBotProperties(parse_mode="HTML"))
+
+        await bot.start()
         bot.dp.workflow_data["store"].glob = await Store.Global()  # todo: refact store loading
-        await bot.start(
-            TOKEN,
-            cn,
-        )
 
     run(main())

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/routers/pay/handler.py

@@ -37,7 +37,6 @@ async def h_got_fiat_type(query: CallbackQuery, store: Store):
 @pr.callback_query(cd.MoneyType.filter(F.is_fiat.__eq__(0)))
 async def h_got_crypto_type(query: CallbackQuery, store: Store):
     """Step 2c: Select coin"""
-    uid = query.from_user.id
     store.pers.curr.is_fiat = False
     await gather(window.coin_select(query.message, store), ans(query, "Понял, крипта"))
 
@@ -45,7 +44,6 @@ async def h_got_crypto_type(query: CallbackQuery, store: Store):
 @pr.callback_query(cd.Coin.filter())
 async def h_got_coin(query: CallbackQuery, callback_data: cd.Coin, store: Store):
     """Step 3c: Select target ex"""
-    uid = query.from_user.id
     setattr(store.pay, ("t" if store.pers.curr.is_target else "s") + "_coin_id", callback_data.id)
     await gather(window.ex_select(query.message, store), ans(query, "Эта монета есть на следующих биржах"))
 
@@ -53,7 +51,6 @@ async def h_got_coin(query: CallbackQuery, callback_data: cd.Coin, store: Store)
 @pr.callback_query(cd.Cur.filter())
 async def h_got_cur(query: CallbackQuery, callback_data: cd.Cur, store: Store):
     """Step 3f: Select target pm"""
-    uid = query.from_user.id
     setattr(store.pay, ("t" if store.pers.curr.is_target else "s") + "_cur_id", callback_data.id)
     await gather(window.pm(query.message, store), ans(query, "Вот платежные системы доступные для этой валюты"))
 
@@ -61,7 +58,6 @@ async def h_got_cur(query: CallbackQuery, callback_data: cd.Cur, store: Store):
 @pr.callback_query(cd.Pm.filter(F.is_target))
 async def h_got_target_pm(query: CallbackQuery, callback_data: cd.Pm, state: FSMContext, store: Store):
     """Step 4f: Fill target cred.detail"""
-    uid = query.from_user.id
     store.pay.t_pmcur_id = callback_data.pmcur_id
     await gather(
         window.fill_cred_dtl(query.message, store),
@@ -72,7 +68,6 @@ async def h_got_target_pm(query: CallbackQuery, callback_data: cd.Pm, state: FSM
 
 @pr.callback_query(cd.Cred.filter())
 async def h_got_cred(query: CallbackQuery, callback_data: cd.Cred, state: FSMContext, store: Store):
-    uid = query.from_user.id
     store.pay.cred_id = callback_data.id
     await gather(
         window.amount(query.message, store), ans(query, "Теперь нужна сумма"), state.set_state(dep.PaymentState.amount)
@@ -121,7 +116,6 @@ async def h_got_ex(query: CallbackQuery, callback_data: cd.Ex, state: FSMContext
 @pr.message(dep.PaymentState.amount)
 async def h_got_amount(msg: Message, state: FSMContext, store: Store):
     """Step 6: Save a target amount"""
-    uid = msg.from_user.id
     if not msg.text.isnumeric():
         store.pers.curr.msg_to_del = await msg.answer("Пожалуйста, введите корректное число")
         return
@@ -137,7 +131,6 @@ async def h_got_amount(msg: Message, state: FSMContext, store: Store):
 
 @pr.callback_query(cd.Pm.filter(F.is_target.__eq__(0)))
 async def h_got_source_pm(query: CallbackQuery, callback_data: cd.Pm, store: Store):
-    uid = query.from_user.id
     store.pay.s_pmcur_id = callback_data.pmcur_id
     await gather(
         window.set_ppo(query.message, store),
@@ -147,7 +140,6 @@ async def h_got_source_pm(query: CallbackQuery, callback_data: cd.Pm, store: Sto
 
 @pr.callback_query(cd.Ppo.filter())
 async def h_got_ppo(query: CallbackQuery, callback_data: cd.Ppo, store: Store):
-    uid = query.from_user.id
     store.pay.ppo = callback_data.num
     await gather(window.set_urgency(query.message, store), ans(query, str(callback_data.num)))
 
@@ -163,7 +155,6 @@ async def h_got_urgency(query: CallbackQuery, callback_data: cd.Time, store: Sto
 # ACTIONS
 @pr.callback_query(cd.Action.filter(F.act.__eq__(cd.ActionType.received)))
 async def payment_confirmed(query: CallbackQuery, state: FSMContext):
-    uid = query.from_user.id
     await ans(query, None)
     payed_at = datetime.now()
     await state.update_data(timer_active=False, payed_at_formatted=payed_at)
@@ -178,7 +169,6 @@ async def payment_confirmed(query: CallbackQuery, state: FSMContext):
 
 @pr.callback_query(cd.Action.filter(F.act.__eq__(cd.ActionType.not_received)))
 async def no_payment(query: CallbackQuery, state: FSMContext):
-    uid = query.from_user.id
     await ans(query, None)
     await state.update_data(timer_active=False)
     await query.message.edit_text("Платеж не получен!")
@@ -189,7 +179,6 @@ async def no_payment(query: CallbackQuery, state: FSMContext):
 
 @pr.message(dep.Report.text)
 async def payment_not_specified(msg: Message, state: FSMContext):
-    uid = msg.from_user.id
     await state.update_data(text=msg.text)
     data = await state.get_data()
     complaint_text = (

xync_bot/store.py

@@ -3,7 +3,7 @@ from aiogram.types import Message
 from tortoise.functions import Min
 from x_model.func import ArrayAgg
 from x_auth.enums import Role
-from xync_schema.models import Addr, Asset, Cred, Coin, Pmcur, Cur, User, Ex, Pmex
+from xync_schema.models import Addr, Asset, Cred, Coin, PmCur, Cur, User, Ex, PmEx
 
 from xync_bot.shared import flags
 
@@ -20,7 +20,7 @@ class SingleStore(type):
             cls._store.exs = {k: v for k, v in await Ex.all().values_list("id", "name")}
             cls._store.pmcurs = {
                 k: v
-                for k, v in await Pmex.filter(pm__pmcurs__cur_id__in=cls._store.curs.keys())
+                for k, v in await PmEx.filter(pm__pmcurs__cur_id__in=cls._store.curs.keys())
                 .annotate(sname=Min("name"))
                 .group_by("pm__pmcurs__id")
                 .values_list("pm__pmcurs__id", "sname")
@@ -30,14 +30,14 @@ class SingleStore(type):
             }
             cls._store.curpms = {
                 cur_id: ids
-                for cur_id, ids in await Pmcur.filter(cur_id__in=curs.keys())
+                for cur_id, ids in await PmCur.filter(cur_id__in=curs.keys())
                 .annotate(ids=ArrayAgg("id"))
                 .group_by("cur_id")
                 .values_list("cur_id", "ids")
             }
             cls._store.curpms = {
                 cur_id: ids
-                for cur_id, ids in await Pmcur.filter(cur_id__in=curs.keys())
+                for cur_id, ids in await PmCur.filter(cur_id__in=curs.keys())
                 .annotate(ids=ArrayAgg("id"))
                 .group_by("cur_id")
                 .values_list("cur_id", "ids")
@@ -140,7 +140,7 @@ class Store:
                     logging.error(f"No {coin} addr in {ex}")
                 return addr_in, f"{coin} на {ex} по id: `{addr_in.actor.exid}`"
             # иначе: реквизиты для фиатной оплаты
-            s_pmcur = await Pmcur.get(id=self.s_pmcur_id).prefetch_related("pm__grp")
+            s_pmcur = await PmCur.get(id=self.s_pmcur_id).prefetch_related("pm__grp")
             cred = await Cred.filter(
                 **({"pmcur__pm__grp": s_pmcur.pm.grp} if s_pmcur.pm.grp else {"pmcur_id": self.s_pmcur_id}),
                 person__user__role__gte=Role.ADMIN,

{xync_bot-0.3.26.dev0.dist-info → xync_bot-0.3.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.26.dev0
+Version: 0.3.28
 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.dev0.dist-info → xync_bot-0.3.28.dist-info}/RECORD

@@ -1,7 +1,8 @@
-xync_bot/__main__.py,sha256=uZH7tEJ1GQtLMKYG9ttiI6mTyXvLCs5bc_JiQd_2I0o,1032
+xync_bot/__init__.py,sha256=ym2KZJTTmwo_ijtjHfHqxJubONva37Xo9nnF24Xo8H0,879
+xync_bot/__main__.py,sha256=zxUZaz35JqPAD-jiz-z6Pw8ndIsmboKKhODmvRhIEiU,820
 xync_bot/loader.py,sha256=4ZeR-yVMoOmswdLS0UEBG19K7JVcuvH6WpP-_0yAK3I,573
 xync_bot/shared.py,sha256=PPzvt1ewowCInKE1bk2CWHPjnrV2eQJzKxgyxe3h7vk,496
-xync_bot/store.py,sha256=_au6CKx0sTjdDk2yTofLS9RyT7adTcFJQ4CXpembQc0,6266
+xync_bot/store.py,sha256=zLpn3aQArTx5WxYwg11UR7-y9_rgXkF0sIeoG-jyPp8,6266
 xync_bot/typs.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_bot/routers/__init__.py,sha256=30W7PmD3stkRebGh5J-9CJIlY5P-Ixrtlxb_W9usSo4,1083
 xync_bot/routers/order.py,sha256=ZKWDLyiWrXzcR-aHKLBTBCACwp-P0Vvnr22T-EuLHaM,274
@@ -11,13 +12,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=3YI6GVug3A4QNhEpmA_Nuf13YgdYGHLEd4qBINWZwkk,10992
+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.dev0.dist-info/METADATA,sha256=AWDq44RGmVUUeR99U9NMx7EnLWY3kr69ltvdFvYlB0w,751
-xync_bot-0.3.26.dev0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_bot-0.3.26.dev0.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.3.26.dev0.dist-info/RECORD,,
+xync_bot-0.3.28.dist-info/METADATA,sha256=2UhWXod8TEGwJpNYiZEnFkauJdzv_U8D__K51-2ooyY,746
+xync_bot-0.3.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_bot-0.3.28.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.3.28.dist-info/RECORD,,