diff --git a/handlers/profile.py b/handlers/profile.py index 42c6d341..a559db5c 100644 --- a/handlers/profile.py +++ b/handlers/profile.py @@ -29,7 +29,6 @@ from config import ( NEWS_MESSAGE, REFERRAL_BUTTON, REFERRAL_OFFERS, - RENEWAL_PLANS, SHOW_START_MENU_ONCE, TOP_REFERRAL_BUTTON, TRIAL_TIME, @@ -167,12 +166,13 @@ async def balance_handler(callback_query: CallbackQuery, session: Any): builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) text = BALANCE_MANAGEMENT_TEXT.format(balance=balance) + image_path = os.path.join("img", "pic.jpg") await edit_or_send_message( target_message=callback_query.message, text=text, reply_markup=builder.as_markup(), - media_path=None, + media_path=image_path, disable_web_page_preview=False, ) @@ -210,29 +210,6 @@ async def balance_history_handler(callback_query: CallbackQuery, session: Any): ) -@router.message(F.text == "/tariffs") -@router.callback_query(F.data == "view_tariffs") -async def view_tariffs_handler(callback_query: CallbackQuery): - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - image_path = os.path.join("img", "tariffs.jpg") - tariffs_message = "🚀 Доступные тарифы VPN:\n\n" + "\n".join([ - f"{months} {'месяц' if months == '1' else 'месяца' if int(months) in [2, 3, 4] else 'месяцев'}: " - f"{RENEWAL_PLANS[months]['price']} " - f"{'💳' if months == '1' else '🌟' if months == '3' else '🔥' if months == '6' else '🚀'} рублей" - for months in sorted(RENEWAL_PLANS.keys(), key=int) - ]) - - await edit_or_send_message( - target_message=callback_query.message, - text=tariffs_message, - reply_markup=builder.as_markup(), - media_path=image_path, - disable_web_page_preview=False, - ) - - @router.callback_query(F.data == "invite") @router.message(F.text == "/invite") async def invite_handler(callback_query_or_message: Message | CallbackQuery): diff --git a/handlers/start.py b/handlers/start.py index d0c28faa..46333f95 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -313,11 +313,12 @@ async def handle_about_vpn(callback_query: CallbackQuery): builder.row(InlineKeyboardButton(text=BACK, callback_data="start")) text = get_about_vpn("3.2.3-minor") + image_path = os.path.join("img", "pic.jpg") await edit_or_send_message( target_message=callback_query.message, text=text, reply_markup=builder.as_markup(), - media_path=None, + media_path=image_path, force_text=False, ) \ No newline at end of file diff --git a/img/gifts.jpg b/img/gifts.jpg index 1064f788..2360e821 100644 Binary files a/img/gifts.jpg and b/img/gifts.jpg differ diff --git a/img/instructions.jpg b/img/instructions.jpg index 1064f788..7924b0c7 100644 Binary files a/img/instructions.jpg and b/img/instructions.jpg differ diff --git a/img/notify_10h.jpg b/img/notify_10h.jpg index 1064f788..56398478 100644 Binary files a/img/notify_10h.jpg and b/img/notify_10h.jpg differ diff --git a/img/notify_24h.jpg b/img/notify_24h.jpg index 1064f788..56398478 100644 Binary files a/img/notify_24h.jpg and b/img/notify_24h.jpg differ diff --git a/img/notify_expired.jpg b/img/notify_expired.jpg index 1064f788..56398478 100644 Binary files a/img/notify_expired.jpg and b/img/notify_expired.jpg differ diff --git a/img/pic.jpg b/img/pic.jpg index 1064f788..17bedc90 100644 Binary files a/img/pic.jpg and b/img/pic.jpg differ diff --git a/img/pic_invite.jpg b/img/pic_invite.jpg index 1064f788..aaf25c58 100644 Binary files a/img/pic_invite.jpg and b/img/pic_invite.jpg differ diff --git a/img/pic_keys.jpg b/img/pic_keys.jpg index 1064f788..b1291548 100644 Binary files a/img/pic_keys.jpg and b/img/pic_keys.jpg differ diff --git a/img/pic_view.jpg b/img/pic_view.jpg index 1064f788..0bbbacf1 100644 Binary files a/img/pic_view.jpg and b/img/pic_view.jpg differ diff --git a/img/profile.jpg b/img/profile.jpg index 1064f788..67bd752f 100644 Binary files a/img/profile.jpg and b/img/profile.jpg differ