xync-bot 0.3.24.dev5__py3-none-any.whl → 0.3.24.dev7__py3-none-any.whl

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

@@ -1,6 +1,7 @@
 from asyncio import gather
 from enum import IntEnum
 
+from aiogram.exceptions import TelegramBadRequest
 from aiogram.fsm.state import StatesGroup, State
 from aiogram.types import Message, InlineKeyboardMarkup
 from pyrogram.types import CallbackQuery
@@ -88,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):
@@ -110,6 +114,9 @@ async def edt(msg: Message, txt: str, rm: InlineKeyboardMarkup):
     if msg.message_id == msg.bot.store.perm.msg_id:
         await msg.edit_text(txt, reply_markup=rm)
     else:  # окно вызвано в ответ на текст, а не кнопку
-        await msg.bot.edit_message_text(txt, chat_id=msg.chat.id, message_id=msg.bot.store.perm.msg_id, reply_markup=rm)
-
-    await msg.edit_text(txt, reply_markup=rm)
+        try:
+            await msg.bot.edit_message_text(
+                txt, chat_id=msg.chat.id, message_id=msg.bot.store.perm.msg_id, reply_markup=rm
+            )
+        except TelegramBadRequest as e:
+            print(msg.bot.store.perm.msg_id, e)

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),
     )
 
 
@@ -125,18 +126,18 @@ async def h_got_amount(msg: Message, state: FSMContext):
 
 @pay.callback_query(cd.Pm.filter(F.is_target.__eq__(0)))
 async def h_got_source_pm(query: CallbackQuery, callback_data: cd.Pm):
-    query.message.bot.store.pay.s_pmcur_id = callback_data.pmcur_id
+    store: Store = query.message.bot.store
+    store.pay.s_pmcur_id = callback_data.pmcur_id
     await gather(
         window.set_ppo(query.message),
-        query.message.delete(),
-        ans(query, callback_data.name),
+        ans(query, store.glob.pms[callback_data.pmcur_id]),
     )
 
 
 @pay.callback_query(cd.Ppo.filter())
 async def h_got_ppo(query: CallbackQuery, callback_data: cd.Ppo):
     query.message.bot.store.pay.ppo = callback_data.num
-    await gather(window.set_urgency(query.message), query.message.delete(), ans(query, str(callback_data.num)))
+    await gather(window.set_urgency(query.message), ans(query, str(callback_data.num)))
 
 
 @pay.callback_query(cd.Time.filter())
@@ -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
@@ -190,7 +191,6 @@ async def payment_confirmed(query: CallbackQuery, state: FSMContext):
     builder = InlineKeyboardBuilder()
     builder.button(text="Новый платеж💸", callback_data=cd.PayNav(to=cd.PayStep.t_type))
     await query.message.answer("✅ Платеж успешно подтвержден", reply_markup=builder.as_markup())
-    await query.message.delete()
     await state.clear()
 
 
@@ -214,20 +214,17 @@ async def payment_not_specified(msg: Message, state: FSMContext):
         f"Детали платежа: {data["text"]}\n"
         f"Время: {msg.date.strftime('%Y-%m-%d %H:%M:%S')}"
     )
-    await msg.bot.send_message(chat_id="1779829771", text=complaint_text)
+    await msg.bot.send_message(chat_id="xyncpay", text=complaint_text)
 
 
 # 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 query.message.delete()
-    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])))
 async def to_coin_select(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     is_target = await state.get_value("is_target")
     pref = "t" if is_target else "s"
@@ -237,7 +234,6 @@ async def to_coin_select(query: CallbackQuery, state: FSMContext):
 
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_cur, cd.PayStep.s_cur])))
 async def to_cur_select(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     is_target = await state.get_value("is_target")
     pref = "t" if is_target else "s"
@@ -247,7 +243,6 @@ async def to_cur_select(query: CallbackQuery, state: FSMContext):
 
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_pm, cd.PayStep.s_pm])))
 async def to_pm_select(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     await window.pm(query.message)
 
@@ -257,21 +252,17 @@ async def back_to_cred_detail(query: CallbackQuery, state: FSMContext):
     await ans(query, None)
     await state.update_data(detail=None)
     await window.fill_cred_dtl(query.message)
-    await query.message.delete()
 
 
 @pay.callback_query(cd.PayNav.filter(F.to.__eq__(cd.PayStep.t_cred_name)))
 async def back_to_cred_name(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     await state.update_data(name=None)
     await window.fill_cred_name(query.message)
-    await query.message.delete()
 
 
 @pay.callback_query(cd.PayNav.filter(F.to.in_([cd.PayStep.t_ex, cd.PayStep.s_ex])))
 async def back_to_ex_select(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     await state.update_data({("t" if await state.get_value("is_target") else "s") + "ex_id": None})
     await window.ex_select(query.message)
@@ -279,15 +270,14 @@ async def back_to_ex_select(query: CallbackQuery, state: FSMContext):
 
 @pay.callback_query(cd.PayNav.filter(F.to.__eq__(cd.PayStep.t_amount)))
 async def back_to_amount(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     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])))
 async def back_to_payment(query: CallbackQuery, state: FSMContext):
