fca8d6da97
* fix: update subscription_crypto_link when syncing user from panel (#2867) * fix: update subscription_crypto_link when syncing user from panel * fix: update subscription_crypto_link when syncing user from panel * fix: use PROXY_URL for Telegram OIDC JWKS requests (#2866) * feat: add TELEGRAM_API_URL for custom Telegram Bot API server Support custom Telegram Bot API server URL via TELEGRAM_API_URL env var. Enables bot operation in regions where api.telegram.org is blocked (Cloudflare Worker, self-hosted telegram-bot-api, nginx reverse proxy). Uses native aiogram TelegramAPIServer.from_base(), works with PROXY_URL. * fix(ci): read Docker image version from release-please manifest instead of hardcoding (#2859) The x-release-please-version markers in workflow files were stuck at v3.7.0 since commit5070bb34removed them from extra-files (GitHub Actions returns 403 when release-please tries to modify .github/workflows/ via GITHUB_TOKEN). Instead of hardcoding the version, read it from .release-please-manifest.json at build time. This file is always kept in sync by release-please and does not require workflow file write permissions. --- Маркеры x-release-please-version в workflow-файлах застряли на v3.7.0 после коммита5070bb34, который удалил их из extra-files (GitHub Actions возвращает 403 при попытке release-please изменить .github/workflows/ через GITHUB_TOKEN). Вместо хардкода версии теперь читаем её из .release-please-manifest.json во время сборки. Этот файл всегда синхронизируется release-please и не требует прав на запись в workflow-файлы. * fix: format telegram_auth.py to use single quotes (ruff) * fix: remove daily tariff fallback to smallest period discount Daily tariffs (period_days=1) incorrectly inherited the discount of the smallest configured period (e.g. 90 days -> 5%). This caused daily prices to show discounts that were never intended for them. Now daily tariffs only get a discount if explicitly configured for period_days=1 in the promo group's period_discounts. * fix: use CABINET_URL for campaign web links instead of MINIAPP_CUSTOM_URL Campaign web links were generated from MINIAPP_CUSTOM_URL which is often empty, causing get_campaign_web_link() to return None. Admins and partners could only share bot links for campaigns, not cabinet links. Now prefers CABINET_URL (where the auth flow captures ?campaign= param), falling back to MINIAPP_CUSTOM_URL for backwards compatibility. This is consistent with how referral web links already use CABINET_URL. * feat: add DISPLAY_NAME_RESTRICTION_ENABLED toggle Allows disabling the display name restriction middleware via .env. Users with special characters in their Telegram name (e.g. "@") were blocked from using the bot entirely. Default: true (enabled). Set DISPLAY_NAME_RESTRICTION_ENABLED=false to disable. * fix: allow clearing all period discounts from promo groups Empty period_discounts dict was normalized to None by the schema, making it indistinguishable from "field absent" (don't update). Now empty dict passes through to CRUD which correctly sets period_discounts=None in DB, clearing all discounts. * fix: create panel user instead of update for new subscriptions in multi-tariff mode In multi-tariff mode, new subscriptions have remnawave_uuid=None. The old logic fell back to user.remnawave_uuid (from a previous subscription) and called update_remnawave_user(), which refused to work because the NEW subscription had no UUID. Now correctly: in multi-tariff mode, always CREATE if subscription has no remnawave_uuid. In single-tariff mode, use user-level UUID. Fixes: "subscription has no remnawave_uuid, cannot update panel" * fix: apply same create-vs-update fix to renewal and purchase flows Same bug as the tariff purchase fix: in multi-tariff mode, new subscriptions without remnawave_uuid incorrectly fell back to user.remnawave_uuid and called update instead of create. Fixed in subscription_renewal_service.py and purchase.py to use the same _should_create pattern based on mode. * fix: apply create-vs-update fix to all remaining tariff_purchase flows Fixed 6 more locations in tariff_purchase.py that had the same broken pattern (custom purchase, daily purchase, trial conversion, tariff switch, daily switch, instant switch). All now use _should_create based on multi-tariff mode instead of falling back to user UUID. * fix: apply create-vs-update fix to cabinet traffic/devices and monitoring Same multi-tariff create-vs-update bug in 5 more locations: - cabinet/subscription_modules/traffic.py (2 instances) - cabinet/subscription_modules/devices.py (2 instances) - services/monitoring_service.py (1 instance) All now use _should_create pattern based on subscription.remnawave_uuid in multi-tariff mode instead of falling back to user.remnawave_uuid. * fix: ruff format traffic.py and monitoring_service.py --------- Co-authored-by: Dmitry V. Lunin <49199230+BlackRaincoat@users.noreply.github.com> Co-authored-by: Gary Jarrel <gary@jarrel.com.au>
29 lines
1.1 KiB
Python
29 lines
1.1 KiB
Python
"""Factory for creating Bot instances with proxy and custom API server support."""
|
|
|
|
from aiogram import Bot
|
|
from aiogram.client.default import DefaultBotProperties
|
|
from aiogram.enums import ParseMode
|
|
|
|
from app.config import settings
|
|
|
|
|
|
def create_bot(token: str | None = None, **kwargs) -> Bot:
|
|
"""Create a Bot instance with SOCKS5 proxy and/or custom Telegram API server."""
|
|
proxy_url = settings.get_proxy_url()
|
|
telegram_api_url = settings.get_telegram_api_url()
|
|
session = None
|
|
if proxy_url or telegram_api_url:
|
|
from aiogram.client.session.aiohttp import AiohttpSession
|
|
from aiogram.client.telegram import TelegramAPIServer
|
|
|
|
session_kwargs: dict = {}
|
|
if proxy_url:
|
|
session_kwargs['proxy'] = proxy_url
|
|
if telegram_api_url:
|
|
session_kwargs['api'] = TelegramAPIServer.from_base(telegram_api_url)
|
|
|
|
session = AiohttpSession(**session_kwargs)
|
|
|
|
kwargs.setdefault('default', DefaultBotProperties(parse_mode=ParseMode.HTML))
|
|
return Bot(token=token or settings.BOT_TOKEN, session=session, **kwargs)
|