my-dev
/
uploader-bot
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev@locazia: fix someth

This commit is contained in:
user 2024-02-29 00:28:17 +03:00
parent 9bc46a01fe
commit 3618a54282
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/bot/routers/home.py
View File

@ -11,7 +11,7 @@ from aiogram.filters import Command
main_router = Router() main_router = Router()
async def send_home_menu(chat_wrap, user, wallet_connection): async def send_home_menu(chat_wrap, user, wallet_connection, **kwargs):
return await tg_process_template( return await tg_process_template(
chat_wrap, user.translated('home_menu').format( chat_wrap, user.translated('home_menu').format(
wallet_address=wallet_connection.wallet_address wallet_address=wallet_connection.wallet_address
@ -24,11 +24,11 @@ async def send_home_menu(chat_wrap, user, wallet_connection):
'text': user.translated('disconnectWallet_button'), 'text': user.translated('disconnectWallet_button'),
'callback_data': 'disconnectWallet' 'callback_data': 'disconnectWallet'
}] }]
]) ]), **kwargs
) )
async def send_connect_wallets_list(db_session, chat_wrap, user): async def send_connect_wallets_list(db_session, chat_wrap, user, **kwargs):
ton_connect, ton_connection = TonConnect.by_user(db_session, user, callback_fn=()) ton_connect, ton_connection = TonConnect.by_user(db_session, user, callback_fn=())
await ton_connect.restore_connection() await ton_connect.restore_connection()
wallets = ton_connect._sdk_client.get_wallets() wallets = ton_connect._sdk_client.get_wallets()
@ -47,7 +47,7 @@ async def send_connect_wallets_list(db_session, chat_wrap, user):
} if i + 1 < len(wallets) else None, } if i + 1 < len(wallets) else None,
] ]
for i in range(0, len(wallets), 2) for i in range(0, len(wallets), 2)
]) ]), **kwargs
) )
@ -56,15 +56,22 @@ async def t_home_menu(__msg, **extra):
if extra.get('state'): if extra.get('state'):
await extra['state'].clear() await extra['state'].clear()
if isinstance(__msg, types.CallbackQuery):
message_id = __msg.message.message_id
elif isinstance(__msg, types.Message):
message_id = __msg.message_id
else:
message_id = None
wallet_connection = db_session.query(WalletConnection).filter( wallet_connection = db_session.query(WalletConnection).filter(
WalletConnection.user_id == user.id, WalletConnection.user_id == user.id,
WalletConnection.invalidated == False WalletConnection.invalidated == False
).first() ).first()
if not wallet_connection: if not wallet_connection:
return await send_connect_wallets_list(db_session, chat_wrap, user) return await send_connect_wallets_list(db_session, chat_wrap, user, message_id=message_id)
return await send_home_menu(chat_wrap, user, wallet_connection) return await send_home_menu(chat_wrap, user, wallet_connection, message_id=message_id)
main_router.message.register(t_home_menu, Command('start')) main_router.message.register(t_home_menu, Command('start'))

2
app/bot/routers/tonconnect.py
View File

@ -98,7 +98,7 @@ async def t_callback_disconnect_wallet(query: types.CallbackQuery, memory=None,
wallet_connection.invalidated = True wallet_connection.invalidated = True
db_session.commit() db_session.commit()
return await send_connect_wallets_list(db_session, chat_wrap, user) return await send_connect_wallets_list(db_session, chat_wrap, user, message_id=query.message.message_id)
router.message.register(t_tonconnect_dev_menu, Command('dev_tonconnect')) router.message.register(t_tonconnect_dev_menu, Command('dev_tonconnect'))
router.callback_query.register(t_callback_init_tonconnect, F.data.startswith('initTonconnect_')) router.callback_query.register(t_callback_init_tonconnect, F.data.startswith('initTonconnect_'))