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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev5
+Version: 0.3.24.dev6
 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 → xync_bot-0.3.24.dev6}/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
@@ -110,6 +111,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-0.3.24.dev5 → xync_bot-0.3.24.dev6}/xync_bot/routers/pay/handler.py

@@ -125,18 +125,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())
@@ -190,7 +190,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 +213,18 @@ 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"))
 
 
 @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,7 +270,6 @@ 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)
@@ -287,7 +277,6 @@ async def back_to_amount(query: CallbackQuery, state: FSMContext):
 
 @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-0.3.24.dev5 → xync_bot-0.3.24.dev6}/xync_bot/routers/pay/window.py

@@ -142,7 +142,7 @@ async def amount(msg: Message):
     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 → xync_bot-0.3.24.dev6/xync_bot.egg-info}/PKG-INFO

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