-    await query.message.delete()
     await ans(query, None)
     await state.update_data(payment=None)
     await window.pm(query.message)

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,14 +135,14 @@ 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]
 
     builder.button(text="Домой", callback_data=cd.PayNav(to=cd.PayStep.t_type))
     builder.adjust(2)
 
-    await msg.edit_text(f"Введите нужную сумму {cur_coin} для {t_name}", reply_markup=builder.as_markup())
+    await edt(msg, f"Введите нужную сумму {cur_coin} для {t_name}", builder.as_markup())
 
 
 async def set_ppo(msg: Message):

{xync_bot-0.3.24.dev5.dist-info → xync_bot-0.3.24.dev7.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ xync_bot/__init__.py,sha256=0m9zUYZUJHEJUMb24CU10wYfCIAg8eourNFlBLsHgWU,705
 xync_bot/loader.py,sha256=4ZeR-yVMoOmswdLS0UEBG19K7JVcuvH6WpP-_0yAK3I,573
 xync_bot/shared.py,sha256=MlKkTrsT29l7fF6-qAN9FO14cSuXuOuYxbNY5F4S2w4,137
 xync_bot/typs.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_bot/routers/__init__.py,sha256=GxSG8zgK0zVNK_U-mF4XWddgmCxfbfp2xwt_49zweVE,3171
+xync_bot/routers/__init__.py,sha256=oYmYlDhtk6Gmy3QaDNlWV9ym-JnaPNenWglfffJqQb4,3179
 xync_bot/routers/main.py,sha256=FumWa48ORhV77Df6NbEosHfgmFIe_Y2ci6IkJCvU4Zs,9535
 xync_bot/routers/order.py,sha256=ZKWDLyiWrXzcR-aHKLBTBCACwp-P0Vvnr22T-EuLHaM,274
 xync_bot/routers/photo.py,sha256=aq6ImIOoZQYTW-lEy26qjgj5TYAuk4bQjgiCv64mPJs,1203
@@ -11,10 +11,10 @@ xync_bot/routers/xicon.png,sha256=O57_kvzhVcCXSoGYZ61m0dW9pizY6gxR8Yj5aeCP0RQ,42
 xync_bot/routers/cond/__init__.py,sha256=It4djVO8AxXL1I76buRz8yYF12dsjXaa4WNtPdb7CFc,4333
 xync_bot/routers/cond/func.py,sha256=m0NWDKunbqDJQmhv_5UnpjxjRzn78GFG94ThOFLVlQo,4720
 xync_bot/routers/pay/cd.py,sha256=WGeGqFUvEeXWcL42EJ3jjyFAK1rg2X7yp5Z-W5GiWXE,900
-xync_bot/routers/pay/dep.py,sha256=tRBOHiuimJ2xBlT0f8xg2Yl3rFm92L--Lflts5e6hD0,3844
-xync_bot/routers/pay/handler.py,sha256=oni761tmSsEAzcC4aX3rNOEpngJRkXjvoscsj-6C4rs,11545
-xync_bot/routers/pay/window.py,sha256=Nmm9gFPWvWsIWMggObLs8tC4hxQpybYmePAUdwCAL34,9325
-xync_bot-0.3.24.dev5.dist-info/METADATA,sha256=K9jbDFDA0jKiIL_n1zPlMM2s7han1HfqVIsMERYfSMA,751
-xync_bot-0.3.24.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_bot-0.3.24.dev5.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.3.24.dev5.dist-info/RECORD,,
+xync_bot/routers/pay/dep.py,sha256=QYB5vgDjdEDO-kZGdYsFq7nv3lRXjpquumJRArbg1jY,4038
+xync_bot/routers/pay/handler.py,sha256=g_lPBK2reNB-miDo3rYkSVaOehuHm9L1hPLTgcFy8VA,11314
+xync_bot/routers/pay/window.py,sha256=pr4oZpZii7SFQ5UsmzciPuZa_MM57OWseZTU1XRl7LY,9290
+xync_bot-0.3.24.dev7.dist-info/METADATA,sha256=v2T5phN-9DwmyQxxlPVBp8JqPfl0f5q6M984F8dw2Ks,751
+xync_bot-0.3.24.dev7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_bot-0.3.24.dev7.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.3.24.dev7.dist-info/RECORD,,