Add Docker build workflow and enhance admin functionalities

- Introduced a new GitHub Actions workflow for building and pushing the development Docker image. - Added inline mode handling for user interactions, allowing users to share referral links and view statistics. - Enhanced admin functionalities with new sections for user management, statistics, and promo code management. - Implemented CSV export for logs and improved notification services for various events, including new user registrations and payment notifications. - Updated localization files to support new features and commands.
2025-08-03 15:59:37 +03:00
parent 35d798a429
commit f0bbe90f80
23 changed files with 2270 additions and 549 deletions
@@ -59,21 +59,94 @@ async def request_trial_confirmation_handler(
        await callback.answer()
        return

-    traffic_gb_display = (
-        str(settings.TRIAL_TRAFFIC_LIMIT_GB)
-        if settings.TRIAL_TRAFFIC_LIMIT_GB and settings.TRIAL_TRAFFIC_LIMIT_GB > 0
-        else _("traffic_unlimited")
+    # Directly activate trial without confirmation
+    activation_result = await subscription_service.activate_trial_subscription(
+        session, user_id
    )

-    await callback.message.edit_text(
-        text=_(
-            "trial_confirm_prompt",
-            days=settings.TRIAL_DURATION_DAYS,
-            traffic_gb=traffic_gb_display,
-        ),
-        reply_markup=get_trial_confirmation_keyboard(current_lang, i18n),
-    )
-    await callback.answer()
+    final_message_text_in_chat = ""
+    show_trial_button_after_action = False
+
+    if activation_result and activation_result.get("activated"):
+        await callback.answer(_("trial_activated_alert"), show_alert=True)
+
+        end_date_obj = activation_result.get("end_date")
+        config_link_for_trial = activation_result.get("subscription_url") or _(
+            "config_link_not_available"
+        )
+
+        traffic_gb_val = activation_result.get(
+            "traffic_gb", settings.TRIAL_TRAFFIC_LIMIT_GB
+        )
+        traffic_display = (
+            f"{traffic_gb_val} GB"
+            if traffic_gb_val and traffic_gb_val > 0
+            else _("traffic_unlimited")
+        )
+
+        final_message_text_in_chat = _(
+            "trial_activated_details_message",
+            days=activation_result.get("days", settings.TRIAL_DURATION_DAYS),
+            end_date=(
+                end_date_obj.strftime("%Y-%m-%d")
+                if isinstance(end_date_obj, datetime)
+                else "N/A"
+            ),
+            config_link=config_link_for_trial,
+            traffic_gb=traffic_display,
+        )
+        
+        # Send notification to admin about new trial
+        await notify_admin_new_trial(
+            callback.bot,
+            settings,
+            i18n,
+            user_id,
+            end_date_obj,
+        )
+    else:
+        message_key_from_service = (
+            activation_result.get("message_key", "trial_activation_failed")
+            if activation_result
+            else "trial_activation_failed"
+        )
+        final_message_text_in_chat = _(message_key_from_service)
+        await callback.answer(final_message_text_in_chat, show_alert=True)
+        if (
+            settings.TRIAL_ENABLED
+            and not await subscription_service.has_had_any_subscription(
+                session, user_id
+            )
+        ):
+            show_trial_button_after_action = True
+
+    try:
+        await callback.message.edit_text(
+            final_message_text_in_chat,
+            parse_mode="HTML",
+            reply_markup=get_main_menu_inline_keyboard(
+                current_lang, i18n, settings, show_trial_button_after_action
+            ),
+            disable_web_page_preview=True,
+        )
+    except Exception as e_edit:
+        logging.warning(
+            f"Could not edit trial result message: {e_edit}. Sending new one."
+        )
+
+        if (
+            callback.message
+            and hasattr(callback.message, "chat")
+            and callback.message.chat
+        ):
+            await callback.message.chat.send_message(
+                final_message_text_in_chat,
+                parse_mode="HTML",
+                reply_markup=get_main_menu_inline_keyboard(
+                    current_lang, i18n, settings, show_trial_button_after_action
+                ),
+                disable_web_page_preview=True,
+            )


@router.callback_query(F.data == "trial_action:confirm_activate")