xync-bot 0.3.24.dev6__tar.gz → 0.3.24.dev8__tar.gz

{xync_bot-0.3.24.dev6/xync_bot.egg-info → xync_bot-0.3.24.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev6
+Version: 0.3.24.dev8
 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.24.dev6 → xync_bot-0.3.24.dev8}/xync_bot/routers/__init__.py

@@ -61,9 +61,9 @@ class Store:
     class Permanent:
         msg_id: int = None
         user: models.User = None
-        actors: dict[int, models.Actor] = None  # key=ex_id
+        actors: dict[int, models.Actor] = None  # key=actor_id
         ex_actors: dict[int, list[int]] = None  # key=ex_id
-        creds: dict[int, models.Cred] = None  # key=id
+        creds: dict[int, models.Cred] = None  # key=cred_id
         cur_creds: dict[int, list[int]] = None  # pmcur_id:[cred_ids]
 
     class Current:

{xync_bot-0.3.24.dev6 → xync_bot-0.3.24.dev8}/xync_bot/routers/pay/dep.py

@@ -89,10 +89,13 @@ async def fill_creds(person_id: int) -> tuple[dict[int, models.Cred], dict[int,
 async def fill_actors(person_id: int) -> tuple[dict[int, models.Actor], dict[int, list[int]]]:
     aq = models.Actor.filter(person_id=person_id)
     actors = {a.id: a for a in await aq}
-    ex_act_ids = {
-        exi: ids for exi, ids in await aq.annotate(ids=ArrayAgg("id")).group_by("ex_id").values_list("ex_id", "ids")
+    ex_act_id = {
+        exi: ids[0]
+        for exi, ids in await aq.annotate(ids=ArrayAgg("id"))  # todo: check len(ids) == 1
+        .group_by("ex_id")
+        .values_list("ex_id", "ids")
     }
-    return actors, ex_act_ids
+    return actors, ex_act_id
 
 
 async def edit(msg: Message, txt: str, rm: InlineKeyboardMarkup):

{xync_bot-0.3.24.dev6 → xync_bot-0.3.24.dev8}/xync_bot/routers/pay/handler.py

@@ -37,7 +37,7 @@ async def h_got_fiat_type(query: CallbackQuery, bot: PGram):
 async def h_got_crypto_type(query: CallbackQuery, bot: PGram):
     """Step 2c: Select coin"""
     bot.store.curr.is_fiat = False
-    (bot.store.perm.actors, bot.store.perm.cur_creds), *_ = await gather(
+    (bot.store.perm.actors, bot.store.perm.ex_actors), *_ = await gather(
         fill_actors(bot.store.perm.user.person_id), window.coin_select(query.message), ans(query, "Понял, крипта")
     )
 
@@ -97,14 +97,15 @@ async def h_got_cred_name(msg: Message, state: FSMContext):
 
 
 @pay.callback_query(cd.Ex.filter())
-async def h_got_ex(query: CallbackQuery, callback_data: cd.Ex):
+async def h_got_ex(query: CallbackQuery, callback_data: cd.Ex, state: FSMContext):
     """Step 4c: Save target"""
     store: Store = query.message.bot.store
     ist = store.curr.is_target
-    setattr(store, ("t" if ist else "s") + "_ex_id", callback_data.id)
+    setattr(store.pay, ("t" if ist else "s") + "_ex_id", callback_data.id)
     await gather(
         (window.amount if ist else window.set_ppo)(query.message),
         ans(query, f"Биржа {store.glob.exs[callback_data.id]} выбрана"),
+        state.set_state(dep.PaymentState.amount),
     )
 
 
@@ -146,8 +147,8 @@ async def process_time_selection(query: CallbackQuery, callback_data: cd.Time, s
     pay_until = datetime.now() + timedelta(minutes=callback_data.minutes)
 
     if ex_id := (store.pay.t_ex_id or store.pay.s_ex_id):
-        actor_id = store.perm.actors[ex_id]
-        if not (addr_id := store.pay.addr):
+        actor_id = store.perm.ex_actors[ex_id]
+        if not (addr_id := store.pay.addr_id):
             coin_id = store.pay.t_coin_id or store.pay.s_coin_id
             addr_id = await models.Addr.get(coin_id=coin_id, actor_id=actor_id).values_list("id", flat=True)
             store.pay.addr_id = addr_id
@@ -162,8 +163,8 @@ async def process_time_selection(query: CallbackQuery, callback_data: cd.Time, s
         cred_id=store.pay.cred_id,
         user=store.perm.user,
     )
-    pay_req, *_ = await gather(
-        models.PayReq.create(**pr_data), ans(query, None), state.set_state(dep.PaymentState.timer)
+    (pay_req, _), *__ = await gather(
+        models.PayReq.update_or_create(**pr_data), ans(query, None), state.set_state(dep.PaymentState.timer)
     )
 
     await state.update_data(
@@ -219,8 +220,7 @@ async def payment_not_specified(msg: Message, state: FSMContext):
 # NAVIGATION
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_type, cd.PayStep.s_type])))
 async def handle_home(query: CallbackQuery, state: FSMContext):
-    await ans(query, None)
-    await window.type_select(query.message, await state.get_value("is_target"))
+    await gather(window.type_select(query.message), state.clear(), ans(query, "Создаем платеж заново"))
 
 
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_coin, cd.PayStep.s_coin])))
@@ -273,6 +273,7 @@ async def back_to_amount(query: CallbackQuery, state: FSMContext):
     await ans(query, None)
     await state.update_data(amount=None)
     await window.amount(query.message)
+    await state.set_state(dep.PaymentState.amount)
 
 
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_pm])))

{xync_bot-0.3.24.dev6 → xync_bot-0.3.24.dev8}/xync_bot/routers/pay/window.py

@@ -42,7 +42,7 @@ async def cur_select(msg: Message):
     builder.button(text="Назад к выбору типа", callback_data=cd.PayNav(to=cd.PayStep.t_type))
     builder.adjust(3, 3, 3, 3, 3, 1)
     sfx = "ую нужно" if ist else "ой платишь"
-    await msg.edit_text("Выбери валюту котор" + sfx, reply_markup=builder.as_markup())
+    await edt(msg, "Выбери валюту котор" + sfx, builder.as_markup())
 
 
 async def coin_select(msg: Message):
@@ -135,7 +135,7 @@ async def amount(msg: Message):
         builder.button(text="Назад к вводу имени", callback_data=cd.PayNav(to=cd.PayStep.t_cred_name))
         t_name = store.glob.pms[store.pay.t_pmcur_id]
     else:
-        cur_coin = store.glob.curs[store.pay.t_coin_id]
+        cur_coin = store.glob.coins[store.pay.t_coin_id]
         builder.button(text="Назад к выбору биржи", callback_data=cd.PayNav(to=cd.PayStep.t_ex))
         t_name = store.glob.exs[store.pay.t_ex_id]
 

{xync_bot-0.3.24.dev6 → xync_bot-0.3.24.dev8/xync_bot.egg-info}/PKG-INFO

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