Update README.md

Update .env.example
2025-08-14 05:29:41 +03:00 · 2025-08-14 05:26:12 +03:00 · 2025-08-14 05:08:03 +03:00 · 2025-08-14 04:45:02 +03:00 · 2025-08-14 04:44:33 +03:00 · 2025-08-14 04:44:09 +03:00
63 changed files with 8507 additions and 1350 deletions
@@ -10,7 +10,6 @@ REFERRAL_PERCENTAGE=0.2

 # RemnaWave API Configuration
 REMNAWAVE_URL=https://example.com
-REMNAWAVE_MODE=remote  
 REMNAWAVE_TOKEN=

 # Admin Configuration (comma-separated list of Telegram user IDs)
@@ -19,18 +18,54 @@ ADMIN_IDS=123445567,12342123
 # Support Configuration
 SUPPORT_USERNAME=support

-TRIAL_ENABLED=true
-TRIAL_DURATION_DAYS=3
-TRIAL_TRAFFIC_GB=2
-TRIAL_SQUAD_UUID=
-TRIAL_PRICE=0.0
+TRIAL_ENABLED=true # Включить триал
+TRIAL_DURATION_DAYS=3 # Дней триала 
+TRIAL_TRAFFIC_GB=2 # Лимит трафика у триал подписки
+TRIAL_SQUAD_UUID=  # UUID сквада из панели remnawave /dashboard/management/internal-squads
+TRIAL_PRICE=0.0 # Оставить 0!
+TRIAL_NOTIFICATION_ENABLED=true # Уведомление об истекшей триальной подписке 
+TRIAL_NOTIFICATION_HOURS_AFTER=1 # Через сколько отсылать сообщение 
+TRIAL_NOTIFICATION_HOURS_WINDOW=23 # Через сколько выслать повторно 

 # Monitor Service Settings (дополнительные настройки)
-MONITOR_CHECK_INTERVAL=3600
-MONITOR_DAILY_CHECK_HOUR=10
-MONITOR_WARNING_DAYS=2
+MONITOR_CHECK_INTERVAL=21600   # Промежуток проверики (3600 - будет раз в час проверять и слать уведомления)
+MONITOR_DAILY_CHECK_HOUR=10 # Ежедневный чек в 10 утра
+MONITOR_WARNING_DAYS=2 # За сколько начинать до окончания подписки слать уведомления
+DELETE_EXPIRED_TRIAL_DAYS=1   # Через сколько дней после истечения удалять триал подписки
+DELETE_EXPIRED_REGULAR_DAYS=7 # Через сколько дней после истечения удалять обычные подписки  
+AUTO_DELETE_ENABLED=true  # Включить автоматическое удаление при ежедневной проверке
+

 LUCKY_GAME_ENABLED=true                 # Включить/выключить игру удачи
 LUCKY_GAME_REWARD=50.0                  # Размер награды за выигрыш в рублях
 LUCKY_GAME_NUMBERS=30                   # Общее количество чисел для выбора (1-30)
 LUCKY_GAME_WINNING_COUNT=25              # Количество выигрышных чисел из общего количества
+
+# ================================
+# TELEGRAM STARS НАСТРОЙКИ
+# ================================
+# Включить/выключить пополнение через Telegram Stars
+STARS_ENABLED=true
+# Курсы обмена звезд на рубли
+# Формат: STARS_{количество_звезд}_RATE={рубли}
+# 100 звёзд
+STARS_100_RATE=110
+# 150 звёзд 
+STARS_150_RATE=165
+# 250 звёзд
+STARS_250_RATE=280
+# 350 звёзд
+STARS_350_RATE=355
+# 500 звёзд
+STARS_500_RATE=550
+# 750 звёзд
+STARS_750_RATE=800
+# 1000 звёзд 
+STARS_1000_RATE=1000
+
+
+TRIBUTE_ENABLED=true  # true/false включить/выключить пополнение баланса с помощью доната на Tribute
+TRIBUTE_API_KEY=  # API ключ из настроек Tribute
+TRIBUTE_WEBHOOK_PORT=8081
+TRIBUTE_WEBHOOK_PATH=/tribute-webhook
+TRIBUTE_DONATE_LINK=https://t.me/tribute/app?startapp=XXXXXXXX  # укажите ссылку на донат в Tribute
@@ -0,0 +1,2 @@
+/screens
+/assets
@@ -0,0 +1,295 @@
+<svg viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <!-- Градиенты -->
+    <linearGradient id="mainGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#667eea;stop-opacity:1" />
+      <stop offset="50%" style="stop-color:#764ba2;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#f093fb;stop-opacity:1" />
+    </linearGradient>
+    
+    <linearGradient id="skinGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#d4a574;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#b8935f;stop-opacity:1" />
+    </linearGradient>
+    
+    <linearGradient id="redSkinGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#e8b598;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#d4a574;stop-opacity:1" />
+    </linearGradient>
+    
+    <linearGradient id="clothesGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#3a3a3a;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#595959;stop-opacity:1" />
+    </linearGradient>
+    
+    <linearGradient id="bottleGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#2d5016;stop-opacity:0.8" />
+      <stop offset="100%" style="stop-color:#1a2f0d;stop-opacity:0.9" />
+    </linearGradient>
+    
+    <!-- Фильтры -->
+    <filter id="glow" x="-50%" y="-50%" width="200%" height="200%">
+      <feGaussianBlur stdDeviation="3" result="coloredBlur"/>
+      <feMerge> 
+        <feMergeNode in="coloredBlur"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    
+    <filter id="dropshadow" x="-50%" y="-50%" width="200%" height="200%">
+      <feGaussianBlur in="SourceAlpha" stdDeviation="4"/>
+      <feOffset dx="2" dy="4" result="offset" />
+      <feComponentTransfer>
+        <feFuncA type="linear" slope="0.3"/>
+      </feComponentTransfer>
+      <feMerge> 
+        <feMergeNode/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+  </defs>
+  
+  <!-- Фон -->
+  <rect width="400" height="400" fill="#1a1a2e" rx="50"/>
+  
+  <!-- Декоративные элементы фона -->
+  <circle cx="50" cy="80" r="30" fill="url(#mainGradient)" opacity="0.1"/>
+  <circle cx="350" cy="120" r="40" fill="#8B4513" opacity="0.1"/>
+  
+  <!-- Волны RemnaWave в фоне -->
+  <g transform="translate(200,200)" opacity="0.2">
+    <path d="M-120,-100 Q-60,-130 0,-100 Q60,-70 120,-100" 
+          stroke="url(#mainGradient)" 
+          stroke-width="4" 
+          fill="none">
+      <animate attributeName="d" 
+               values="M-120,-100 Q-60,-130 0,-100 Q60,-70 120,-100;M-120,-100 Q-60,-70 0,-100 Q60,-130 120,-100;M-120,-100 Q-60,-130 0,-100 Q60,-70 120,-100" 
+               dur="4s" 
+               repeatCount="indefinite"/>
+    </path>
+  </g>
+  
+  <!-- Главный персонаж - Бомж-алкаш -->
+  <g transform="translate(200,180)" filter="url(#dropshadow)">
+    
+    <!-- Тело в рваной куртке -->
+    <ellipse cx="0" cy="30" rx="45" ry="60" fill="url(#clothesGradient)"/>
+    
+    <!-- Рваные края одежды -->
+    <path d="M-45,70 L-40,75 L-35,70 L-30,75 L-25,70 L-20,75 L-15,70 L-10,75 L-5,70 L0,75 L5,70 L10,75 L15,70 L20,75 L25,70 L30,75 L35,70 L40,75 L45,70" 
+          stroke="none" fill="#2a2a2a"/>
+    
+    <!-- Заплатки -->
+    <rect x="-20" y="10" width="12" height="10" fill="#5a4a3a" opacity="0.7" rx="2"/>
+    <rect x="15" y="35" width="10" height="8" fill="#4a4a4a" opacity="0.8" rx="1"/>
+    <rect x="-10" y="45" width="8" height="12" fill="#6a5a4a" opacity="0.6" rx="1"/>
+    
+    <!-- Шея -->
+    <rect x="-12" y="-25" width="24" height="20" fill="url(#redSkinGradient)" rx="8"/>
+    
+    <!-- Голова (более человечная форма) -->
+    <ellipse cx="0" cy="-45" rx="28" ry="32" fill="url(#redSkinGradient)"/>
+    
+    <!-- Сальные волосы -->
+    <path d="M-25,-70 Q-20,-75 -15,-72 Q-10,-78 -5,-73 Q0,-80 5,-73 Q10,-78 15,-72 Q20,-75 25,-70" 
+          stroke="#3a3a3a" stroke-width="4" fill="#3a3a3a" stroke-linecap="round"/>
+    <path d="M-28,-65 Q-25,-70 -20,-67" stroke="#3a3a3a" stroke-width="3" fill="none" stroke-linecap="round"/>
+    <path d="M28,-65 Q25,-70 20,-67" stroke="#3a3a3a" stroke-width="3" fill="none" stroke-linecap="round"/>
+    
+    <!-- Левое ухо -->
+    <ellipse cx="-28" cy="-45" rx="6" ry="10" fill="url(#skinGradient)"/>
+    
+    <!-- Правое ухо -->
+    <ellipse cx="28" cy="-45" rx="6" ry="10" fill="url(#skinGradient)"/>
+    
+    <!-- Опухшие глаза -->
+    <ellipse cx="-10" cy="-50" rx="8" ry="5" fill="white"/>
+    <ellipse cx="10" cy="-50" rx="8" ry="5" fill="white"/>
+    
+    <!-- Зрачки (косящие) -->
+    <g id="eyes">
+      <circle cx="-8" cy="-49" r="3" fill="#333">
+        <animate attributeName="cx" values="-8;-10;-8" dur="3s" repeatCount="indefinite"/>
+      </circle>
+      <circle cx="12" cy="-49" r="3" fill="#333">
+        <animate attributeName="cx" values="12;10;12" dur="3s" repeatCount="indefinite"/>
+      </circle>
+    </g>
+    
+    <!-- Красные глаза -->
+    <path d="M-18,-50 L-15,-51" stroke="red" stroke-width="1" opacity="0.7"/>
+    <path d="M-17,-48 L-14,-49" stroke="red" stroke-width="0.5" opacity="0.7"/>
+    <path d="M18,-50 L15,-51" stroke="red" stroke-width="1" opacity="0.7"/>
+    <path d="M17,-48 L14,-49" stroke="red" stroke-width="0.5" opacity="0.7"/>
+    
+    <!-- Мешки под глазами -->
+    <ellipse cx="-10" cy="-44" rx="8" ry="3" fill="#8a6a4a" opacity="0.5"/>
+    <ellipse cx="10" cy="-44" rx="8" ry="3" fill="#8a6a4a" opacity="0.5"/>
+    
+    <!-- Красный нос алкаша -->
+    <ellipse cx="0" cy="-38" rx="6" ry="5" fill="#d67070"/>
+    <circle cx="-2" cy="-39" r="1" fill="#e08080" opacity="0.8"/>
+    
+    <!-- Небритость -->
+    <g opacity="0.6">
+      <circle cx="-15" cy="-30" r="1" fill="#555"/>
+      <circle cx="-12" cy="-28" r="0.8" fill="#555"/>
+      <circle cx="-8" cy="-30" r="0.8" fill="#555"/>
+      <circle cx="15" cy="-30" r="1" fill="#555"/>
+      <circle cx="12" cy="-28" r="0.8" fill="#555"/>
+      <circle cx="8" cy="-30" r="0.8" fill="#555"/>
+      <circle cx="0" cy="-28" r="0.8" fill="#555"/>
+      <circle cx="-5" cy="-26" r="0.8" fill="#555"/>
+      <circle cx="5" cy="-26" r="0.8" fill="#555"/>
+    </g>
+    
+    <!-- Рот с сигаретой/бутылкой (анимированный) -->
+    <g id="mouth-group">
+      <!-- Основной рот -->
+      <path d="M-12,-20 Q0,-18 12,-20" stroke="#444" stroke-width="2" fill="none" stroke-linecap="round"/>
+      
+      <!-- Сигарета (появляется и исчезает) -->
+      <g id="cigarette">
+        <rect x="10" y="-22" width="25" height="3" fill="white" rx="1">
+          <animate attributeName="opacity" values="0;0;0;1;1;1;0;0;0" dur="8s" repeatCount="indefinite"/>
+        </rect>
+        <rect x="30" y="-22" width="5" height="3" fill="#ff6b35">
+          <animate attributeName="opacity" values="0;0;0;1;1;1;0;0;0" dur="8s" repeatCount="indefinite"/>
+        </rect>
+        <!-- Дым от сигареты -->
+        <g opacity="0.4">
+          <circle cx="35" cy="-22" r="2" fill="#999">
+            <animate attributeName="opacity" values="0;0;0;0.6;0.3;0;0;0;0" dur="8s" repeatCount="indefinite"/>
+            <animate attributeName="cy" values="-22;-22;-22;-28;-35;-40;-22;-22;-22" dur="8s" repeatCount="indefinite"/>
+            <animate attributeName="r" values="2;2;2;4;6;8;2;2;2" dur="8s" repeatCount="indefinite"/>
+          </circle>
+        </g>
+      </g>
+    </g>
+    
+    <!-- Левая рука с бутылкой -->
+    <g id="left-arm">
+      <!-- Рука -->
+      <line x1="-45" y1="10" x2="-55" y2="-5" stroke="url(#skinGradient)" stroke-width="8" stroke-linecap="round">
+        <animate attributeName="x2" values="-55;-50;-55" dur="8s" repeatCount="indefinite"/>
+        <animate attributeName="y2" values="-5;-20;-5" dur="8s" repeatCount="indefinite"/>
+      </line>
+      
+      <!-- Кисть -->
+      <circle cx="-55" cy="-5" r="6" fill="url(#skinGradient)">
+        <animate attributeName="cx" values="-55;-50;-55" dur="8s" repeatCount="indefinite"/>
+        <animate attributeName="cy" values="-5;-20;-5" dur="8s" repeatCount="indefinite"/>
+      </circle>
+      
+      <!-- Бутылка -->
+      <g id="bottle">
+        <rect x="-62" y="-25" width="14" height="30" fill="url(#bottleGradient)" rx="2">
+          <animate attributeName="x" values="-62;-57;-62" dur="8s" repeatCount="indefinite"/>
+          <animate attributeName="y" values="-25;-40;-25" dur="8s" repeatCount="indefinite"/>
+          <animate attributeName="transform" values="rotate(0 -55 -10);rotate(-30 -50 -25);rotate(0 -55 -10)" dur="8s" repeatCount="indefinite"/>
+        </rect>
+        <rect x="-58" y="-30" width="6" height="8" fill="#2d5016">
+          <animate attributeName="x" values="-58;-53;-58" dur="8s" repeatCount="indefinite"/>
+          <animate attributeName="y" values="-30;-45;-30" dur="8s" repeatCount="indefinite"/>
+        </rect>
+        <!-- Этикетка -->
+        <rect x="-60" y="-15" width="10" height="8" fill="white" opacity="0.3">
+          <animate attributeName="x" values="-60;-55;-60" dur="8s" repeatCount="indefinite"/>
+          <animate attributeName="y" values="-15;-30;-15" dur="8s" repeatCount="indefinite"/>
+        </rect>
+      </g>
+    </g>
+    
+    <!-- Правая рука (свободная, дрожащая) -->
+    <g id="right-arm">
+      <line x1="45" y1="10" x2="55" y2="20" stroke="url(#skinGradient)" stroke-width="8" stroke-linecap="round">
+        <animate attributeName="x2" values="55;57;55;53;55" dur="2s" repeatCount="indefinite"/>
+      </line>
+      <circle cx="55" cy="20" r="6" fill="url(#skinGradient)">
+        <animate attributeName="cx" values="55;57;55;53;55" dur="2s" repeatCount="indefinite"/>
+      </circle>
+    </g>
+    
+    <!-- Ноги в рваных штанах -->
+    <rect x="-15" y="85" width="12" height="35" fill="#4a4a5a" rx="2"/>
+    <rect x="3" y="85" width="12" height="35" fill="#4a4a5a" rx="2"/>
+    
+    <!-- Дырки в штанах -->
+    <ellipse cx="-9" cy="95" rx="3" ry="4" fill="#1a1a2e"/>
+    <ellipse cx="9" cy="105" rx="2" ry="3" fill="#1a1a2e"/>
+    
+    <!-- Старые ботинки -->
+    <ellipse cx="-9" cy="125" rx="10" ry="6" fill="#2a2a2a"/>
+    <ellipse cx="9" cy="125" rx="10" ry="6" fill="#2a2a2a"/>
+    <!-- Дырки в ботинках -->
+    <circle cx="-6" cy="123" r="2" fill="#1a1a2e"/>
+    <circle cx="12" cy="123" r="1.5" fill="#1a1a2e"/>
+    
+    <!-- Значок "B" на груди -->
+    <circle cx="0" cy="25" r="20" fill="url(#mainGradient)" opacity="0.8" stroke="white" stroke-width="1"/>
+    <text x="0" y="35" 
+          font-family="Arial Black, sans-serif" 
+          font-size="28" 
+          font-weight="bold" 
+          text-anchor="middle" 
+          fill="white">
+      B
+    </text>
+  </g>
+  
+  <!-- Упавшие бутылки вокруг -->
+  <g opacity="0.6">
+    <rect x="80" y="340" width="8" height="20" fill="#2d5016" rx="1" transform="rotate(75 84 350)"/>
+    <rect x="310" y="330" width="7" height="18" fill="#3a5a1a" rx="1" transform="rotate(-60 313 339)"/>
+    <rect x="150" y="350" width="6" height="16" fill="#2d5016" rx="1" transform="rotate(45 153 358)"/>
+  </g>
+  
+  <!-- Окурки -->
+  <g opacity="0.7">
+    <rect x="120" y="360" width="12" height="2" fill="white" rx="1"/>
+    <rect x="130" y="360" width="2" height="2" fill="#ff6b35"/>
+    
+    <rect x="250" y="355" width="10" height="2" fill="white" rx="1" transform="rotate(30 255 356)"/>
+    <rect x="258" y="355" width="2" height="2" fill="#ff6b35" transform="rotate(30 259 356)"/>
+  </g>
+  
+  <!-- Текст логотипа -->
+  <text x="200" y="320" 
+        font-family="Arial Black, sans-serif" 
+        font-size="20" 
+        font-weight="bold" 
+        text-anchor="middle" 
+        fill="url(#mainGradient)" 
+        filter="url(#glow)">
+    Remnawave
+  </text>
+  
+  <text x="200" y="345" 
+        font-family="Arial Black, sans-serif" 
+        font-size="18" 
+        font-weight="bold" 
+        text-anchor="middle" 
+        fill="#d67070">
+    Bedolaga Bot
+  </text>
+  
+  <!-- Подпись -->
+  <text x="200" y="365" 
+        font-family="Arial, sans-serif" 
+        font-size="11" 
+        text-anchor="middle" 
+        fill="#8892b0" 
+        opacity="0.8">
+    Telegram VPN Manager
+  </text>
+  
+  <!-- Мухи летающие вокруг (признак антисанитарии) -->
+  <g opacity="0.5">
+    <circle cx="150" cy="150" r="1" fill="#333">
+      <animateTransform attributeName="transform" type="rotate" values="0 200 180;360 200 180" dur="6s" repeatCount="indefinite"/>
+    </circle>
+    <circle cx="250" cy="150" r="1" fill="#333">
+      <animateTransform attributeName="transform" type="rotate" values="360 200 180;0 200 180" dur="5s" repeatCount="indefinite"/>
+    </circle>
+  </g>
+</svg>
@@ -0,0 +1,284 @@
+import asyncio
+import logging
+from datetime import datetime, timedelta
+from typing import List, Optional
+from database import Database, UserSubscription, User, Subscription
+from remnawave_api import RemnaWaveAPI
+from referral_utils import process_referral_rewards
+
+logger = logging.getLogger(__name__)
+
+class AutoPayService:
+    
+    def __init__(self, db: Database, api: Optional[RemnaWaveAPI] = None, bot=None):
+        self.db = db
+        self.api = api
+        self.bot = bot
+        self.is_running = False
+        self.check_task = None
+        
+    async def start(self):
+        if self.is_running:
+            logger.warning("AutoPay service is already running")
+            return
+            
+        self.is_running = True
+        logger.info("🔄 Starting AutoPay service...")
+        
+        self.check_task = asyncio.create_task(self._periodic_check())
+        
+    async def stop(self):
+        if not self.is_running:
+            return
+            
+        self.is_running = False
+        logger.info("⏹ Stopping AutoPay service...")
+        
+        if self.check_task:
+            self.check_task.cancel()
+            try:
+                await self.check_task
+            except asyncio.CancelledError:
+                pass
+                
+    async def _periodic_check(self):
+        while self.is_running:
+            try:
+                await self.process_autopayments()
+                # Проверяем каждые 30 минут
+                await asyncio.sleep(1800)
+            except asyncio.CancelledError:
+                logger.info("AutoPay periodic check cancelled")
+                break
+            except Exception as e:
+                logger.error(f"Error in AutoPay periodic check: {e}")
+                await asyncio.sleep(300) 
+                
+    async def process_autopayments(self) -> dict:
+        logger.info("🔄 Processing autopayments...")
+        
+        try:
+            subscriptions_to_pay = await self.db.get_subscriptions_for_autopay()
+            
+            if not subscriptions_to_pay:
+                logger.info("No subscriptions ready for autopay")
+                return {
+                    'processed': 0,
+                    'successful': 0,
+                    'failed': 0,
+                    'insufficient_balance': 0,
+                    'errors': []
+                }
+            
+            logger.info(f"Found {len(subscriptions_to_pay)} subscriptions for autopay")
+            
+            stats = {
+                'processed': 0,
+                'successful': 0,
+                'failed': 0,
+                'insufficient_balance': 0,
+                'errors': []
+            }
+            
+            for user_sub in subscriptions_to_pay:
+                try:
+                    result = await self._process_single_autopayment(user_sub)
+                    stats['processed'] += 1
+                    
+                    if result['success']:
+                        stats['successful'] += 1
+                        logger.info(f"✅ Autopay successful for user {user_sub.user_id}, subscription {user_sub.id}")
+                    elif result['reason'] == 'insufficient_balance':
+                        stats['insufficient_balance'] += 1
+                        logger.info(f"💳 Insufficient balance for user {user_sub.user_id}, subscription {user_sub.id}")
+                    else:
+                        stats['failed'] += 1
+                        stats['errors'].append(f"User {user_sub.user_id}: {result['reason']}")
+                        logger.warning(f"❌ Autopay failed for user {user_sub.user_id}: {result['reason']}")
+                        
+                except Exception as e:
+                    stats['processed'] += 1
+                    stats['failed'] += 1
+                    error_msg = f"User {user_sub.user_id}: {str(e)}"
+                    stats['errors'].append(error_msg)
+                    logger.error(f"Error processing autopay for user {user_sub.user_id}: {e}")
+            
+            logger.info(f"📊 Autopay processing complete: {stats['successful']} successful, "
+                       f"{stats['failed']} failed, {stats['insufficient_balance']} insufficient balance")
+            
+            return stats
+            
+        except Exception as e:
+            logger.error(f"Error in process_autopayments: {e}")
+            return {
+                'processed': 0,
+                'successful': 0,
+                'failed': 0,
+                'insufficient_balance': 0,
+                'errors': [str(e)]
+            }
+    
+    async def _process_single_autopayment(self, user_sub: UserSubscription) -> dict:
+        try:
+            user = await self.db.get_user_by_telegram_id(user_sub.user_id)
+            if not user:
+                return {'success': False, 'reason': 'User not found'}
+            
+            subscription = await self.db.get_subscription_by_id(user_sub.subscription_id)
+            if not subscription:
+                return {'success': False, 'reason': 'Subscription plan not found'}
+            
+            if subscription.is_trial:
+                logger.info(f"Skipping autopay for trial subscription: user {user_sub.user_id}")
+                return {'success': False, 'reason': 'Trial subscriptions are not eligible for autopay'}
+            
+            if not user_sub.is_active or not user_sub.auto_pay_enabled:
+                return {'success': False, 'reason': 'Subscription inactive or autopay disabled'}
+            
+            if user.balance < subscription.price:
+                await self._notify_insufficient_balance(user, subscription, user_sub)
+                return {'success': False, 'reason': 'insufficient_balance'}
+            
+            return await self._execute_autopayment(user, subscription, user_sub)
+            
+        except Exception as e:
+            logger.error(f"Error in _process_single_autopayment: {e}")
+            return {'success': False, 'reason': str(e)}
+    
+    async def _execute_autopayment(self, user: User, subscription: Subscription, user_sub: UserSubscription) -> dict:
+        try:
+            user.balance -= subscription.price
+            await self.db.update_user(user)
+            
+            now = datetime.utcnow()
+            if user_sub.expires_at > now:
+                new_expiry = user_sub.expires_at + timedelta(days=subscription.duration_days)
+            else:
+                new_expiry = now + timedelta(days=subscription.duration_days)
+            
+            user_sub.expires_at = new_expiry
+            user_sub.is_active = True
+            await self.db.update_user_subscription(user_sub)
+            
+            if self.api and user_sub.short_uuid:
+                try:
+                    remna_user_details = await self.api.get_user_by_short_uuid(user_sub.short_uuid)
+                    if remna_user_details:
+                        user_uuid = remna_user_details.get('uuid')
+                        if user_uuid:
+                            expiry_str = new_expiry.isoformat() + 'Z'
+                            update_data = {
+                                'enable': True,
+                                'expireAt': expiry_str
+                            }
+                            await self.api.update_user(user_uuid, update_data)
+                            logger.info(f"Updated RemnaWave expiry for user {user_sub.user_id}")
+                except Exception as e:
+                    logger.warning(f"Failed to update RemnaWave expiry: {e}")
+            
+            payment = await self.db.create_payment(
+                user_id=user_sub.user_id,
+                amount=-subscription.price,
+                payment_type='autopay',
+                description=f'Автоплатеж: {subscription.name}',
+                status='completed'
+            )
+            
+            if self.bot:
+                try:
+                    await process_referral_rewards(
+                        user_sub.user_id,
+                        subscription.price,
+                        payment.id,
+                        self.db,
+                        self.bot,
+                        payment_type='autopay'
+                    )
+                except Exception as e:
+                    logger.warning(f"Failed to process referral rewards for autopay: {e}")
+            
+            await self._notify_successful_autopay(user, subscription, user_sub, new_expiry)
+            
+            return {'success': True, 'reason': 'Payment processed successfully'}
+            
+        except Exception as e:
+            logger.error(f"Error executing autopayment: {e}")
+            try:
+                user.balance += subscription.price
+                await self.db.update_user(user)
+            except:
+                pass
+            return {'success': False, 'reason': str(e)}
+    
+    async def _notify_successful_autopay(self, user: User, subscription: Subscription, 
+                                       user_sub: UserSubscription, new_expiry: datetime):
+        if not self.bot:
+            return
+        
+        try:
+            from utils import format_datetime
+            
+            text = f"✅ Автоматическое продление подписки\n\n"
+            text += f"📋 Подписка: {subscription.name}\n"
+            text += f"💰 Списано: {subscription.price} руб.\n"
+            text += f"📅 Продлено до: {format_datetime(new_expiry, user.language)}\n"
+            text += f"💳 Остаток на балансе: {user.balance} руб.\n\n"
+            text += f"🔄 Следующее продление произойдет автоматически за {user_sub.auto_pay_days_before} дн. до истечения.\n\n"
+            text += f"ℹ️ Для отключения автоплатежа перейдите в 'Мои подписки' → выберите подписку"
+            
+            from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+            keyboard = InlineKeyboardMarkup(inline_keyboard=[
+                [InlineKeyboardButton(text="📋 Мои подписки", callback_data="my_subscriptions")],
+                [InlineKeyboardButton(text="💰 Баланс", callback_data="balance")]
+            ])
+            
+            await self.bot.send_message(
+                user.telegram_id,
+                text,
+                reply_markup=keyboard
+            )
+            
+        except Exception as e:
+            logger.error(f"Failed to send autopay success notification: {e}")
+    
+    async def _notify_insufficient_balance(self, user: User, subscription: Subscription, user_sub: UserSubscription):
+        if not self.bot:
+            return
+        
+        try:
+            from utils import format_datetime
+            
+            needed = subscription.price - user.balance
+            days_left = (user_sub.expires_at - datetime.utcnow()).days
+            
+            text = f"⚠️ Не удалось автоматически продлить подписку\n\n"
+            text += f"📋 Подписка: {subscription.name}\n"
+            text += f"💰 Нужно для продления: {subscription.price} руб.\n"
+            text += f"💳 Ваш баланс: {user.balance} руб.\n"
+            text += f"💸 Недостает: {needed} руб.\n\n"
+            text += f"📅 Подписка истекает: {format_datetime(user_sub.expires_at, user.language)}\n"
+            text += f"⏰ Осталось дней: {days_left}\n\n"
+            text += f"💡 Пополните баланс для автоматического продления"
+            
+            from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+            keyboard = InlineKeyboardMarkup(inline_keyboard=[
+                [InlineKeyboardButton(text="💰 Пополнить баланс", callback_data="topup_balance")],
+                [InlineKeyboardButton(text="📋 Мои подписки", callback_data="my_subscriptions")]
+            ])
+            
+            await self.bot.send_message(
+                user.telegram_id,
+                text,
+                reply_markup=keyboard
+            )
+            
+        except Exception as e:
+            logger.error(f"Failed to send insufficient balance notification: {e}")
+    
+    async def get_service_status(self) -> dict:
+        return {
+            'is_running': self.is_running,
+            'check_interval': 1800, 
+            'has_api': self.api is not None,
+            'has_bot': self.bot is not None
+        }
@@ -1,48 +1,50 @@
 import os
 from dataclasses import dataclass
-from typing import List
+from typing import List, Dict

@dataclass
 class Config:
-    # Bot configuration
    BOT_TOKEN: str
    BOT_USERNAME: str
-    
-    # Database
    DATABASE_URL: str
-    
-    # RemnaWave API
    REMNAWAVE_URL: str
    REMNAWAVE_TOKEN: str
    SUBSCRIPTION_BASE_URL: str
-    
-    # Admin configuration
    ADMIN_IDS: List[int]
    SUPPORT_USERNAME: str
    DEFAULT_LANGUAGE: str
-    
-    # Trial subscription
    TRIAL_ENABLED: bool
    TRIAL_DURATION_DAYS: int
    TRIAL_TRAFFIC_GB: int
    TRIAL_SQUAD_UUID: str
-    
-    # Referral system 
    REFERRAL_FIRST_REWARD: float
    REFERRAL_REFERRED_BONUS: float
    REFERRAL_THRESHOLD: float
    REFERRAL_PERCENTAGE: float
-    
-    # Конфигурация мониторинга подписок
    MONITOR_ENABLED: bool = True
-    MONITOR_CHECK_INTERVAL: int = 3600  # 1 час
-    MONITOR_DAILY_CHECK_HOUR: int = 10  # 10:00 утра
-    MONITOR_WARNING_DAYS: int = 3  # предупреждать за 3 дня
+    MONITOR_CHECK_INTERVAL: int = 3600  
+    MONITOR_DAILY_CHECK_HOUR: int = 10  
+    MONITOR_WARNING_DAYS: int = 3  
+    DELETE_EXPIRED_TRIAL_DAYS: int = 1  
+    DELETE_EXPIRED_REGULAR_DAYS: int = 7  
+    AUTO_DELETE_ENABLED: bool = False 
+    TRIAL_NOTIFICATION_ENABLED: bool = True  
+    TRIAL_NOTIFICATION_HOURS_AFTER: int = 2  
+    TRIAL_NOTIFICATION_HOURS_WINDOW: int = 22 
+    TRIBUTE_ENABLED: bool = False
+    TRIBUTE_API_KEY: str = ""
+    TRIBUTE_WEBHOOK_PORT: int = 8081
+    TRIBUTE_WEBHOOK_PATH: str = "/tribute-webhook"
+    TRIBUTE_DONATE_URL: str = "" 
+    TRIBUTE_DONATE_LINK: str = "" 

    LUCKY_GAME_ENABLED: bool = True
-    LUCKY_GAME_REWARD: float = 50.0  # Размер награды за выигрыш
-    LUCKY_GAME_NUMBERS: int = 30     # Общее количество чисел (1-30)
-    LUCKY_GAME_WINNING_COUNT: int = 3  # Количество выигрышных чисел
+    LUCKY_GAME_REWARD: float = 50.0 
+    LUCKY_GAME_NUMBERS: int = 30    
+    LUCKY_GAME_WINNING_COUNT: int = 3 
+    
+    STARS_ENABLED: bool = True
+    STARS_RATES: Dict[int, float] = None  

 def load_config() -> Config:
    
@@ -70,46 +72,70 @@ def load_config() -> Config:
        except (ValueError, TypeError):
            return default
    
+    def parse_stars_rates() -> Dict[int, float]:
+        default_rates = {
+            100: 150.0,
+            150: 220.0,
+            250: 400.0,
+            350: 500.0,
+            500: 800.0,
+            750: 1150.0,
+            1000: 1500.0
+        }
+        
+        custom_rates = {}
+        
+        for stars in [100, 150, 250, 350, 500, 750, 1000]:
+            env_key = f"STARS_{stars}_RATE"
+            rate = get_float(env_key, 0.0)
+            if rate > 0:
+                custom_rates[stars] = rate
+        
+        if custom_rates:
+            return custom_rates
+        
+        return default_rates
+    
    return Config(
-        # Bot configuration
        BOT_TOKEN=os.getenv('BOT_TOKEN', ''),
        BOT_USERNAME=os.getenv('BOT_USERNAME', ''),
-        
-        # Database
        DATABASE_URL=os.getenv('DATABASE_URL', 'sqlite+aiosqlite:///bot.db'),
-        
-        # RemnaWave API
        REMNAWAVE_URL=os.getenv('REMNAWAVE_URL', ''),
        REMNAWAVE_TOKEN=os.getenv('REMNAWAVE_TOKEN', ''),
        SUBSCRIPTION_BASE_URL=os.getenv('SUBSCRIPTION_BASE_URL', ''),
-        
-        # Admin configuration
        ADMIN_IDS=parse_admin_ids(os.getenv('ADMIN_IDS', '')),
        SUPPORT_USERNAME=os.getenv('SUPPORT_USERNAME', 'support'),
        DEFAULT_LANGUAGE=os.getenv('DEFAULT_LANGUAGE', 'ru'),
-        
-        # Trial subscription
        TRIAL_ENABLED=get_bool('TRIAL_ENABLED', False),
        TRIAL_DURATION_DAYS=get_int('TRIAL_DURATION_DAYS', 3),
        TRIAL_TRAFFIC_GB=get_int('TRIAL_TRAFFIC_GB', 2),
        TRIAL_SQUAD_UUID=os.getenv('TRIAL_SQUAD_UUID', ''),
-        
-        # Referral system
        REFERRAL_FIRST_REWARD=get_float('REFERRAL_FIRST_REWARD', 150.0),
        REFERRAL_REFERRED_BONUS=get_float('REFERRAL_REFERRED_BONUS', 150.0), 
        REFERRAL_THRESHOLD=get_float('REFERRAL_THRESHOLD', 300.0),
        REFERRAL_PERCENTAGE=get_float('REFERRAL_PERCENTAGE', 0.25),
-        
        MONITOR_ENABLED=get_bool('MONITOR_ENABLED', True),
-        MONITOR_CHECK_INTERVAL=get_int('MONITOR_CHECK_INTERVAL', 3600),  # 1 час по умолчанию
-        MONITOR_DAILY_CHECK_HOUR=get_int('MONITOR_DAILY_CHECK_HOUR', 10),  # 10 утра
-        MONITOR_WARNING_DAYS=get_int('MONITOR_WARNING_DAYS', 3),  # за 3 дня
-
-        # Игра удачи
+        MONITOR_CHECK_INTERVAL=get_int('MONITOR_CHECK_INTERVAL', 3600),  
+        MONITOR_DAILY_CHECK_HOUR=get_int('MONITOR_DAILY_CHECK_HOUR', 10),  
+        MONITOR_WARNING_DAYS=get_int('MONITOR_WARNING_DAYS', 3),  
+        DELETE_EXPIRED_TRIAL_DAYS=get_int('DELETE_EXPIRED_TRIAL_DAYS', 1),
+        DELETE_EXPIRED_REGULAR_DAYS=get_int('DELETE_EXPIRED_REGULAR_DAYS', 7),
+        AUTO_DELETE_ENABLED=get_bool('AUTO_DELETE_ENABLED', False),
+        TRIAL_NOTIFICATION_ENABLED=get_bool('TRIAL_NOTIFICATION_ENABLED', True),
+        TRIAL_NOTIFICATION_HOURS_AFTER=get_int('TRIAL_NOTIFICATION_HOURS_AFTER', 2),
+        TRIAL_NOTIFICATION_HOURS_WINDOW=get_int('TRIAL_NOTIFICATION_HOURS_WINDOW', 22),
        LUCKY_GAME_ENABLED=get_bool('LUCKY_GAME_ENABLED', True),
        LUCKY_GAME_REWARD=get_float('LUCKY_GAME_REWARD', 50.0),
        LUCKY_GAME_NUMBERS=get_int('LUCKY_GAME_NUMBERS', 30),
-        LUCKY_GAME_WINNING_COUNT=get_int('LUCKY_GAME_WINNING_COUNT', 3)
+        LUCKY_GAME_WINNING_COUNT=get_int('LUCKY_GAME_WINNING_COUNT', 3),
+        STARS_ENABLED=get_bool('STARS_ENABLED', True),
+        STARS_RATES=parse_stars_rates(),
+        TRIBUTE_ENABLED=get_bool('TRIBUTE_ENABLED', False),
+        TRIBUTE_API_KEY=os.getenv('TRIBUTE_API_KEY', ''),
+        TRIBUTE_WEBHOOK_PORT=get_int('TRIBUTE_WEBHOOK_PORT', 8081),
+        TRIBUTE_WEBHOOK_PATH=os.getenv('TRIBUTE_WEBHOOK_PATH', '/tribute-webhook'),
+        TRIBUTE_DONATE_URL=os.getenv('TRIBUTE_DONATE_URL', ''),
+        TRIBUTE_DONATE_LINK=os.getenv('TRIBUTE_DONATE_LINK', '')
    )

 def debug_environment():
@@ -118,7 +144,9 @@ def debug_environment():
        'REMNAWAVE_URL', 'REMNAWAVE_TOKEN', 'ADMIN_IDS',
        'REFERRAL_FIRST_REWARD', 'REFERRAL_THRESHOLD',
        'MONITOR_ENABLED', 'MONITOR_CHECK_INTERVAL',
-        'LUCKY_GAME_ENABLED', 'LUCKY_GAME_REWARD' 
+        'DELETE_EXPIRED_TRIAL_DAYS', 'DELETE_EXPIRED_REGULAR_DAYS', 'AUTO_DELETE_ENABLED',
+        'LUCKY_GAME_ENABLED', 'LUCKY_GAME_REWARD',
+        'STARS_ENABLED', 'STARS_100_RATE', 'STARS_500_RATE', 'STARS_1000_RATE'
    ]
    
    print("📋 Environment variables:")
@@ -0,0 +1,100 @@
+"""
+Экстренное исправление проблемы с отображением подписок
+Этот патч добавляет недостающие поля в таблицу user_subscriptions
+"""
+
+import asyncio
+import sys
+import os
+from pathlib import Path
+
+# Добавляем корневую директорию в путь
+sys.path.insert(0, str(Path(__file__).parent))
+
+from config import load_config
+from database import Database
+from sqlalchemy import text
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+async def check_and_add_column(db, column_name, column_definition):
+    """Проверяет и добавляет колонку в таблицу"""
+    try:
+        # Отдельная транзакция для проверки
+        async with db.engine.begin() as conn:
+            await conn.execute(text(f"SELECT {column_name} FROM user_subscriptions LIMIT 1"))
+            logger.info(f"✅ Поле {column_name} уже существует")
+            return True
+    except Exception:
+        # Отдельная транзакция для добавления колонки
+        try:
+            async with db.engine.begin() as conn:
+                logger.info(f"➕ Добавляю поле {column_name}...")
+                await conn.execute(text(f"""
+                    ALTER TABLE user_subscriptions 
+                    ADD COLUMN {column_name} {column_definition}
+                """))
+                logger.info(f"✅ Поле {column_name} добавлено")
+                return True
+        except Exception as e:
+            logger.error(f"❌ Ошибка при добавлении {column_name}: {e}")
+            return False
+
+async def emergency_fix():
+    """Экстренное исправление базы данных"""
+    
+    try:
+        # Загружаем конфигурацию
+        config = load_config()
+        
+        # Подключаемся к базе данных  
+        db = Database(config.DATABASE_URL)
+        
+        logger.info("🔧 Выполняю экстренное исправление базы данных...")
+        
+        # Проверяем существование таблицы user_subscriptions
+        try:
+            async with db.engine.begin() as conn:
+                result = await conn.execute(text("SELECT COUNT(*) FROM user_subscriptions"))
+                count = result.scalar()
+                logger.info(f"📊 Найдено {count} подписок в таблице user_subscriptions")
+        except Exception as e:
+            logger.error(f"❌ Таблица user_subscriptions не найдена: {e}")
+            await db.close()
+            return
+
+        # Добавляем поля по одному в отдельных транзакциях
+        success1 = await check_and_add_column(db, "auto_pay_enabled", "BOOLEAN DEFAULT FALSE")
+        success2 = await check_and_add_column(db, "auto_pay_days_before", "INTEGER DEFAULT 3")
+        
+        # Финальная проверка в отдельной транзакции
+        if success1 and success2:
+            try:
+                async with db.engine.begin() as conn:
+                    result = await conn.execute(text("""
+                        SELECT id, auto_pay_enabled, auto_pay_days_before 
+                        FROM user_subscriptions LIMIT 1
+                    """))
+                    row = result.fetchone()
+                    if row:
+                        logger.info("✅ Все поля доступны для чтения")
+                        logger.info(f"🔍 Пример записи: id={row[0]}, auto_pay_enabled={row[1]}, auto_pay_days_before={row[2]}")
+                    else:
+                        logger.info("✅ Все поля доступны, но таблица пуста")
+                        
+            except Exception as e:
+                logger.error(f"❌ Поля все еще недоступны: {e}")
+        else:
+            logger.error("❌ Не удалось добавить все необходимые поля")
+                
+        await db.close()
+        logger.info("🎉 Экстренное исправление завершено!")
+        
+    except Exception as e:
+        logger.error(f"💥 Критическая ошибка: {e}")
+        raise
+
+if __name__ == "__main__":
+    asyncio.run(emergency_fix())
@@ -2,6 +2,7 @@ from database import Subscription
 from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from typing import List, Optional, Dict
 from translations import t
+from datetime import datetime

 def language_keyboard() -> InlineKeyboardMarkup:
    keyboard = InlineKeyboardMarkup(inline_keyboard=[
@@ -35,7 +36,8 @@ def main_menu_keyboard(lang: str = 'ru', is_admin: bool = False, show_trial: boo
        [
            InlineKeyboardButton(text="💬 " + t('support', lang), callback_data="support")
        ],
-        [InlineKeyboardButton(text="🌐 " + t('change_language', lang), callback_data="change_language")]
+        [InlineKeyboardButton(text="🌐 " + t('change_language', lang), callback_data="change_language")],
+        [InlineKeyboardButton(text="📜 Правила сервиса", callback_data="service_rules")]
    ])

    if is_admin:
@@ -51,13 +53,54 @@ def balance_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
    ])
    return keyboard

-def topup_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
-    keyboard = InlineKeyboardMarkup(inline_keyboard=[
-        # [InlineKeyboardButton(text="💳 " + t('topup_card', lang), callback_data="topup_card")],
-        [InlineKeyboardButton(text="👨‍💼 " + t('topup_support', lang), callback_data="topup_support")],
-        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="balance")]
+def topup_keyboard(lang: str, tribute_enabled: bool = False) -> InlineKeyboardMarkup:
+    keyboard = []
+    
+    if tribute_enabled:
+        keyboard.append([
+            InlineKeyboardButton(
+                text="💳 Tribute (Карта/СБП)" if lang == 'ru' else "💳 Tribute (Card/SBP)",
+                callback_data="topup_tribute"
+            )
+        ])
+    
+    keyboard.extend([
+        [InlineKeyboardButton(
+            text="⭐ Telegram Stars" if lang == 'ru' else "⭐ Telegram Stars",
+            callback_data="topup_stars"
+        )],
+        [InlineKeyboardButton(
+            text="💬 Связаться с поддержкой" if lang == 'ru' else "💬 Contact Support",
+            callback_data="topup_support"
+        )],
+        [InlineKeyboardButton(
+            text="🔙 Назад" if lang == 'ru' else "🔙 Back",
+            callback_data="balance"
+        )]
    ])
-    return keyboard
+    
+    return InlineKeyboardMarkup(inline_keyboard=keyboard)
+
+def tribute_amounts_keyboard(lang: str) -> InlineKeyboardMarkup:
+    keyboard = [
+        [
+            InlineKeyboardButton(text="💯 100₽", callback_data="tribute_amount_100"),
+            InlineKeyboardButton(text="💰 300₽", callback_data="tribute_amount_300")
+        ],
+        [
+            InlineKeyboardButton(text="💎 500₽", callback_data="tribute_amount_500"),
+            InlineKeyboardButton(text="🎯 1000₽", callback_data="tribute_amount_1000")
+        ],
+        [
+            InlineKeyboardButton(text="💸 2000₽", callback_data="tribute_amount_2000"),
+            InlineKeyboardButton(text="🏆 5000₽", callback_data="tribute_amount_5000")
+        ],
+        [InlineKeyboardButton(text="✏️ Своя сумма", callback_data="tribute_custom_amount")],
+        [InlineKeyboardButton(text="🔙 Назад", callback_data="topup_balance")]
+    ]
+    
+    return InlineKeyboardMarkup(inline_keyboard=keyboard)
+

 def subscriptions_keyboard(subscriptions: List[dict], lang: str = 'ru') -> InlineKeyboardMarkup:
    buttons = []
@@ -109,22 +152,52 @@ def user_subscriptions_keyboard(user_subscriptions: List[dict], lang: str = 'ru'
    buttons.append([InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="main_menu")])
    return InlineKeyboardMarkup(inline_keyboard=buttons)

-def user_subscription_detail_keyboard(subscription_id: int, lang: str = 'ru', show_extend: bool = False, is_imported: bool = False) -> InlineKeyboardMarkup:
+def user_subscription_detail_keyboard(subscription_id: int, lang: str = 'ru', 
+                                   show_extend: bool = False, is_imported: bool = False, 
+                                   is_trial: bool = False, autopay_enabled: bool = False) -> InlineKeyboardMarkup:
    buttons = []
    
    if is_imported:
        buttons.append([InlineKeyboardButton(text="🔗 Получить ссылку подключения", callback_data=f"get_connection_{subscription_id}")])
        buttons.append([InlineKeyboardButton(text="🛒 Купить новую подписку", callback_data="buy_subscription")])
+    elif is_trial:
+        buttons.append([InlineKeyboardButton(text="🔗 Получить ссылку подключения", callback_data=f"get_connection_{subscription_id}")])
+        buttons.append([InlineKeyboardButton(text="🛒 Купить полную подписку", callback_data="buy_subscription")])
    else:
        if show_extend:
            buttons.append([InlineKeyboardButton(text="⏰ " + t('extend_subscription', lang), callback_data=f"extend_sub_{subscription_id}")])
        
        buttons.append([InlineKeyboardButton(text="🔗 Получить ссылку подключения", callback_data=f"get_connection_{subscription_id}")])
+        
+        if autopay_enabled:
+            autopay_text = "🔄✅ Настроить автоплатеж"
+        else:
+            autopay_text = "🔄❌ Настроить автоплатеж"
+        
+        buttons.append([InlineKeyboardButton(text=autopay_text, callback_data=f"autopay_settings_{subscription_id}")])
    
    buttons.append([InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="my_subscriptions")])
    
    return InlineKeyboardMarkup(inline_keyboard=buttons)

+def autopay_confirmation_keyboard(subscription_id: int, action: str, lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="✅ Да", callback_data=f"confirm_autopay_{action}_{subscription_id}"),
+            InlineKeyboardButton(text="❌ Нет", callback_data=f"autopay_settings_{subscription_id}")
+        ]
+    ])
+    return keyboard
+
+def autopay_help_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    """Клавиатура помощи по автоплатежам"""
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="💰 Пополнить баланс", callback_data="topup_balance")],
+        [InlineKeyboardButton(text="📋 Мои подписки", callback_data="my_subscriptions")],
+        [InlineKeyboardButton(text="🏠 Главное меню", callback_data="main_menu")]
+    ])
+    return keyboard
+
 def extend_subscription_keyboard(subscription_id: int, lang: str = 'ru') -> InlineKeyboardMarkup:
    keyboard = InlineKeyboardMarkup(inline_keyboard=[
        [
@@ -159,13 +232,17 @@ def admin_menu_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
        ],
        [
            InlineKeyboardButton(text="📨 " + t('send_message', lang), callback_data="admin_messages"),
-            InlineKeyboardButton(text="👥 Рефералы", callback_data="admin_referrals")  # НОВАЯ КНОПКА
+            InlineKeyboardButton(text="👥 Рефералы", callback_data="admin_referrals")
        ],
        [
-            InlineKeyboardButton(text="🖥 Система RemnaWave", callback_data="admin_system")
+            InlineKeyboardButton(text="📜 Правила сервиса", callback_data="admin_rules"),
+            InlineKeyboardButton(text="🔄 Автоплатежи", callback_data="admin_autopay")
+        ],
+        [
+            InlineKeyboardButton(text="🖥 Система RemnaWave", callback_data="admin_system"),
+            InlineKeyboardButton(text="🔍 Мониторинг подписок", callback_data="admin_monitor")
        ],
        [
-            InlineKeyboardButton(text="🔍 Мониторинг подписок", callback_data="admin_monitor"),
            InlineKeyboardButton(text="📊 " + t('statistics', lang), callback_data="admin_stats")
        ],
        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="main_menu")]
@@ -183,15 +260,89 @@ def admin_subscriptions_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
 def admin_users_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
    keyboard = InlineKeyboardMarkup(inline_keyboard=[
        [InlineKeyboardButton(text="👥 Список пользователей", callback_data="list_users")],
+        [InlineKeyboardButton(text="📋 Все подписки пользователей", callback_data="admin_user_subscriptions_all")],
        [InlineKeyboardButton(text="🔍 Поиск пользователя", callback_data="search_user")],
        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_panel")]
    ])
    return keyboard

+def admin_users_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="👥 Список пользователей", callback_data="list_users")],
+        [InlineKeyboardButton(text="📋 Все подписки пользователей", callback_data="admin_user_subscriptions_all")],
+        [InlineKeyboardButton(text="🔍 Поиск пользователя", callback_data="search_user")],
+        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_panel")]
+    ])
+    return keyboard
+
+def admin_user_subscriptions_filters_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    """Клавиатура фильтров для подписок пользователей"""
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="🟢 Активные", callback_data="filter_subs_active"),
+            InlineKeyboardButton(text="🔴 Истекшие", callback_data="filter_subs_expired")
+        ],
+        [
+            InlineKeyboardButton(text="🔄✅ С автоплатежом", callback_data="filter_subs_autopay"),
+            InlineKeyboardButton(text="⏰ Истекают скоро", callback_data="filter_subs_expiring")
+        ],
+        [
+            InlineKeyboardButton(text="🆓 Триальные", callback_data="filter_subs_trial"),
+            InlineKeyboardButton(text="📦 Импортированные", callback_data="filter_subs_imported")
+        ],
+        [
+            InlineKeyboardButton(text="📋 Все подписки", callback_data="admin_user_subscriptions_all"),
+            InlineKeyboardButton(text="🔙 Назад", callback_data="admin_users")
+        ]
+    ])
+    return keyboard
+
+def admin_user_subscription_detail_keyboard(subscription_id: int, user_id: int, lang: str = 'ru') -> InlineKeyboardMarkup:
+    """Клавиатура для детального просмотра подписки пользователя"""
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="✏️ Редактировать", callback_data=f"edit_user_sub_{subscription_id}"),
+            InlineKeyboardButton(text="🔄 Обновить", callback_data=f"refresh_user_sub_{subscription_id}")
+        ],
+        [
+            InlineKeyboardButton(text="👤 К пользователю", callback_data=f"admin_user_detail_{user_id}"),
+            InlineKeyboardButton(text="📋 К списку подписок", callback_data="admin_user_subscriptions_all")
+        ],
+        [InlineKeyboardButton(text="🔙 Назад", callback_data="admin_users")]
+    ])
+    return keyboard
+
+def user_subscriptions_pagination_keyboard(current_page: int, total_pages: int, 
+                                         filter_type: str = "all", lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    if total_pages > 1:
+        nav_row = []
+        
+        if current_page > 0:
+            nav_row.append(InlineKeyboardButton(text="⬅️", callback_data=f"user_subs_page_{current_page - 1}_{filter_type}"))
+        
+        nav_row.append(InlineKeyboardButton(text=f"{current_page + 1}/{total_pages}", callback_data="noop"))
+        
+        if current_page < total_pages - 1:
+            nav_row.append(InlineKeyboardButton(text="➡️", callback_data=f"user_subs_page_{current_page + 1}_{filter_type}"))
+        
+        buttons.append(nav_row)
+    
+    buttons.append([
+        InlineKeyboardButton(text="🔍 Фильтры", callback_data="admin_user_subscriptions_filters"),
+        InlineKeyboardButton(text="🔄 Обновить", callback_data=f"refresh_user_subs_{filter_type}")
+    ])
+    
+    buttons.append([InlineKeyboardButton(text="🔙 Назад", callback_data="admin_users")])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
 def admin_balance_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
    keyboard = InlineKeyboardMarkup(inline_keyboard=[
        [InlineKeyboardButton(text="💸 Пополнить баланс пользователю", callback_data="admin_add_balance")],
        [InlineKeyboardButton(text="📊 История платежей", callback_data="admin_payment_history")],
+        [InlineKeyboardButton(text="⭐ Telegram Stars", callback_data="admin_stars_payments")],
        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_panel")]
    ])
    return keyboard
@@ -410,9 +561,6 @@ def trial_subscription_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
 def admin_monitor_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
    keyboard = InlineKeyboardMarkup(inline_keyboard=[
        [InlineKeyboardButton(text="📊 Статус сервиса", callback_data="monitor_status")],
-        [InlineKeyboardButton(text="🔄 Принудительная проверка", callback_data="monitor_force_check")],
-        [InlineKeyboardButton(text="⚰️ Деактивировать истекшие", callback_data="monitor_deactivate_expired")],
-        [InlineKeyboardButton(text="👤 Тест для пользователя", callback_data="monitor_test_user")],
        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_panel")]
    ])
    return keyboard
@@ -605,3 +753,211 @@ def lucky_game_result_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
        [InlineKeyboardButton(text="📈 История игр", callback_data="lucky_game_history")],
        [InlineKeyboardButton(text="🏠 Главное меню", callback_data="main_menu")]
    ])
+
+def stars_topup_keyboard(stars_rates: Dict[int, float], lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    sorted_rates = sorted(stars_rates.items())
+    
+    for i in range(0, len(sorted_rates), 2):
+        row = []
+        for j in range(2):
+            if i + j < len(sorted_rates):
+                stars, rubles = sorted_rates[i + j]
+                if stars >= 500:
+                    emoji = "🔥"  # Выгодное предложение
+                elif stars >= 250:
+                    emoji = "💎"  # Хорошее предложение
+                else:
+                    emoji = "⭐"  # Базовое предложение
+                
+                button_text = f"{emoji} {stars} ⭐ → {rubles:.0f}₽"
+                row.append(InlineKeyboardButton(
+                    text=button_text,
+                    callback_data=f"buy_stars_{stars}"
+                ))
+        buttons.append(row)
+    
+    buttons.append([InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="topup_balance")])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
+def stars_payment_keyboard(stars_amount: int, rub_amount: float, lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="❌ Отмена", callback_data="topup_stars")]
+    ])
+    return keyboard
+
+def service_rules_keyboard(current_page: int, total_pages: int, lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    if total_pages > 1:
+        nav_row = []
+        
+        if current_page > 0:
+            nav_row.append(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"rules_page_{current_page - 1}"))
+        
+        nav_row.append(InlineKeyboardButton(text=f"{current_page + 1}/{total_pages}", callback_data="noop"))
+        
+        if current_page < total_pages - 1:
+            nav_row.append(InlineKeyboardButton(text="Вперед ➡️", callback_data=f"rules_page_{current_page + 1}"))
+        
+        buttons.append(nav_row)
+    
+    buttons.append([InlineKeyboardButton(text="🏠 Главное меню", callback_data="main_menu")])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
+def admin_rules_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="📋 Список правил", callback_data="admin_rules_list")],
+        [InlineKeyboardButton(text="➕ Добавить страницу", callback_data="admin_rules_create")],
+        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_panel")]
+    ])
+    return keyboard
+
+def admin_rules_list_keyboard(rules, lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    for rule in rules:
+        status_emoji = "🟢" if rule.is_active else "🔴"
+        buttons.append([
+            InlineKeyboardButton(
+                text=f"{status_emoji} {rule.page_order}. {rule.title}",
+                callback_data=f"admin_rule_view_{rule.id}"
+            )
+        ])
+    
+    buttons.extend([
+        [InlineKeyboardButton(text="➕ Добавить страницу", callback_data="admin_rules_create")],
+        [InlineKeyboardButton(text="🔙 " + t('back', lang), callback_data="admin_rules")]
+    ])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
+def admin_rule_edit_keyboard(rule_id: int, lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="✏️ Редактировать заголовок", callback_data=f"admin_rule_edit_title_{rule_id}"),
+            InlineKeyboardButton(text="📝 Редактировать содержимое", callback_data=f"admin_rule_edit_content_{rule_id}")
+        ],
+        [
+            InlineKeyboardButton(text="🔄 Изменить порядок", callback_data=f"admin_rule_edit_order_{rule_id}"),
+            InlineKeyboardButton(text="🟢/🔴 Вкл/Выкл", callback_data=f"admin_rule_toggle_{rule_id}")
+        ],
+        [InlineKeyboardButton(text="🗑 Удалить", callback_data=f"admin_rule_delete_{rule_id}")],
+        [InlineKeyboardButton(text="🔙 К списку", callback_data="admin_rules_list")]
+    ])
+    return keyboard
+
+def admin_rule_delete_confirm_keyboard(rule_id: int, lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="✅ Да, удалить", callback_data=f"admin_rule_confirm_delete_{rule_id}"),
+            InlineKeyboardButton(text="❌ Отмена", callback_data=f"admin_rule_view_{rule_id}")
+        ]
+    ])
+    return keyboard
+
+def autopay_settings_keyboard(user_sub_id: int, user_sub, lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    if user_sub.auto_pay_enabled:
+        toggle_text = "❌ Отключить автоплатеж"
+        toggle_callback = f"toggle_autopay_{user_sub_id}"
+    else:
+        toggle_text = "✅ Включить автоплатеж"
+        toggle_callback = f"toggle_autopay_{user_sub_id}"
+    
+    buttons.append([InlineKeyboardButton(text=toggle_text, callback_data=toggle_callback)])
+    
+    if user_sub.auto_pay_enabled:
+        buttons.append([InlineKeyboardButton(text="📅 Настроить дни до продления", callback_data="noop")])
+        
+        days_row = []
+        for days in [1, 3, 5, 7]:
+            emoji = "🔹" if user_sub.auto_pay_days_before == days else "⚪"
+            days_row.append(InlineKeyboardButton(
+                text=f"{emoji} {days}д",
+                callback_data=f"autopay_days_{user_sub_id}_{days}"
+            ))
+        buttons.append(days_row)
+    
+    buttons.append([InlineKeyboardButton(text="🔙 К подписке", callback_data=f"view_sub_{user_sub_id}")])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
+def autopay_status_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="🔄 Обновить", callback_data="autopay_status")],
+        [InlineKeyboardButton(text="🚀 Принудительная проверка", callback_data="autopay_force_check")],
+        [InlineKeyboardButton(text="📋 Список подписок", callback_data="autopay_subscriptions_list")],
+        [InlineKeyboardButton(text="🔙 Назад", callback_data="admin_autopay")]
+    ])
+    return keyboard
+
+def autopay_subscriptions_keyboard(subscriptions_data: List[Dict], lang: str = 'ru') -> InlineKeyboardMarkup:
+    buttons = []
+    
+    expired = [s for s in subscriptions_data if s['expires_in_days'] <= 0]
+    due_soon = [s for s in subscriptions_data if 0 < s['expires_in_days'] <= s['auto_pay_days_before']]
+    
+    critical_subs = expired + due_soon
+    
+    for sub_data in critical_subs[:8]: 
+        username = sub_data['username'] if sub_data['username'] != 'N/A' else f"ID:{sub_data['user_id']}"
+        days = sub_data['expires_in_days']
+        
+        if days <= 0:
+            status_emoji = "❌"
+            status_text = f"Истекла"
+        elif days <= sub_data['auto_pay_days_before']:
+            status_emoji = "⚠️"
+            status_text = f"Через {days}д"
+        else:
+            status_emoji = "✅"
+            status_text = f"Через {days}д"
+        
+        button_text = f"{status_emoji} @{username} ({status_text})"
+        
+        buttons.append([
+            InlineKeyboardButton(
+                text=button_text,
+                callback_data=f"autopay_user_detail_{sub_data['user_id']}"
+            )
+        ])
+    
+    if len(subscriptions_data) > 8:
+        buttons.append([
+            InlineKeyboardButton(
+                text=f"... и еще {len(subscriptions_data) - 8}",
+                callback_data="noop"
+            )
+        ])
+    
+    buttons.extend([
+        [InlineKeyboardButton(text="🔄 Обновить", callback_data="autopay_subscriptions_list")],
+        [InlineKeyboardButton(text="📊 Статистика", callback_data="autopay_statistics")],
+        [InlineKeyboardButton(text="🔙 Назад", callback_data="admin_autopay")]
+    ])
+    
+    return InlineKeyboardMarkup(inline_keyboard=buttons)
+
+def autopay_user_detail_keyboard(user_id: int, lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="💳 Добавить баланс", callback_data=f"admin_add_balance_to_{user_id}")],
+        [InlineKeyboardButton(text="📋 Управление подписками", callback_data=f"admin_user_subscriptions_{user_id}")],
+        [InlineKeyboardButton(text="🔄 Обновить", callback_data=f"autopay_user_detail_{user_id}")],
+        [InlineKeyboardButton(text="🔙 К списку", callback_data="autopay_subscriptions_list")]
+    ])
+    return keyboard
+
+
+def autopay_statistics_keyboard(lang: str = 'ru') -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [InlineKeyboardButton(text="⚠️ Недостаточно средств", callback_data="autopay_insufficient_balance_users")],
+        [InlineKeyboardButton(text="📋 Список подписок", callback_data="autopay_subscriptions_list")],
+        [InlineKeyboardButton(text="🔄 Обновить", callback_data="autopay_statistics")],
+        [InlineKeyboardButton(text="🔙 Назад", callback_data="admin_autopay")]
+    ])
+    return keyboard
@@ -25,7 +25,6 @@ lucky_game_router = Router()

@lucky_game_router.callback_query(F.data == "lucky_game")
 async def lucky_game_menu_callback(callback: CallbackQuery, db: Database, **kwargs):
-    """Главное меню игры удачи"""
    user = kwargs.get('user')
    config = kwargs.get('config')
    
@@ -34,15 +33,12 @@ async def lucky_game_menu_callback(callback: CallbackQuery, db: Database, **kwar
        return
    
    try:
-        # Получаем настройки игры из конфига
        reward_amount = getattr(config, 'LUCKY_GAME_REWARD', 50.0)
        numbers_count = getattr(config, 'LUCKY_GAME_NUMBERS', 30)
        winning_numbers = getattr(config, 'LUCKY_GAME_WINNING_COUNT', 3)
        
-        # Проверяем, можно ли играть сегодня
        can_play, next_game_time = await check_can_play_today(db, user.telegram_id)
        
-        # Получаем статистику игр пользователя
        games_played, total_won, win_count = await get_user_game_stats(db, user.telegram_id)
        
        text = "🎰 **Проверь свою удачу!**\n\n"
@@ -61,13 +57,11 @@ async def lucky_game_menu_callback(callback: CallbackQuery, db: Database, **kwar
            win_rate = (win_count / games_played) * 100
            text += f"• Процент побед: {win_rate:.1f}%\n"
        
-        # Создаем клавиатуру
        buttons = []
        
        if can_play:
            buttons.append([InlineKeyboardButton(text="🎲 Играть!", callback_data="start_lucky_game")])
        else:
-            # Вычисляем оставшееся время
            now = datetime.utcnow()
            time_left = next_game_time - now
            hours_left = int(time_left.total_seconds() // 3600)
@@ -108,19 +102,16 @@ async def start_lucky_game_callback(callback: CallbackQuery, db: Database, state
        return
    
    try:
-        # Проверяем, можно ли играть
        can_play, next_game_time = await check_can_play_today(db, user.telegram_id)
        
        if not can_play:
            await callback.answer("⏰ Вы уже играли сегодня! Приходите завтра.", show_alert=True)
            return
        
-        # Получаем настройки
        numbers_count = getattr(config, 'LUCKY_GAME_NUMBERS', 30)
        winning_numbers = getattr(config, 'LUCKY_GAME_WINNING_COUNT', 3)
        reward_amount = getattr(config, 'LUCKY_GAME_REWARD', 50.0)
        
-        # Генерируем выигрышные числа заранее и сохраняем в состоянии
        winning_nums = random.sample(range(1, numbers_count + 1), winning_numbers)
        
        await state.update_data(
@@ -135,7 +126,6 @@ async def start_lucky_game_callback(callback: CallbackQuery, db: Database, state
        text += f"🍀 Удачных чисел: {winning_numbers} из {numbers_count}\n\n"
        text += "Нажмите на число, чтобы испытать удачу!"
        
-        # Создаем кнопки с числами (5 в ряд)
        buttons = []
        for i in range(0, numbers_count, 5):
            row = []
@@ -175,24 +165,18 @@ async def choose_number_callback(callback: CallbackQuery, db: Database, state: F
    try:
        chosen_number = int(callback.data.split("_")[2])
        
-        # Получаем данные из состояния
        state_data = await state.get_data()
        winning_numbers = state_data['winning_numbers']
        reward_amount = state_data['reward_amount']
        numbers_count = state_data['numbers_count']
        
-        # Проверяем, выиграл ли пользователь
        is_winner = chosen_number in winning_numbers
        
-        # Сохраняем результат игры в БД
        await save_game_result(db, user.telegram_id, chosen_number, winning_numbers, is_winner, reward_amount if is_winner else 0.0)
        
-        # Формируем сообщение с результатом
        if is_winner:
-            # Начисляем награду
            await db.add_balance(user.telegram_id, reward_amount)
            
-            # Создаем платеж
            await db.create_payment(
                user_id=user.telegram_id,
                amount=reward_amount,
@@ -211,7 +195,6 @@ async def choose_number_callback(callback: CallbackQuery, db: Database, state: F
            text += f"🍀 Выигрышные числа: **{', '.join(map(str, sorted(winning_numbers)))}**\n\n"
            text += "🔄 Попробуйте завтра!"
        
-        # Показываем все выигрышные числа
        winning_nums_str = ', '.join(map(str, sorted(winning_numbers)))
        text += f"\n🎲 Сегодняшние удачные числа: {winning_nums_str}"
        text += f"\n\n⏰ Следующая игра будет доступна завтра!"
@@ -227,7 +210,6 @@ async def choose_number_callback(callback: CallbackQuery, db: Database, state: F
            parse_mode='Markdown'
        )
        
-        # Логируем действие
        log_user_action(user.telegram_id, "lucky_game_played", 
                       f"Number: {chosen_number}, Winner: {is_winner}, Reward: {reward_amount if is_winner else 0}")
        
@@ -239,7 +221,6 @@ async def choose_number_callback(callback: CallbackQuery, db: Database, state: F

@lucky_game_router.callback_query(F.data == "lucky_game_history")
 async def lucky_game_history_callback(callback: CallbackQuery, db: Database, **kwargs):
-    """Показать историю игр пользователя"""
    user = kwargs.get('user')
    
    if not user:
@@ -247,7 +228,6 @@ async def lucky_game_history_callback(callback: CallbackQuery, db: Database, **k
        return
    
    try:
-        # Получаем последние 10 игр
        games = await get_user_game_history(db, user.telegram_id, limit=10)
        
        if not games:
@@ -289,8 +269,7 @@ async def lucky_game_history_callback(callback: CallbackQuery, db: Database, **k
 async def noop_callback(callback: CallbackQuery, **kwargs):
    """Пустая операция для неактивных кнопок"""
    await callback.answer()
-
-# Вспомогательные функции
+    

 async def check_can_play_today(db: Database, user_id: int) -> tuple[bool, Optional[datetime]]:
    """Проверяет, может ли пользователь играть сегодня"""
@@ -298,7 +277,6 @@ async def check_can_play_today(db: Database, user_id: int) -> tuple[bool, Option
        can_play = await db.can_play_lucky_game_today(user_id)
        
        if not can_play:
-            # Вычисляем время следующей игры (завтра в 00:00)
            now = datetime.utcnow()
            tomorrow = now.replace(hour=0, minute=0, second=0, microsecond=0) + timedelta(days=1)
            return False, tomorrow
@@ -7,6 +7,8 @@ from aiogram.fsm.storage.memory import MemoryStorage
 from aiogram.client.default import DefaultBotProperties
 from aiogram.enums import ParseMode
 from lucky_game import lucky_game_router
+from stars_handlers import stars_router
+from autopay_service import AutoPayService

 print("🚀 Запуск бота...")
 print(f"📍 Рабочая директория: {os.getcwd()}")
@@ -45,6 +47,40 @@ class BotApplication:
        self.bot = None
        self.dp = None
        self.monitor_service = None
+        self.autopay_service = None
+        self.webhook_server = None
+
+    async def _init_autopay_service(self):
+        try:
+            logger.info("🔧 Initializing autopay service...")
+            
+            if not self.bot:
+                logger.error("❌ Bot instance is None, cannot initialize autopay")
+                return
+            
+            if not self.db:
+                logger.error("❌ Database instance is None, cannot initialize autopay")
+                return
+            
+            self.autopay_service = AutoPayService(self.db, self.api, self.bot)
+            
+            self.dp.workflow_data["autopay_service"] = self.autopay_service
+            logger.info("✅ Autopay service added to workflow_data")
+            
+            logger.info("🚀 Starting autopay service...")
+            await self.autopay_service.start()
+            
+            status = await self.autopay_service.get_service_status()
+            if status['is_running']:
+                logger.info("✅ Autopay service started successfully")
+                logger.info(f"📊 Autopay status: interval=30min")
+            else:
+                logger.warning("⚠️ Autopay service created but not running")
+            
+        except Exception as e:
+            logger.error(f"❌ Failed to initialize autopay service: {e}", exc_info=True)
+            logger.warning("⚠️ Continuing without autopay service")
+            self.autopay_service = None
        
    async def initialize(self):
        
@@ -75,6 +111,7 @@ class BotApplication:
        logger.info(f"Bot Username: {self.config.BOT_USERNAME}")
        
        self.db = Database(self.config.DATABASE_URL)
+        
        await self._init_database()
        
        self.api = RemnaWaveAPI(
@@ -94,20 +131,69 @@ class BotApplication:
        await self._test_bot_token()
        
        self._setup_dispatcher()
+
+        await self._init_webhook_server()
+
+        if self.config.TRIBUTE_ENABLED:
+            logger.info("✅ Tribute платежи включены")
+            if not self.config.TRIBUTE_API_KEY:
+                logger.warning("⚠️ TRIBUTE_API_KEY не установлен!")
+            if not self.config.TRIBUTE_DONATE_URL:
+                logger.warning("⚠️ TRIBUTE_DONATE_URL не установлен!")
+        else:
+            logger.info("❌ Tribute платежи отключены")
        
        await self._init_monitor_service()
+        await self._init_autopay_service()
+
+        if self.config.STARS_ENABLED:
+            logger.info("✅ Telegram Stars пополнение включено")
+            logger.info(f"📊 Настроенные курсы: {self.config.STARS_RATES}")
+        
+            if not self.config.STARS_RATES or len(self.config.STARS_RATES) == 0:
+                logger.warning("⚠️  STARS_RATES пустые! Telegram Stars будут недоступны")
+                self.config.STARS_ENABLED = False
+            else:
+                valid_rates = all(
+                    isinstance(stars, int) and isinstance(rubles, (int, float)) and stars > 0 and rubles > 0
+                    for stars, rubles in self.config.STARS_RATES.items()
+                )
+                if not valid_rates:
+                    logger.warning("⚠️  Неверные STARS_RATES! Telegram Stars будут недоступны")
+                    self.config.STARS_ENABLED = False
+        else:
+            logger.info("❌ Telegram Stars пополнение отключено")
+
+    async def _init_webhook_server(self):
+        """Инициализация webhook сервера для Tribute"""
+        try:
+            logger.info("🔧 Initializing webhook server...")
+            
+            from webhook_server import WebhookServer
+            self.webhook_server = WebhookServer(self.bot, self.db, self.config)
+            
+            logger.info("🚀 Starting webhook server...")
+            await self.webhook_server.start()
+            
+            logger.info("✅ Webhook server started successfully")
+            
+        except Exception as e:
+            logger.error(f"❌ Failed to initialize webhook server: {e}", exc_info=True)
+            logger.warning("⚠️ Continuing without webhook server")
+            self.webhook_server = None
        
    async def _init_database(self):
        max_retries = 3
        for attempt in range(max_retries):
            try:
+                logger.info(f"🗄️  Database initialization attempt {attempt + 1}/{max_retries}")
                await self.db.init_db()
-                logger.info("Database initialized successfully")
+                logger.info("✅ Database initialized successfully with all migrations")
                break
            except Exception as e:
-                logger.error(f"Database initialization attempt {attempt + 1} failed: {e}")
+                logger.error(f"❌ Database initialization attempt {attempt + 1} failed: {e}")
                if attempt == max_retries - 1:
-                    logger.error("Failed to initialize database after all retries")
+                    logger.error("💥 Failed to initialize database after all retries")
                    raise
                await asyncio.sleep(2)
                
@@ -143,7 +229,8 @@ class BotApplication:
            "config": self.config,
            "api": self.api,
            "db": self.db,
-            "monitor_service": None
+            "monitor_service": None,
+            "autopay_service": None
        })
        
        self.dp.message.middleware(LoggingMiddleware())
@@ -167,6 +254,7 @@ class BotApplication:
        self.dp.include_router(router)
        self.dp.include_router(admin_router)
        self.dp.include_router(lucky_game_router)
+        self.dp.include_router(stars_router)
        
    async def _init_monitor_service(self):
        try:
@@ -229,6 +317,20 @@ class BotApplication:
            
    async def shutdown(self):
        logger.info("Shutting down bot...")
+
+        if self.webhook_server:
+            try:
+                await self.webhook_server.stop()
+                logger.info("Webhook server stopped")
+            except Exception as e:
+                logger.error(f"Error stopping webhook server: {e}")
+
+        if self.autopay_service: 
+            try:
+                await self.autopay_service.stop()
+                logger.info("Autopay service stopped")
+            except Exception as e:
+                logger.error(f"Error stopping autopay service: {e}")
        
        if self.monitor_service:
            try:
@@ -5,10 +5,18 @@ from database import ReferralProgram, ReferralEarning

 logger = logging.getLogger(__name__)

-async def process_referral_rewards(user_id: int, amount: float, payment_id: int, db: Database, bot=None):
+async def process_referral_rewards(user_id: int, amount: float, payment_id: int, db: Database, bot=None, payment_type: str = None):
    try:
        import os
        
+        if payment_type not in ['topup', 'admin_topup']:
+            logger.debug(f"Skipping referral rewards for payment type: {payment_type}")
+            return
+        
+        if amount <= 0:
+            logger.debug(f"Skipping referral rewards for non-positive amount: {amount}")
+            return
+        
        threshold = float(os.getenv('REFERRAL_THRESHOLD', '300.0'))
        first_reward = float(os.getenv('REFERRAL_FIRST_REWARD', '150.0'))
        referred_bonus = float(os.getenv('REFERRAL_REFERRED_BONUS', '150.0'))
@@ -25,7 +33,7 @@ async def process_referral_rewards(user_id: int, amount: float, payment_id: int,
            logger.error(f"User {user_id} not found")
            return
        
-        logger.info(f"Processing referral rewards for user {user_id}, amount {amount}, referrer {referral.referrer_id}")
+        logger.info(f"Processing referral rewards for topup: user {user_id}, amount {amount}, referrer {referral.referrer_id}")
        
        if not referral.first_reward_paid and user.balance >= threshold:
            logger.info(f"Processing first reward for referral {referral.id} (threshold: {threshold}, reward: {first_reward})")
@@ -57,7 +65,7 @@ async def process_referral_rewards(user_id: int, amount: float, payment_id: int,
                            referral.referrer_id,
                            f"🎉 Поздравляем! Ваш реферал пополнил баланс на {threshold}₽+\n\n"
                            f"💰 Вам начислено {first_reward}₽ за приведенного друга!\n"
-                            f"Теперь вы будете получать {percentage*100:.0f}% с каждого его следующего платежа."
+                            f"Теперь вы будете получать {percentage*100:.0f}% с каждого его пополнения баланса."
                        )
                        
                        await bot.send_message(
@@ -81,7 +89,7 @@ async def process_referral_rewards(user_id: int, amount: float, payment_id: int,
            else:
                logger.error(f"Failed to create first reward earning")
        
-        if amount > 0 and referral.first_reward_paid: 
+        if referral.first_reward_paid:
            percentage_reward = amount * percentage
            
            if percentage_reward >= 0.01: 
@@ -91,7 +99,7 @@ async def process_referral_rewards(user_id: int, amount: float, payment_id: int,
                    user_id=referral.referrer_id,
                    amount=percentage_reward,
                    payment_type='referral',
-                    description=f'{percentage*100:.0f}% дохода от реферала ID:{user_id}',
+                    description=f'{percentage*100:.0f}% от пополнения реферала ID:{user_id}',
                    status='completed'
                )
                
@@ -106,19 +114,19 @@ async def process_referral_rewards(user_id: int, amount: float, payment_id: int,
                if success:
                    logger.info(f"Percentage reward paid: {percentage_reward:.2f}₽ ({percentage*100:.0f}%) to referrer {referral.referrer_id}")
                    
-                    if bot and percentage_reward >= 1.0: 
+                    if bot and percentage_reward >= 1.0:
                        try:
                            await bot.send_message(
                                referral.referrer_id,
                                f"💰 Реферальный доход!\n\n"
-                                f"Ваш реферал совершил платеж на {amount:.2f}₽\n"
+                                f"Ваш реферал пополнил баланс на {amount:.2f}₽\n"
                                f"Вам начислено: {percentage_reward:.2f}₽ ({percentage*100:.0f}%)"
                            )
                        except Exception as e:
                            logger.error(f"Failed to send percentage notification: {e}")
                else:
                    logger.error(f"Failed to create percentage earning")
-        elif amount > 0 and not referral.first_reward_paid:
+        else:
            logger.info(f"Skipping percentage reward for user {user_id} - first reward not yet paid")
    
    except Exception as e:
@@ -166,7 +174,7 @@ async def create_referral_from_start_param(user_telegram_id: int, start_param: s
                            referrer_id,
                            f"🎉 Отлично! По вашей ссылке зарегистрировался новый пользователь!\n\n"
                            f"Вы получите {first_reward:.0f}₽ после того, как он пополнит баланс на {threshold:.0f}₽.\n"
-                            f"И будете получать {percentage*100:.0f}% с каждого его платежа!"
+                            f"И будете получать {percentage*100:.0f}% с каждого его пополнения баланса!"
                        )
                except Exception as e:
                    logger.error(f"Failed to notify referrer: {e}")
@@ -19,7 +19,9 @@ class RemnaWaveAPI:
            headers = {
                'Authorization': f'Bearer {self.token}',
                'Content-Type': 'application/json',
-                'Accept': 'application/json'
+                'Accept': 'application/json',
+                'X-Forwarded-Proto': 'https',  # ← ДОБАВЬ ЭТО
+                'X-Forwarded-For': '127.0.0.1'  # ← И ЭТО
            }
            timeout = aiohttp.ClientTimeout(total=30)
            self.session = aiohttp.ClientSession(
@@ -52,7 +54,7 @@ class RemnaWaveAPI:
                    logger.debug(f"HTML Response (first 500 chars): {response_text[:500]}")
                    return None
                
-                if response.status in [200, 201]:
+                if response.status in [200, 201, 204]:
                    if response_text:
                        try:
                            return await response.json()
@@ -60,7 +62,7 @@ class RemnaWaveAPI:
                            logger.error(f"Failed to decode JSON from {url}: {e}")
                            logger.debug(f"Raw response: {response_text[:500]}")
                            return None
-                    return None
+                    return {'success': True}  # Для статуса 204 (No Content)
                elif response.status == 404:
                    logger.warning(f"API 404 for {endpoint}")
                    return None
@@ -74,121 +76,115 @@ class RemnaWaveAPI:
            logger.error(f"Request error for {endpoint}: {e}")
            return None

-    async def get_subscription_info(self, short_uuid: str) -> Optional[Dict]:
+    async def delete_user(self, uuid: str) -> Optional[Dict]:
+        """
+        Удаляет пользователя по полному UUID
+        """
        try:
-            logger.info(f"Getting subscription info for short_uuid: {short_uuid}")
+            logger.info(f"Deleting user with UUID: {uuid}")
+            result = await self._make_request('DELETE', f'/api/users/{uuid}')
            
-            endpoints_to_try = [
-                f'/api/subscriptions/{short_uuid}',
-                f'/api/sub/{short_uuid}',
-                f'/api/subscription/{short_uuid}'
-            ]
-            
-            for endpoint in endpoints_to_try:
-                logger.debug(f"Trying endpoint: {endpoint}")
-                result = await self._make_request('GET', endpoint)
-                
-                if result:
-                    logger.info(f"Successfully got subscription info from {endpoint}")
-                    
-                    subscription_data = None
-                    
-                    if 'response' in result:
-                        subscription_data = result['response']
-                    elif 'data' in result:
-                        subscription_data = result['data']
-                    elif 'subscription' in result:
-                        subscription_data = result['subscription']
-                    else:
-                        subscription_data = result
-                    
-                    if subscription_data and (
-                        'subscriptionUrl' in subscription_data or 
-                        'url' in subscription_data or 
-                        'link' in subscription_data
-                    ):
-                        return subscription_data
-            
-            logger.warning(f"Could not get subscription info for {short_uuid} from any endpoint")
-            return None
-            
-        except Exception as e:
-            logger.error(f"Error getting subscription info for {short_uuid}: {e}")
-            return None
-
-    async def get_subscription_url(self, short_uuid: str) -> str:
-        try:
-            logger.info(f"Getting subscription URL for short_uuid: {short_uuid}")
-            
-            subscription_info = await self.get_subscription_info(short_uuid)
-            
-            if subscription_info:
-                subscription_url = (
-                    subscription_info.get('subscriptionUrl') or
-                    subscription_info.get('url') or
-                    subscription_info.get('link') or
-                    subscription_info.get('subscription_url')
-                )
-                
-                if subscription_url:
-                    logger.info(f"Got subscription URL from API: {subscription_url}")
-                    return subscription_url
-            
-            user_data = await self.get_user_by_short_uuid(short_uuid)
-            if user_data and 'subscriptionUrl' in user_data:
-                logger.info(f"Got subscription URL from user data: {user_data['subscriptionUrl']}")
-                return user_data['subscriptionUrl']
-            
-            if self.subscription_base_url:
-                fallback_url = f"{self.subscription_base_url.rstrip('/')}/sub/{short_uuid}"
-                logger.warning(f"Using fallback URL: {fallback_url}")
-                return fallback_url
+            if result is not None:
+                logger.info(f"Successfully deleted user {uuid}")
+                return result
            else:
-                fallback_url = f"{self.base_url.rstrip('/')}/sub/{short_uuid}"
-                logger.warning(f"Using base_url fallback: {fallback_url}")
-                return fallback_url
+                logger.error(f"Failed to delete user {uuid}")
+                return None
                
        except Exception as e:
-            logger.error(f"Failed to get subscription URL for {short_uuid}: {e}")
-            fallback_url = f"{self.base_url.rstrip('/')}/sub/{short_uuid}"
-            return fallback_url
+            logger.error(f"Error deleting user {uuid}: {e}")
+            return None

-    async def get_all_subscriptions_with_urls(self) -> Optional[List]:
+    async def delete_user_by_short_uuid(self, short_uuid: str) -> Optional[Dict]:
+        """
+        Удаляет пользователя по short_uuid (сначала получает полный UUID, затем удаляет)
+        """
        try:
-            logger.info("Fetching all subscriptions with URLs from API")
-            result = await self._make_request('GET', '/api/subscriptions')
+            logger.info(f"Deleting user by short UUID: {short_uuid}")
            
-            if not result:
-                logger.error("Empty response from subscriptions API")
-                return []
+            # Сначала получаем полную информацию о пользователе
+            user_data = await self.get_user_by_short_uuid(short_uuid)
            
-            subscriptions_list = []
+            if not user_data:
+                logger.warning(f"User with short_uuid {short_uuid} not found")
+                return None
            
-            if 'response' in result and 'subscriptions' in result['response']:
-                subscriptions_list = result['response']['subscriptions']
-            elif 'subscriptions' in result:
-                subscriptions_list = result['subscriptions']
-            elif 'data' in result:
-                subscriptions_list = result['data']
-            elif isinstance(result, list):
-                subscriptions_list = result
+            full_uuid = user_data.get('uuid')
+            if not full_uuid:
+                logger.error(f"Could not get full UUID for short_uuid {short_uuid}")
+                return None
            
-            processed_subscriptions = []
-            for subscription in subscriptions_list:
-                if subscription.get('isFound') and 'user' in subscription:
-                    user_data = subscription['user']
-                    
-                    if 'subscriptionUrl' not in subscription and user_data.get('shortUuid'):
-                        subscription['subscriptionUrl'] = await self.get_subscription_url(user_data['shortUuid'])
-                    
-                    processed_subscriptions.append(subscription)
+            # Удаляем пользователя по полному UUID
+            result = await self.delete_user(full_uuid)
            
-            logger.info(f"Processed {len(processed_subscriptions)} subscriptions with URLs")
-            return processed_subscriptions
+            if result:
+                logger.info(f"Successfully deleted user {short_uuid} (UUID: {full_uuid})")
+                return {
+                    'success': True,
+                    'short_uuid': short_uuid,
+                    'full_uuid': full_uuid,
+                    'username': user_data.get('username', 'unknown')
+                }
+            else:
+                logger.error(f"Failed to delete user {short_uuid}")
+                return None
                
        except Exception as e:
-            logger.error(f"Exception in get_all_subscriptions_with_urls: {e}", exc_info=True)
-            return []
+            logger.error(f"Error deleting user by short UUID {short_uuid}: {e}")
+            return None
+
+    async def bulk_delete_users_by_short_uuids(self, short_uuids: List[str]) -> Dict[str, Any]:
+        """
+        Массовое удаление пользователей по списку short_uuid
+        """
+        try:
+            logger.info(f"Bulk deleting {len(short_uuids)} users by short UUIDs")
+            
+            results = {
+                'total': len(short_uuids),
+                'success': 0,
+                'failed': 0,
+                'errors': [],
+                'deleted_users': []
+            }
+            
+            for short_uuid in short_uuids:
+                try:
+                    result = await self.delete_user_by_short_uuid(short_uuid)
+                    
+                    if result and result.get('success'):
+                        results['success'] += 1
+                        results['deleted_users'].append({
+                            'short_uuid': short_uuid,
+                            'full_uuid': result.get('full_uuid'),
+                            'username': result.get('username')
+                        })
+                        logger.debug(f"Successfully deleted user {short_uuid}")
+                    else:
+                        results['failed'] += 1
+                        results['errors'].append(f"Failed to delete {short_uuid}")
+                        logger.warning(f"Failed to delete user {short_uuid}")
+                    
+                    # Небольшая пауза между запросами, чтобы не перегружать API
+                    await asyncio.sleep(0.1)
+                    
+                except Exception as e:
+                    results['failed'] += 1
+                    results['errors'].append(f"Error deleting {short_uuid}: {str(e)}")
+                    logger.error(f"Error deleting user {short_uuid}: {e}")
+            
+            logger.info(f"Bulk deletion completed: {results['success']} success, {results['failed']} failed")
+            return results
+            
+        except Exception as e:
+            logger.error(f"Error in bulk_delete_users_by_short_uuids: {e}")
+            return {
+                'total': len(short_uuids),
+                'success': 0,
+                'failed': len(short_uuids),
+                'errors': [f"Critical error: {str(e)}"],
+                'deleted_users': []
+            }

    async def create_user(self, username: str, password: str = None, 
                         traffic_limit: int = 0, expiry_time: str = None,
@@ -298,7 +294,86 @@ class RemnaWaveAPI:
                    
            return user_data
        return None
-    
+
+    async def get_subscription_info(self, short_uuid: str) -> Optional[Dict]:
+        try:
+            logger.info(f"Getting subscription info for short_uuid: {short_uuid}")
+            
+            endpoints_to_try = [
+                f'/api/subscriptions/{short_uuid}',
+                f'/api/sub/{short_uuid}',
+                f'/api/subscription/{short_uuid}'
+            ]
+            
+            for endpoint in endpoints_to_try:
+                logger.debug(f"Trying endpoint: {endpoint}")
+                result = await self._make_request('GET', endpoint)
+                
+                if result:
+                    logger.info(f"Successfully got subscription info from {endpoint}")
+                    
+                    subscription_data = None
+                    
+                    if 'response' in result:
+                        subscription_data = result['response']
+                    elif 'data' in result:
+                        subscription_data = result['data']
+                    elif 'subscription' in result:
+                        subscription_data = result['subscription']
+                    else:
+                        subscription_data = result
+                    
+                    if subscription_data and (
+                        'subscriptionUrl' in subscription_data or 
+                        'url' in subscription_data or 
+                        'link' in subscription_data
+                    ):
+                        return subscription_data
+            
+            logger.warning(f"Could not get subscription info for {short_uuid} from any endpoint")
+            return None
+            
+        except Exception as e:
+            logger.error(f"Error getting subscription info for {short_uuid}: {e}")
+            return None
+
+    async def get_subscription_url(self, short_uuid: str) -> str:
+        try:
+            logger.info(f"Getting subscription URL for short_uuid: {short_uuid}")
+            
+            subscription_info = await self.get_subscription_info(short_uuid)
+            
+            if subscription_info:
+                subscription_url = (
+                    subscription_info.get('subscriptionUrl') or
+                    subscription_info.get('url') or
+                    subscription_info.get('link') or
+                    subscription_info.get('subscription_url')
+                )
+                
+                if subscription_url:
+                    logger.info(f"Got subscription URL from API: {subscription_url}")
+                    return subscription_url
+            
+            user_data = await self.get_user_by_short_uuid(short_uuid)
+            if user_data and 'subscriptionUrl' in user_data:
+                logger.info(f"Got subscription URL from user data: {user_data['subscriptionUrl']}")
+                return user_data['subscriptionUrl']
+            
+            if self.subscription_base_url:
+                fallback_url = f"{self.subscription_base_url.rstrip('/')}/sub/{short_uuid}"
+                logger.warning(f"Using fallback URL: {fallback_url}")
+                return fallback_url
+            else:
+                fallback_url = f"{self.base_url.rstrip('/')}/sub/{short_uuid}"
+                logger.warning(f"Using base_url fallback: {fallback_url}")
+                return fallback_url
+                
+        except Exception as e:
+            logger.error(f"Failed to get subscription URL for {short_uuid}: {e}")
+            fallback_url = f"{self.base_url.rstrip('/')}/sub/{short_uuid}"
+            return fallback_url
+
    async def get_user_by_short_uuid(self, short_uuid: str) -> Optional[Dict]:
        logger.debug(f"Getting user by short UUID: {short_uuid}")
        result = await self._make_request('GET', f'/api/users/by-short-uuid/{short_uuid}')
@@ -321,6 +396,43 @@ class RemnaWaveAPI:
                    
            return user_data
        return None
+
+    async def get_all_subscriptions_with_urls(self) -> Optional[List]:
+        try:
+            logger.info("Fetching all subscriptions with URLs from API")
+            result = await self._make_request('GET', '/api/subscriptions')
+            
+            if not result:
+                logger.error("Empty response from subscriptions API")
+                return []
+            
+            subscriptions_list = []
+            
+            if 'response' in result and 'subscriptions' in result['response']:
+                subscriptions_list = result['response']['subscriptions']
+            elif 'subscriptions' in result:
+                subscriptions_list = result['subscriptions']
+            elif 'data' in result:
+                subscriptions_list = result['data']
+            elif isinstance(result, list):
+                subscriptions_list = result
+            
+            processed_subscriptions = []
+            for subscription in subscriptions_list:
+                if subscription.get('isFound') and 'user' in subscription:
+                    user_data = subscription['user']
+                    
+                    if 'subscriptionUrl' not in subscription and user_data.get('shortUuid'):
+                        subscription['subscriptionUrl'] = await self.get_subscription_url(user_data['shortUuid'])
+                    
+                    processed_subscriptions.append(subscription)
+            
+            logger.info(f"Processed {len(processed_subscriptions)} subscriptions with URLs")
+            return processed_subscriptions
+                
+        except Exception as e:
+            logger.error(f"Exception in get_all_subscriptions_with_urls: {e}", exc_info=True)
+            return []
    
    async def update_user(self, uuid: str, data: Dict) -> Optional[Dict]:
        update_data = {'uuid': uuid}
@@ -1,218 +0,0 @@
-#!/bin/bash
-
-# === RemnaWave Bot Setup & Management Script ===
-
-SERVICE_NAME="remnawave-bot"
-BOT_FILE="main.py"
-ENV_FILE=".env"
-VENV_DIR="venv"
-
-# Select language
-echo "🌐 Select language / Выберите язык:"
-echo "1) English"
-echo "2) Русский"
-read -p ">>> " LANG_CHOICE
-
-case $LANG_CHOICE in
-  2) LANG_CODE="ru" ;;
-  *) LANG_CODE="en" ;;
-esac
-
-# === Internationalized messages ===
-msg() {
-  case $1 in
-    check_python) [[ $LANG_CODE == "ru" ]] && echo "🔍 Проверка Python..." || echo "🔍 Checking Python..." ;;
-    python_missing) [[ $LANG_CODE == "ru" ]] && echo "❌ Python 3 не установлен. Установите Python 3.8+." || echo "❌ Python 3 is not installed. Please install Python 3.8+." ;;
-    version) echo "📋 Python version: $PYTHON_VERSION" ;;
-    creating_venv) [[ $LANG_CODE == "ru" ]] && echo "🔧 Создание виртуального окружения..." || echo "🔧 Creating virtual environment..." ;;
-    activating_venv) [[ $LANG_CODE == "ru" ]] && echo "🔧 Активация виртуального окружения..." || echo "🔧 Activating virtual environment..." ;;
-    upgrading_pip) [[ $LANG_CODE == "ru" ]] && echo "📦 Обновление pip..." || echo "📦 Upgrading pip..." ;;
-    installing_requirements) [[ $LANG_CODE == "ru" ]] && echo "📦 Установка зависимостей..." || echo "📦 Installing requirements..." ;;
-    env_missing) [[ $LANG_CODE == "ru" ]] && echo "⚠️  Файл .env не найден!" || echo "⚠️  .env file not found!" ;;
-    env_created) [[ $LANG_CODE == "ru" ]] && echo "📋 Создан .env файл. Пожалуйста, отредактируйте его." || echo "📋 .env created. Please edit it." ;;
-    validating) [[ $LANG_CODE == "ru" ]] && echo "🔍 Проверка конфигурации..." || echo "🔍 Validating configuration..." ;;
-    config_ok) [[ $LANG_CODE == "ru" ]] && echo "✅ Конфигурация прошла проверку." || echo "✅ Configuration validated successfully." ;;
-    creating_service) [[ $LANG_CODE == "ru" ]] && echo "🔧 Создание systemd-сервиса..." || echo "🔧 Creating systemd service..." ;;
-    service_created) [[ $LANG_CODE == "ru" ]] && echo "✅ Сервис создан и включён." || echo "✅ Service created and enabled." ;;
-    start_prompt) [[ $LANG_CODE == "ru" ]] && echo "🚀 Запуск бота..." || echo "🚀 Starting the bot..." ;;
-    already_running) [[ $LANG_CODE == "ru" ]] && echo "🟢 Бот уже запущен!" || echo "🟢 Bot is already running!" ;;
-    last_logs) [[ $LANG_CODE == "ru" ]] && echo "📄 Последние 20 строк лога:" || echo "📄 Last 20 log lines:" ;;
-    action_menu)
-      [[ $LANG_CODE == "ru" ]] && {
-        echo -e "\nЧто вы хотите сделать?"
-        echo "1) Остановить бота"
-        echo "2) Перезапустить бота"
-        echo "3) Выйти"
-      } || {
-        echo -e "\nWhat would you like to do?"
-        echo "1) Stop the bot"
-        echo "2) Restart the bot"
-        echo "3) Exit"
-      }
-      ;;
-    restarting) [[ $LANG_CODE == "ru" ]] && echo "🔄 Перезапуск бота..." || echo "🔄 Restarting bot..." ;;
-    completed)
-      echo ""
-      [[ $LANG_CODE == "ru" ]] && {
-        echo "🎉 Установка завершена!"
-        echo "📋 Возможности бота:"
-        echo "   ✅ Мультиязычный интерфейс"
-        echo "   ✅ Управление балансом и подписками"
-        echo "   ✅ Промокоды и поддержка"
-        echo ""
-      } || {
-        echo "🎉 Installation complete!"
-        echo "📋 Bot Features:"
-        echo "   ✅ Multi-language support"
-        echo "   ✅ Subscription and balance management"
-        echo "   ✅ Promocode system and support"
-        echo ""
-      }
-      ;;
-  esac
-}
-
-# === Check if bot is running ===
-if systemctl is-active --quiet "$SERVICE_NAME"; then
-  msg already_running
-  msg last_logs
-  sudo journalctl -u "$SERVICE_NAME" -n 20 --no-pager
-  msg action_menu
-  read -p ">>> " choice
-  case $choice in
-    1)
-      [[ $LANG_CODE == "ru" ]] && echo "🛑 Остановка бота..." || echo "🛑 Stopping the bot..."
-      sudo systemctl stop "$SERVICE_NAME"
-      [[ $LANG_CODE == "ru" ]] && echo "✅ Бот остановлен." || echo "✅ Bot stopped."
-      exit 0
-      ;;
-    2)
-      msg restarting
-      sudo systemctl restart "$SERVICE_NAME"
-      [[ $LANG_CODE == "ru" ]] && echo "✅ Бот перезапущен." || echo "✅ Bot restarted."
-      exit 0
-      ;;
-    3)
-      [[ $LANG_CODE == "ru" ]] && echo "👋 Выход." || echo "👋 Exiting."
-      exit 0
-      ;;
-    *)
-      [[ $LANG_CODE == "ru" ]] && echo "⚠️ Неверный выбор." || echo "⚠️ Invalid choice."
-      exit 1
-      ;;
-  esac
-fi
-
-# === Install/Setup ===
-msg check_python
-if ! command -v python3 &> /dev/null; then
-  msg python_missing
-  exit 1
-fi
-
-PYTHON_VERSION=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
-msg version
-
-if [ ! -d "$VENV_DIR" ]; then
-  msg creating_venv
-  python3 -m venv "$VENV_DIR"
-fi
-
-msg activating_venv
-source "$VENV_DIR/bin/activate"
-
-msg upgrading_pip
-pip install --upgrade pip
-
-msg installing_requirements
-pip install -r requirements.txt
-
-# Create .env if needed
-if [ ! -f "$ENV_FILE" ]; then
-  msg env_missing
-  cat > "$ENV_FILE" <<EOF
-# Bot Configuration
-BOT_TOKEN=
-
-# RemnaWave API Configuration
-REMNAWAVE_URL=
-REMNAWAVE_MODE=
-REMNAWAVE_TOKEN=
-
-# Admin Configuration (comma-separated list of Telegram user IDs)
-ADMIN_IDS=
-
-# Support Configuration
-SUPPORT_USERNAME=support
-
-# Database Configuration (optional, defaults to SQLite)
-# DATABASE_URL=sqlite+aiosqlite:///bot.db
-
-# Trial Configuration
-TRIAL_ENABLED=true
-TRIAL_DURATION_DAYS=3
-TRIAL_TRAFFIC_GB=2
-TRIAL_SQUAD_UUID=
-TRIAL_PRICE=0.0
-EOF
-  msg env_created
-  echo ""
-  read -p "🔧 Press Enter after configuring .env / Нажмите Enter после настройки .env..."
-fi
-
-# Load env
-export $(grep -v '^#' "$ENV_FILE" | xargs)
-
-msg validating
-
-if [[ -z "$BOT_TOKEN" || "$BOT_TOKEN" == "your_telegram_bot_token_here" ]]; then
-  echo "❌ BOT_TOKEN not set properly."
-  exit 1
-fi
-
-if [[ -z "$REMNAWAVE_URL" || "$REMNAWAVE_URL" == "https://your-panel.com" ]]; then
-  echo "❌ REMNAWAVE_URL not set properly."
-  exit 1
-fi
-
-if [[ -z "$REMNAWAVE_TOKEN" || "$REMNAWAVE_TOKEN" == "your_jwt_token_here" ]]; then
-  echo "❌ REMNAWAVE_TOKEN not set properly."
-  exit 1
-fi
-
-msg config_ok
-
-# Create systemd service
-read -p "🔧 Create systemd service? (y/n): " CREATE_SERVICE
-if [[ "$CREATE_SERVICE" == "y" || "$CREATE_SERVICE" == "Y" ]]; then
-  msg creating_service
-  SERVICE_FILE="/etc/systemd/system/$SERVICE_NAME.service"
-  CURRENT_DIR=$(pwd)
-  CURRENT_USER=$(whoami)
-  sudo tee "$SERVICE_FILE" > /dev/null <<EOF
-[Unit]
-Description=RemnaWave Bot
-After=network.target
-
-[Service]
-Type=simple
-User=$CURRENT_USER
-WorkingDirectory=$CURRENT_DIR
-Environment=PATH=$CURRENT_DIR/$VENV_DIR/bin
-EnvironmentFile=$CURRENT_DIR/.env
-ExecStart=$CURRENT_DIR/$VENV_DIR/bin/python3 $BOT_FILE
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-  sudo systemctl daemon-reload
-  sudo systemctl enable "$SERVICE_NAME"
-  msg service_created
-fi
-
-msg completed
-msg start_prompt
-python3 "$BOT_FILE"
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1,415 @@
+from aiogram import Router, F
+from aiogram.types import Message, CallbackQuery, LabeledPrice, PreCheckoutQuery, InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.exceptions import TelegramBadRequest
+from datetime import datetime
+import logging
+from typing import Dict
+
+from database import Database, User
+from keyboards import stars_topup_keyboard, stars_payment_keyboard, balance_keyboard
+from translations import t
+from utils import log_user_action
+from referral_utils import process_referral_rewards
+
+logger = logging.getLogger(__name__)
+
+stars_router = Router()
+
+@stars_router.callback_query(F.data == "topup_stars")
+async def topup_stars_callback(callback: CallbackQuery, **kwargs):
+    user = kwargs.get('user')
+    config = kwargs.get('config')
+    
+    if not user:
+        await callback.answer("❌ Ошибка пользователя")
+        return
+    
+    if not config or not config.STARS_ENABLED:
+        await callback.message.edit_text(
+            "❌ Пополнение через Telegram Stars временно недоступно",
+            reply_markup=balance_keyboard(user.language)
+        )
+        return
+    
+    if not config.STARS_RATES:
+        await callback.message.edit_text(
+            "❌ Курсы звезд не настроены",
+            reply_markup=balance_keyboard(user.language)
+        )
+        return
+    
+    text = "⭐ **Пополнение через Telegram Stars**\n\n"
+    text += "🚀 **Преимущества:**\n"
+    text += "• Мгновенное зачисление\n"
+    text += "• Безопасные платежи через Telegram\n"
+    text += "• Без комиссий и скрытых платежей\n\n"
+    
+    text += "💎 **Доступные варианты:**\n"
+    
+    sorted_rates = sorted(config.STARS_RATES.items())
+    for stars, rubles in sorted_rates:
+        rate_per_star = rubles / stars
+        
+        if stars >= 500:
+            bonus_text = " 🔥 Выгодно!"
+        elif stars >= 250:
+            bonus_text = " 💎 Хорошо!"
+        else:
+            bonus_text = ""
+        
+        text += f"• {stars} ⭐ → {rubles:.0f}₽{bonus_text}\n"
+    
+    text += f"\n💡 Выберите подходящий вариант:"
+    
+    await callback.message.edit_text(
+        text,
+        reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language),
+        parse_mode='Markdown'
+    )
+
+@stars_router.callback_query(F.data.startswith("buy_stars_"))
+async def buy_stars_callback(callback: CallbackQuery, db: Database, **kwargs):
+    user = kwargs.get('user')
+    config = kwargs.get('config')
+    bot = kwargs.get('bot')
+    
+    if not user:
+        await callback.answer("❌ Ошибка пользователя")
+        return
+    
+    if not config or not config.STARS_ENABLED or not config.STARS_RATES:
+        await callback.answer("❌ Пополнение недоступно")
+        return
+    
+    try:
+        stars_amount = int(callback.data.split("_")[2])
+        
+        if stars_amount not in config.STARS_RATES:
+            await callback.answer("❌ Неверное количество звезд")
+            return
+        
+        rub_amount = config.STARS_RATES[stars_amount]
+        
+        star_payment = await db.create_star_payment(
+            user_id=user.telegram_id,
+            stars_amount=stars_amount,
+            rub_amount=rub_amount
+        )
+        
+        prices = [LabeledPrice(label=f"Пополнение на {rub_amount:.0f}₽", amount=stars_amount)]
+        
+        try:
+            await callback.answer("💳 Создаю платеж...")
+            
+            await bot.send_invoice(
+                chat_id=callback.message.chat.id,
+                title=f"Пополнение баланса",
+                description=f"Пополнение баланса на {rub_amount:.0f}₽ за {stars_amount} ⭐",
+                payload=f"star_payment_{star_payment.id}",
+                currency="XTR",  
+                prices=prices
+            )
+            
+            try:
+                await callback.message.edit_text(
+                    f"💳 **Оплата через Telegram Stars**\n\n"
+                    f"⭐ Количество звезд: {stars_amount}\n"
+                    f"💰 Сумма пополнения: {rub_amount:.0f}₽\n\n"
+                    f"👆 Нажмите кнопку \"Оплатить\" в инвойсе ниже⤵️\n\n"
+                    f"Если передумали - нажмите кнопку ниже \n\n❌ Отменить платеж",
+                    reply_markup=InlineKeyboardMarkup(inline_keyboard=[
+                        [InlineKeyboardButton(text="❌ Отменить платеж", callback_data=f"cancel_star_payment_{star_payment.id}")],
+                        [InlineKeyboardButton(text="🔙 Назад к выбору", callback_data="topup_stars")]
+                    ]),
+                    parse_mode='Markdown'
+                )
+            except TelegramBadRequest:
+                await callback.message.answer(
+                    f"💳 **Оплата через Telegram Stars**\n\n"
+                    f"⭐ Количество звезд: {stars_amount}\n"
+                    f"💰 Сумма пополнения: {rub_amount:.0f}₽\n\n"
+                    f"👆 Нажмите кнопку \"Оплатить\" в инвойсе ниже⤵️",
+                    reply_markup=InlineKeyboardMarkup(inline_keyboard=[
+                        [InlineKeyboardButton(text="❌ Отменить платеж", callback_data=f"cancel_star_payment_{star_payment.id}")],
+                        [InlineKeyboardButton(text="🔙 Назад к выбору", callback_data="topup_stars")]
+                    ]),
+                    parse_mode='Markdown'
+                )
+            
+        except TelegramBadRequest as e:
+            logger.error(f"Failed to send invoice: {e}")
+            await callback.answer("❌ Ошибка создания платежа", show_alert=True)
+            
+            try:
+                await callback.message.edit_text(
+                    "❌ Ошибка создания платежа. Попробуйте позже.",
+                    reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language)
+                )
+            except TelegramBadRequest:
+                await callback.message.answer(
+                    "❌ Ошибка создания платежа. Попробуйте позже.",
+                    reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language)
+                )
+            
+            await db.cancel_star_payment(star_payment.id)
+            
+    except (ValueError, IndexError) as e:
+        logger.error(f"Error processing stars amount: {e}")
+        await callback.answer("❌ Ошибка обработки")
+    except Exception as e:
+        logger.error(f"Error in buy_stars_callback: {e}")
+        await callback.answer("❌ Произошла ошибка")
+
+@stars_router.pre_checkout_query()
+async def pre_checkout_query_handler(pre_checkout_query: PreCheckoutQuery, db: Database, **kwargs):
+    try:
+        if not pre_checkout_query.invoice_payload.startswith("star_payment_"):
+            await pre_checkout_query.answer(ok=False, error_message="Неверный формат платежа")
+            return
+        
+        payment_id = int(pre_checkout_query.invoice_payload.split("_")[2])
+        
+        star_payment = await db.get_star_payment_by_id(payment_id)
+        
+        if not star_payment:
+            await pre_checkout_query.answer(ok=False, error_message="Платеж не найден")
+            return
+        
+        if star_payment.status != 'pending':
+            await pre_checkout_query.answer(ok=False, error_message="Платеж уже обработан")
+            return
+        
+        if pre_checkout_query.total_amount != star_payment.stars_amount:
+            await pre_checkout_query.answer(ok=False, error_message="Неверная сумма платежа")
+            return
+        
+        await pre_checkout_query.answer(ok=True)
+        
+    except Exception as e:
+        logger.error(f"Error in pre_checkout_query_handler: {e}")
+        await pre_checkout_query.answer(ok=False, error_message="Внутренняя ошибка")
+
+@stars_router.message(F.successful_payment)
+async def successful_payment_handler(message: Message, db: Database, **kwargs):
+    user = kwargs.get('user')
+    bot = kwargs.get('bot')
+    
+    if not user:
+        logger.error("User not found in successful payment handler")
+        return
+    
+    try:
+        payment_info = message.successful_payment
+        
+        if not payment_info.invoice_payload.startswith("star_payment_"):
+            logger.error(f"Invalid payment payload: {payment_info.invoice_payload}")
+            return
+        
+        payment_id = int(payment_info.invoice_payload.split("_")[2])
+        
+        success = await db.complete_star_payment(
+            payment_id=payment_id,
+            telegram_payment_charge_id=payment_info.telegram_payment_charge_id
+        )
+        
+        if success:
+            star_payment = await db.get_star_payment_by_id(payment_id)
+            
+            if star_payment:
+                updated_user = await db.get_user_by_telegram_id(user.telegram_id)
+                
+                success_text = "✅ **Платеж успешно обработан!**\n\n"
+                success_text += f"⭐ Оплачено звезд: {star_payment.stars_amount}\n"
+                success_text += f"💰 Зачислено: {star_payment.rub_amount:.0f}₽\n"
+                success_text += f"💳 Текущий баланс: {updated_user.balance:.0f}₽\n\n"
+                success_text += "🎉 Средства уже доступны на вашем балансе!"
+                
+                await message.answer(
+                    success_text,
+                    parse_mode='Markdown'
+                )
+                
+                if bot:
+                    try:
+                        regular_payment = await db.create_payment(
+                            user_id=user.telegram_id,
+                            amount=star_payment.rub_amount,
+                            payment_type='stars',
+                            description=f'Пополнение через Telegram Stars ({star_payment.stars_amount} ⭐)',
+                            status='completed'
+                        )
+                        
+                        await process_referral_rewards(
+                            user.telegram_id,
+                            star_payment.rub_amount,
+                            regular_payment.id,
+                            db,
+                            bot,
+                            payment_type='stars'
+                        )
+                    except Exception as ref_error:
+                        logger.error(f"Error processing referral rewards for stars payment: {ref_error}")
+                
+                log_user_action(user.telegram_id, "stars_payment_completed", 
+                               f"Stars: {star_payment.stars_amount}, Amount: {star_payment.rub_amount}")
+            else:
+                await message.answer("❌ Ошибка получения данных платежа")
+        else:
+            await message.answer("❌ Ошибка обработки платежа. Обратитесь в поддержку.")
+            logger.error(f"Failed to complete star payment {payment_id}")
+            
+    except Exception as e:
+        logger.error(f"Error in successful_payment_handler: {e}")
+        await message.answer("❌ Произошла ошибка при обработке платежа. Обратитесь в поддержку.")
+
+def get_stars_rate_info(stars_rates: Dict[int, float], lang: str = 'ru') -> str:
+    if not stars_rates:
+        return "Курсы не настроены"
+    
+    text = "⭐ **Курсы Telegram Stars:**\n\n"
+    
+    sorted_rates = sorted(stars_rates.items())
+    for stars, rubles in sorted_rates:
+        rate_per_star = rubles / stars
+        text += f"• {stars} ⭐ = {rubles:.0f}₽ (курс: {rate_per_star:.2f}₽ за ⭐)\n"
+    
+    return text
+
+@stars_router.callback_query(F.data.startswith("cancel_star_payment_"))
+async def cancel_star_payment_callback(callback: CallbackQuery, db: Database, **kwargs):
+    user = kwargs.get('user')
+    config = kwargs.get('config')
+    bot = kwargs.get('bot') 
+    
+    if not user:
+        await callback.answer("❌ Ошибка пользователя")
+        return
+    
+    try:
+        payment_id = int(callback.data.split("_")[-1])
+        
+        star_payment = await db.get_star_payment_by_id(payment_id)
+        
+        if not star_payment:
+            await callback.answer("❌ Платеж не найден")
+            return
+        
+        if star_payment.user_id != user.telegram_id:
+            await callback.answer("❌ Нет доступа к этому платежу")
+            return
+        
+        if star_payment.status != 'pending':
+            await callback.answer("❌ Платеж уже обработан")
+            return
+        
+        success = await db.cancel_star_payment(payment_id)
+        
+        if success:
+            await callback.answer("✅ Платеж отменен", show_alert=True)
+            
+            if bot:
+                invoice_deleted = False
+                try:
+                    await bot.delete_message(
+                        chat_id=callback.message.chat.id,
+                        message_id=callback.message.message_id
+                    )
+                    invoice_deleted = True
+                    logger.info(f"Deleted invoice message {callback.message.message_id} for cancelled payment {payment_id}")
+                except TelegramBadRequest as e:
+                    logger.warning(f"Failed to delete invoice message: {e}")
+                except Exception as e:
+                    logger.error(f"Unexpected error deleting invoice message: {e}")
+                
+                if invoice_deleted:
+                    try:
+                        if config and config.STARS_RATES:
+                            text = "❌ Платеж отменен\n\n⭐ **Пополнение через Telegram Stars**\n\n"
+                            text += "🚀 **Преимущества:**\n"
+                            text += "• Мгновенное зачисление\n"
+                            text += "• Безопасные платежи через Telegram\n"
+                            text += "• Без комиссий и скрытых платежей\n\n"
+                            text += "💎 **Доступные варианты:**\n"
+                            
+                            sorted_rates = sorted(config.STARS_RATES.items())
+                            for stars, rubles in sorted_rates:
+                                if stars >= 500:
+                                    bonus_text = " 🔥 Выгодно!"
+                                elif stars >= 250:
+                                    bonus_text = " 💎 Хорошо!"
+                                else:
+                                    bonus_text = ""
+                                text += f"• {stars} ⭐ → {rubles:.0f}₽{bonus_text}\n"
+                            
+                            text += f"\n💡 Выберите другой вариант:"
+                            
+                            await bot.send_message(
+                                chat_id=callback.message.chat.id,
+                                text=text,
+                                reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language),
+                                parse_mode='Markdown'
+                            )
+                        else:
+                            await bot.send_message(
+                                chat_id=callback.message.chat.id,
+                                text="❌ Платеж отменен\n\n💰 Управление балансом:",
+                                reply_markup=balance_keyboard(user.language)
+                            )
+                    except Exception as e:
+                        logger.error(f"Failed to send menu after invoice deletion: {e}")
+                else:
+                    try:
+                        if config and config.STARS_RATES:
+                            await callback.message.edit_text(
+                                "❌ Платеж отменен\n\n⭐ **Пополнение через Telegram Stars**\n\nВыберите другой вариант:",
+                                reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language),
+                                parse_mode='Markdown'
+                            )
+                        else:
+                            await callback.message.edit_text(
+                                "❌ Платеж отменен",
+                                reply_markup=balance_keyboard(user.language)
+                            )
+                    except TelegramBadRequest:
+                        try:
+                            if config and config.STARS_RATES:
+                                await bot.send_message(
+                                    chat_id=callback.message.chat.id,
+                                    text="❌ Платеж отменен\n\n⭐ **Пополнение через Telegram Stars**\n\nВыберите другой вариант:",
+                                    reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language),
+                                    parse_mode='Markdown'
+                                )
+                            else:
+                                await bot.send_message(
+                                    chat_id=callback.message.chat.id,
+                                    text="❌ Платеж отменен",
+                                    reply_markup=balance_keyboard(user.language)
+                                )
+                        except Exception as e:
+                            logger.error(f"Failed to send fallback message: {e}")
+            else:
+                try:
+                    if config and config.STARS_RATES:
+                        await callback.message.edit_text(
+                            "❌ Платеж отменен\n\n⭐ **Пополнение через Telegram Stars**\n\nВыберите другой вариант:",
+                            reply_markup=stars_topup_keyboard(config.STARS_RATES, user.language),
+                            parse_mode='Markdown'
+                        )
+                    else:
+                        await callback.message.edit_text(
+                            "❌ Платеж отменен",
+                            reply_markup=balance_keyboard(user.language)
+                        )
+                except TelegramBadRequest:
+                    logger.warning("Failed to edit message when bot instance not available")
+            
+            log_user_action(user.telegram_id, "stars_payment_cancelled", f"Payment ID: {payment_id}")
+        else:
+            await callback.answer("❌ Ошибка отмены платежа")
+            
+    except (ValueError, IndexError) as e:
+        logger.error(f"Error parsing payment ID from callback: {e}")
+        await callback.answer("❌ Ошибка обработки")
+    except Exception as e:
+        logger.error(f"Error in cancel_star_payment_callback: {e}")
+        await callback.answer("❌ Произошла ошибка")
@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from datetime import datetime, timedelta, timezone
-from typing import Optional, List
+from typing import Optional, List, Dict, Any
 from database import Database
 from remnawave_api import RemnaWaveAPI

@@ -86,7 +86,7 @@ class SubscriptionMonitorService:
        logger.info("Subscription monitor service stopped")
        
    async def _monitor_loop(self):
-        logger.info("🔄 Starting monitor loop")
+        logger.info("🔥 Starting monitor loop")
        
        logger.info("⏰ Initial check in 10 seconds...")
        await asyncio.sleep(10)
@@ -96,8 +96,10 @@ class SubscriptionMonitorService:
                logger.info("🔍 Running periodic subscription check...")
                warnings_sent = await self._check_expiring_subscriptions()
                
-                if warnings_sent > 0:
-                    logger.info(f"✅ Monitor check completed: {warnings_sent} warnings sent")
+                trial_notifications = await self._check_expired_trial_subscriptions()
+                
+                if warnings_sent > 0 or trial_notifications > 0:
+                    logger.info(f"✅ Monitor check completed: {warnings_sent} warnings sent, {trial_notifications} trial notifications sent")
                else:
                    logger.info("✅ Monitor check completed: no warnings needed")
                
@@ -147,7 +149,279 @@ class SubscriptionMonitorService:
                break
            except Exception as e:
                logger.error(f"❌ Error in daily loop: {e}", exc_info=True)
-                await asyncio.sleep(3600)  # Wait 1 hour before retry
+                await asyncio.sleep(3600)
+
+    async def _check_expired_trial_subscriptions(self) -> int:
+        try:
+            logger.info("🆓 Checking for expired trial subscriptions...")
+            
+            notifications_sent = 0
+            now_utc = datetime.utcnow()
+            
+            all_users = await self.db.get_all_users()
+            
+            for user in all_users:
+                try:
+                    user_subs = await self.db.get_user_subscriptions(user.telegram_id)
+                    
+                    for user_sub in user_subs:
+                        try:
+                            subscription = await self.db.get_subscription_by_id(user_sub.subscription_id)
+                            if not subscription:
+                                continue
+                            
+                            if not subscription.is_trial:
+                                continue
+                            
+                            expires_at_utc = user_sub.expires_at
+                            if expires_at_utc.tzinfo is None:
+                                expires_at_utc = expires_at_utc.replace(tzinfo=None)
+                            else:
+                                expires_at_utc = expires_at_utc.astimezone(timezone.utc).replace(tzinfo=None)
+                            
+                            time_diff = expires_at_utc - now_utc
+                            hours_since_expiry = -time_diff.total_seconds() / 3600
+                            
+                            if 1 <= hours_since_expiry <= 24 and user_sub.is_active:
+                                logger.info(f"🆓 Sending trial expiry notification to user {user.telegram_id}: "
+                                          f"trial '{subscription.name}' expired {hours_since_expiry:.1f} hours ago")
+                                
+                                try:
+                                    await self._send_trial_expiry_notification(user, subscription)
+                                    notifications_sent += 1
+                                    logger.info(f"✅ Trial expiry notification sent to user {user.telegram_id}")
+                                except Exception as notification_error:
+                                    logger.error(f"❌ Failed to send trial notification to user {user.telegram_id}: {notification_error}")
+                        
+                        except Exception as sub_error:
+                            logger.error(f"❌ Error checking trial subscription {user_sub.id}: {sub_error}")
+                
+                except Exception as user_error:
+                    logger.error(f"❌ Error checking trial subscriptions for user {user.telegram_id}: {user_error}")
+            
+            if notifications_sent > 0:
+                logger.info(f"🆓 Trial expiry check completed: {notifications_sent} notifications sent")
+            
+            return notifications_sent
+        
+        except Exception as e:
+            logger.error(f"❌ Critical error in check_expired_trial_subscriptions: {e}", exc_info=True)
+            return 0
+
+    async def _send_trial_expiry_notification(self, user, subscription):
+        try:
+            if not self.bot:
+                logger.error("❌ Bot instance is None, cannot send trial notification")
+                return
+            
+            from translations import t
+            from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+            
+            message = t('trial_subscription_expired', user.language, name=subscription.name)
+            
+            keyboard = InlineKeyboardMarkup(inline_keyboard=[
+                [InlineKeyboardButton(
+                    text=t('buy_subscription_btn', user.language), 
+                    callback_data="buy_subscription"
+                )],
+                [InlineKeyboardButton(
+                    text=t('my_subscriptions_btn', user.language), 
+                    callback_data="my_subscriptions"
+                )]
+            ])
+            
+            await self.bot.send_message(user.telegram_id, message, reply_markup=keyboard)
+            
+            logger.info(f"✅ Trial expiry notification sent to user {user.telegram_id} for subscription '{subscription.name}'")
+        
+        except Exception as e:
+            logger.error(f"❌ Error sending trial expiry notification to user {user.telegram_id}: {e}", exc_info=True)
+            raise
+
+    async def delete_expired_trial_subscriptions(self, force: bool = False) -> Dict[str, Any]:
+        try:
+            logger.info("🗑️ Starting deletion of expired trial subscriptions...")
+            
+            now_utc = datetime.utcnow()
+            delete_threshold_days = getattr(self.config, 'DELETE_EXPIRED_TRIAL_DAYS', 1)
+            cutoff_date = now_utc - timedelta(days=delete_threshold_days)
+            
+            logger.info(f"🗑️ Deleting trial subscriptions expired before: {cutoff_date} (older than {delete_threshold_days} days)")
+            
+            results = {
+                'total_checked': 0,
+                'deleted_from_db': 0,
+                'deleted_from_api': 0,
+                'errors': [],
+                'deleted_subscriptions': []
+            }
+            
+            all_users = await self.db.get_all_users()
+            
+            for user in all_users:
+                try:
+                    user_subs = await self.db.get_user_subscriptions(user.telegram_id)
+                    
+                    for user_sub in user_subs:
+                        results['total_checked'] += 1
+                        
+                        subscription = await self.db.get_subscription_by_id(user_sub.subscription_id)
+                        if not subscription or not subscription.is_trial:
+                            continue
+                        
+                        expires_at_utc = user_sub.expires_at
+                        if expires_at_utc.tzinfo is None:
+                            expires_at_utc = expires_at_utc.replace(tzinfo=None)
+                        else:
+                            expires_at_utc = expires_at_utc.astimezone(timezone.utc).replace(tzinfo=None)
+                        
+                        if expires_at_utc > cutoff_date and not force:
+                            continue  
+                        
+                        logger.info(f"🗑️ Deleting expired trial subscription '{subscription.name}' for user {user.telegram_id} "
+                                  f"(expired: {expires_at_utc}, cutoff: {cutoff_date})")
+                        
+                        api_deleted = False
+                        if self.api and user_sub.short_uuid:
+                            try:
+                                api_result = await self.api.delete_user_by_short_uuid(user_sub.short_uuid)
+                                if api_result and api_result.get('success'):
+                                    api_deleted = True
+                                    results['deleted_from_api'] += 1
+                                    logger.info(f"✅ Deleted from RemnaWave API: {user_sub.short_uuid}")
+                                else:
+                                    results['errors'].append(f"Failed to delete {user_sub.short_uuid} from API")
+                                    logger.warning(f"⚠️ Failed to delete {user_sub.short_uuid} from API")
+                            except Exception as api_error:
+                                results['errors'].append(f"API error for {user_sub.short_uuid}: {str(api_error)}")
+                                logger.error(f"❌ API error deleting {user_sub.short_uuid}: {api_error}")
+                        
+                        db_deleted = await self.db.delete_user_subscription(user_sub.id)
+                        if db_deleted:
+                            results['deleted_from_db'] += 1
+                            results['deleted_subscriptions'].append({
+                                'user_id': user.telegram_id,
+                                'subscription_name': subscription.name,
+                                'short_uuid': user_sub.short_uuid,
+                                'expired_at': expires_at_utc.isoformat(),
+                                'deleted_from_api': api_deleted,
+                                'deleted_from_db': True
+                            })
+                            logger.info(f"✅ Deleted from database: subscription ID {user_sub.id}")
+                        else:
+                            results['errors'].append(f"Failed to delete subscription ID {user_sub.id} from database")
+                            logger.error(f"❌ Failed to delete subscription ID {user_sub.id} from database")
+                        
+                except Exception as user_error:
+                    results['errors'].append(f"Error processing user {user.telegram_id}: {str(user_error)}")
+                    logger.error(f"❌ Error processing user {user.telegram_id}: {user_error}")
+            
+            logger.info(f"🗑️ Trial deletion completed: {results['deleted_from_db']} from DB, {results['deleted_from_api']} from API")
+            return results
+            
+        except Exception as e:
+            logger.error(f"❌ Error in delete_expired_trial_subscriptions: {e}", exc_info=True)
+            return {
+                'total_checked': 0,
+                'deleted_from_db': 0,
+                'deleted_from_api': 0,
+                'errors': [f"Critical error: {str(e)}"],
+                'deleted_subscriptions': []
+            }
+
+    async def delete_expired_regular_subscriptions(self, force: bool = False) -> Dict[str, Any]:
+        try:
+            logger.info("🗑️ Starting deletion of expired regular subscriptions...")
+            
+            now_utc = datetime.utcnow()
+            delete_threshold_days = getattr(self.config, 'DELETE_EXPIRED_REGULAR_DAYS', 7)
+            cutoff_date = now_utc - timedelta(days=delete_threshold_days)
+            
+            logger.info(f"🗑️ Deleting regular subscriptions expired before: {cutoff_date} (older than {delete_threshold_days} days)")
+            
+            results = {
+                'total_checked': 0,
+                'deleted_from_db': 0,
+                'deleted_from_api': 0,
+                'errors': [],
+                'deleted_subscriptions': []
+            }
+            
+            all_users = await self.db.get_all_users()
+            
+            for user in all_users:
+                try:
+                    user_subs = await self.db.get_user_subscriptions(user.telegram_id)
+                    
+                    for user_sub in user_subs:
+                        results['total_checked'] += 1
+                        
+                        subscription = await self.db.get_subscription_by_id(user_sub.subscription_id)
+                        if not subscription or subscription.is_trial:
+                            continue
+                        
+                        if getattr(subscription, 'is_imported', False) or subscription.name == "Старая подписка":
+                            continue
+                        
+                        expires_at_utc = user_sub.expires_at
+                        if expires_at_utc.tzinfo is None:
+                            expires_at_utc = expires_at_utc.replace(tzinfo=None)
+                        else:
+                            expires_at_utc = expires_at_utc.astimezone(timezone.utc).replace(tzinfo=None)
+                        
+                        if expires_at_utc > cutoff_date and not force:
+                            continue 
+                        
+                        logger.info(f"🗑️ Deleting expired regular subscription '{subscription.name}' for user {user.telegram_id} "
+                                  f"(expired: {expires_at_utc}, cutoff: {cutoff_date})")
+                        
+                        api_deleted = False
+                        if self.api and user_sub.short_uuid:
+                            try:
+                                api_result = await self.api.delete_user_by_short_uuid(user_sub.short_uuid)
+                                if api_result and api_result.get('success'):
+                                    api_deleted = True
+                                    results['deleted_from_api'] += 1
+                                    logger.info(f"✅ Deleted from RemnaWave API: {user_sub.short_uuid}")
+                                else:
+                                    results['errors'].append(f"Failed to delete {user_sub.short_uuid} from API")
+                                    logger.warning(f"⚠️ Failed to delete {user_sub.short_uuid} from API")
+                            except Exception as api_error:
+                                results['errors'].append(f"API error for {user_sub.short_uuid}: {str(api_error)}")
+                                logger.error(f"❌ API error deleting {user_sub.short_uuid}: {api_error}")
+                        
+                        db_deleted = await self.db.delete_user_subscription(user_sub.id)
+                        if db_deleted:
+                            results['deleted_from_db'] += 1
+                            results['deleted_subscriptions'].append({
+                                'user_id': user.telegram_id,
+                                'subscription_name': subscription.name,
+                                'short_uuid': user_sub.short_uuid,
+                                'expired_at': expires_at_utc.isoformat(),
+                                'deleted_from_api': api_deleted,
+                                'deleted_from_db': True
+                            })
+                            logger.info(f"✅ Deleted from database: subscription ID {user_sub.id}")
+                        else:
+                            results['errors'].append(f"Failed to delete subscription ID {user_sub.id} from database")
+                            logger.error(f"❌ Failed to delete subscription ID {user_sub.id} from database")
+                        
+                except Exception as user_error:
+                    results['errors'].append(f"Error processing user {user.telegram_id}: {str(user_error)}")
+                    logger.error(f"❌ Error processing user {user.telegram_id}: {user_error}")
+            
+            logger.info(f"🗑️ Regular deletion completed: {results['deleted_from_db']} from DB, {results['deleted_from_api']} from API")
+            return results
+            
+        except Exception as e:
+            logger.error(f"❌ Error in delete_expired_regular_subscriptions: {e}", exc_info=True)
+            return {
+                'total_checked': 0,
+                'deleted_from_db': 0,
+                'deleted_from_api': 0,
+                'errors': [f"Critical error: {str(e)}"],
+                'deleted_subscriptions': []
+            }
                
    async def _check_expiring_subscriptions(self):
        try:
@@ -203,11 +477,11 @@ class SubscriptionMonitorService:
                                       f"threshold={self.config.MONITOR_WARNING_DAYS}")
                        
                            if subscription.is_trial:
-                                logger.debug(f"⏭️ Skipping trial subscription '{subscription.name}'")
+                                logger.debug(f"⭐️ Skipping trial subscription '{subscription.name}'")
                                continue
                        
                            if getattr(subscription, 'is_imported', False) or subscription.name == "Старая подписка":
-                                logger.debug(f"⏭️ Skipping imported subscription '{subscription.name}'")
+                                logger.debug(f"⭐️ Skipping imported subscription '{subscription.name}'")
                                continue
                        
                            should_warn = (
@@ -332,15 +606,33 @@ class SubscriptionMonitorService:
            warnings_sent = await self._check_expiring_subscriptions()
            logger.info(f"📢 Sent {warnings_sent} expiry warnings")
            
-            logger.info("🔄 Deactivating expired subscriptions...")
+            logger.info("🆓 Checking expired trial subscriptions...")
+            trial_notifications = await self._check_expired_trial_subscriptions()
+            logger.info(f"🆓 Sent {trial_notifications} trial expiry notifications")
+            
+            logger.info("🔥 Deactivating expired subscriptions...")
            deactivated_count = await self.deactivate_expired_subscriptions()
-            logger.info(f"🔄 Deactivated {deactivated_count} expired subscriptions")
+            logger.info(f"🔥 Deactivated {deactivated_count} expired subscriptions")
+            
+            deleted_trials = 0
+            deleted_regular = 0
+            if getattr(self.config, 'AUTO_DELETE_ENABLED', False):
+                logger.info("🗑️ Auto-deletion enabled, deleting expired subscriptions...")
+                
+                trial_result = await self.delete_expired_trial_subscriptions()
+                deleted_trials = trial_result.get('deleted_from_db', 0)
+                
+                regular_result = await self.delete_expired_regular_subscriptions()
+                deleted_regular = regular_result.get('deleted_from_db', 0)
+                
+                logger.info(f"🗑️ Auto-deleted {deleted_trials} trial and {deleted_regular} regular subscriptions")
            
            logger.info("📩 Sending final expiry notifications...")
            await self._send_final_expiry_notifications()
            logger.info("📩 Final notifications sent")
            
-            logger.info(f"✅ Daily check completed successfully. Warnings: {warnings_sent}, Deactivated: {deactivated_count}")
+            logger.info(f"✅ Daily check completed successfully. Warnings: {warnings_sent}, Trial notifications: {trial_notifications}, Deactivated: {deactivated_count}, "
+                       f"Deleted trials: {deleted_trials}, Deleted regular: {deleted_regular}")
            return deactivated_count
            
        except Exception as e:
@@ -391,7 +683,7 @@ class SubscriptionMonitorService:
                                            user_data = await self.api.get_user_by_short_uuid(user_sub.short_uuid)
                                            if user_data and user_data.get('uuid'):
                                                await self.api.update_user(user_data['uuid'], {'status': 'EXPIRED'})
-                                                logger.debug(f"🔄 Also deactivated user {user_data['uuid']} in RemnaWave")
+                                                logger.debug(f"🔥 Also deactivated user {user_data['uuid']} in RemnaWave")
                                        except Exception as api_error:
                                            logger.warning(f"⚠️ Could not deactivate user in RemnaWave: {api_error}")
                                else:
@@ -505,11 +797,30 @@ class SubscriptionMonitorService:
                    days_left = int(hours_left / 24)
            
                    if subscription.is_trial:
-                        results.append({
-                            'success': True,
-                            'message': f'Trial subscription "{subscription.name}" skipped (no warnings for trials)',
-                            'error': None
-                        })
+                        hours_since_expiry = -hours_left
+                        if 1 <= hours_since_expiry <= 24 and user_sub.is_active:
+                            test_message = f"🧪 [ТЕСТОВОЕ УВЕДОМЛЕНИЕ]\n\n🆓 Ваша триальная подписка '{subscription.name}' истекла! Купите новый тариф чтобы продолжить использование VPN."
+                            
+                            if self.bot:
+                                try:
+                                    await self.bot.send_message(user_id, test_message)
+                                    results.append({
+                                        'success': True,
+                                        'message': f'✅ Sent test trial expiry notification for "{subscription.name}" (expired {hours_since_expiry:.1f} hours ago)',
+                                        'error': None
+                                    })
+                                except Exception as send_error:
+                                    results.append({
+                                        'success': False,
+                                        'message': f'❌ Failed to send test trial notification for "{subscription.name}"',
+                                        'error': str(send_error)
+                                    })
+                        else:
+                            results.append({
+                                'success': True,
+                                'message': f'Trial subscription "{subscription.name}" - no notification needed (expired {hours_since_expiry:.1f} hours ago)',
+                                'error': None
+                            })
                        continue
                
                    if getattr(subscription, 'is_imported', False) or subscription.name == "Старая подписка":
@@ -589,6 +900,9 @@ class SubscriptionMonitorService:
            'check_interval': self.config.MONITOR_CHECK_INTERVAL,
            'daily_check_hour': self.config.MONITOR_DAILY_CHECK_HOUR,
            'warning_days': self.config.MONITOR_WARNING_DAYS,
+            'delete_trial_days': getattr(self.config, 'DELETE_EXPIRED_TRIAL_DAYS', 1),
+            'delete_regular_days': getattr(self.config, 'DELETE_EXPIRED_REGULAR_DAYS', 7),
+            'auto_delete_enabled': getattr(self.config, 'AUTO_DELETE_ENABLED', False),
            'last_check': self.last_check_time.strftime("%Y-%m-%d %H:%M:%S") if self.last_check_time else None,
            'has_tasks': {
                'monitor_task': monitor_running,
@@ -11,9 +11,9 @@ TRANSLATIONS = {
        'admin_panel': 'Админ панель',
        'trial_subscription': '🆓 Тестовая подписка',
        'trial_not_available': '❌ Тестовая подписка недоступна',
-        'trial_success': '🎉 Тестовая подписка успешно активирована!\n\nТеперь вы можете найти её в разделе "Мои подписки".',
+        'trial_success': '🎉 Тестовая подписка успешно активирована!\n\nТеперь вы можете найти её в разделе: \n\n"Мои подписки"',
        'trial_error': '❌ Ошибка при создании тестовой подписки',
-        'trial_info': '🧪 Тестовая подписка выдается на три дня!\n\nНа тарифе действует ограничение в 3 дня\n\nОграничение по трафику - 2гб',
+        'trial_info': 'Попробуйте наш сервис бесплатно! \n\n🧪 Тестовая подписка выдается на {days} дня!\n\nОграничение по трафику - {traffic} гб',
        'subscriptions_list': '📋 Список подписок в продаже:',
        'your_balance': '💰 Ваш баланс: {balance:.2f} руб.',
        'topup_balance': 'Пополнить баланс',
@@ -97,6 +97,48 @@ TRANSLATIONS = {
        'manage_balance': 'Управление балансом',
        'manage_promocodes': 'Управление промокодами',
        'statistics': 'Статистика',
+        'admin_user_subscriptions': 'Подписки пользователей',
+        'all_user_subscriptions': 'Все подписки пользователей',
+        'user_subscription_filters': 'Фильтры подписок',
+        'active_subscriptions': 'Активные подписки',
+        'expired_subscriptions': 'Истекшие подписки',
+        'expiring_subscriptions': 'Истекающие подписки',
+        'autopay_subscriptions': 'Подписки с автоплатежом',
+        'trial_subscriptions': 'Триальные подписки',
+        'imported_subscriptions': 'Импортированные подписки',
+        'subscription_details': 'Детали подписки',
+        'user_info': 'Информация о пользователе',
+        'subscription_info': 'Информация о подписке',
+        'subscription_status': 'Статус подписки',
+        'subscription_dates': 'Временные рамки',
+        'autopay_settings': 'Настройки автоплатежа',
+        'subscription_type': 'Тип подписки',
+        'edit_subscription': 'Редактировать подписку',
+        'toggle_status': 'Изменить статус',
+        'edit_expiry': 'Изменить срок',
+        'edit_autopay': 'Настроить автоплатеж',
+        'subscription_activated': 'Подписка активирована',
+        'subscription_deactivated': 'Подписка деактивирована',
+        'insufficient_funds': 'Недостаточно средств',
+        'funds_needed': 'Нужно еще',
+        'created_date': 'Дата создания',
+        'expires_date': 'Дата истечения',
+        'updated_date': 'Дата обновления',
+        'days_left': 'Дней осталось',
+        'autopay_enabled': 'Автоплатеж включен',
+        'autopay_disabled': 'Автоплатеж отключен',
+        'renew_before_days': 'Продлять за дней',
+        'view_details': 'Просмотр деталей',
+        'back_to_list': 'К списку',
+        'refresh_data': 'Обновить данные',
+        'no_subscriptions_found': 'Подписки не найдены',
+        'subscription_not_found': 'Подписка не найдена',
+        'database_unavailable': 'База данных недоступна',
+        'error_loading_subscriptions': 'Ошибка загрузки подписок',
+        'error_loading_details': 'Ошибка загрузки деталей',
+        'pagination_error': 'Ошибка навигации',
+        'edit_error': 'Ошибка редактирования',
+        'status_toggle_error': 'Ошибка изменения статуса',
        'not_admin': '❌ У вас нет прав администратора',
        'create_subscription': 'Создать подписку',
        'enter_sub_name': 'Введите название подписки:',
@@ -152,7 +194,10 @@ TRANSLATIONS = {
        'lucky_game_games_played': 'Игр сыграно: {count}',
        'lucky_game_wins': 'Выигрышей: {count}',
        'lucky_game_total_won': 'Всего выиграно: {amount}₽',
-        'lucky_game_win_rate': 'Процент побед: {rate}%'
+        'lucky_game_win_rate': 'Процент побед: {rate}%',
+        'trial_subscription_expired': '🆓 Ваша триальная подписка "{name}" истекла!\n\n'
+                             '💡 Чтобы продолжить использование VPN, купите полный тариф.\n\n'
+                             '✨ Доступны различные планы подписки с выгодными ценами!'
    },
    
    'en': {
@@ -204,6 +249,9 @@ TRANSLATIONS = {
        'subscription_expires_day_after_tomorrow': '⏰ Your subscription \'{name}\' expires in {days} days!\n\nWe recommend renewing it in advance in \'My Subscriptions\'.\n\n💰 Check your balance - you might want to top it up.',
        'subscription_expires_in_days': '⏳ Your subscription \'{name}\' expires in {days} days!\n\nYou can renew it in \'My Subscriptions\'.\n\n💡 Early renewal extends from current expiration date.',
        'extend_subscription_btn': '🔄 Extend Subscription',
+        'trial_subscription_expired': '🆓 Your trial subscription "{name}" has expired!\n\n'
+                             '💡 To continue using VPN, please purchase a full plan.\n\n'
+                             '✨ Various subscription plans with great prices are available!',
        'my_subscriptions_btn': '📋 My Subscriptions',
        'buy_new_subscription_btn': '🛒 Buy New Subscription',
        'restore_subscription_btn': '🔄 Restore Subscription',
@@ -294,7 +342,49 @@ TRANSLATIONS = {
        'lucky_game_games_played': 'Games played: {count}',
        'lucky_game_wins': 'Wins: {count}',
        'lucky_game_total_won': 'Total won: ${amount}',
-        'lucky_game_win_rate': 'Win rate: {rate}%'
+        'lucky_game_win_rate': 'Win rate: {rate}%',
+        'admin_user_subscriptions': 'User Subscriptions',
+        'all_user_subscriptions': 'All User Subscriptions',
+        'user_subscription_filters': 'Subscription Filters',
+        'active_subscriptions': 'Active Subscriptions',
+        'expired_subscriptions': 'Expired Subscriptions',
+        'expiring_subscriptions': 'Expiring Subscriptions',
+        'autopay_subscriptions': 'Autopay Subscriptions',
+        'trial_subscriptions': 'Trial Subscriptions',
+        'imported_subscriptions': 'Imported Subscriptions',
+        'subscription_details': 'Subscription Details',
+        'user_info': 'User Information',
+        'subscription_info': 'Subscription Information',
+        'subscription_status': 'Subscription Status',
+        'subscription_dates': 'Time Frames',
+        'autopay_settings': 'Autopay Settings',
+        'subscription_type': 'Subscription Type',
+        'edit_subscription': 'Edit Subscription',
+        'toggle_status': 'Toggle Status',
+        'edit_expiry': 'Edit Expiry',
+        'edit_autopay': 'Configure Autopay',
+        'subscription_activated': 'Subscription activated',
+        'subscription_deactivated': 'Subscription deactivated',
+        'insufficient_funds': 'Insufficient funds',
+        'funds_needed': 'Need more',
+        'created_date': 'Created Date',
+        'expires_date': 'Expiry Date',
+        'updated_date': 'Updated Date',
+        'days_left': 'Days Left',
+        'autopay_enabled': 'Autopay Enabled',
+        'autopay_disabled': 'Autopay Disabled',
+        'renew_before_days': 'Renew Before Days',
+        'view_details': 'View Details',
+        'back_to_list': 'Back to List',
+        'refresh_data': 'Refresh Data',
+        'no_subscriptions_found': 'No subscriptions found',
+        'subscription_not_found': 'Subscription not found',
+        'database_unavailable': 'Database unavailable',
+        'error_loading_subscriptions': 'Error loading subscriptions',
+        'error_loading_details': 'Error loading details',
+        'pagination_error': 'Navigation error',
+        'edit_error': 'Edit error',
+        'status_toggle_error': 'Status toggle error'
    }
 }

@@ -0,0 +1,165 @@
+import logging
+import hmac
+import hashlib
+import json
+from typing import Optional
+
+from aiohttp import web
+from aiogram import Bot
+from sqlalchemy.orm import sessionmaker
+
+from config import Config
+from database import Database
+
+logger = logging.getLogger(__name__)
+
+def convert_period_to_months(period: Optional[str]) -> int:
+    """Map Tribute subscription period strings to months."""
+    if not period:
+        return 1
+
+    mapping = {
+        "monthly": 1,
+        "quarterly": 3,
+        "3-month": 3,
+        "3months": 3,
+        "3-months": 3,
+        "q": 3,
+        "halfyearly": 6,
+        "yearly": 12,
+        "annual": 12,
+        "y": 12,
+    }
+    return mapping.get(period.lower(), 1)
+
+
+class TributeService:
+    def __init__(
+        self,
+        bot: Bot,
+        config: Config,
+        db: Database,
+    ):
+        self.bot = bot
+        self.config = config
+        self.db = db
+
+    async def handle_webhook(self, raw_body: bytes, signature_header: Optional[str]) -> web.Response:
+        def ok(data: Optional[dict] = None) -> web.Response:
+            payload = {"status": "ok"}
+            if data:
+                payload.update(data)
+            return web.json_response(payload, status=200)
+
+        def ignored(reason: str) -> web.Response:
+            return web.json_response({"status": "ignored", "reason": reason}, status=200)
+
+        def bad_request(reason: str) -> web.Response:
+            return web.json_response({"status": "error", "reason": reason}, status=400)
+
+        if hasattr(self.config, 'TRIBUTE_API_KEY') and self.config.TRIBUTE_API_KEY:
+            if not signature_header:
+                return web.json_response({"status": "error", "reason": "no_signature"}, status=403)
+            expected_sig = hmac.new(self.config.TRIBUTE_API_KEY.encode(), raw_body,
+                                    hashlib.sha256).hexdigest()
+            if not hmac.compare_digest(expected_sig, signature_header):
+                return web.json_response({"status": "error", "reason": "invalid_signature"}, status=403)
+
+        try:
+            payload = json.loads(raw_body.decode())
+        except Exception:
+            return bad_request("invalid_json")
+
+        logging.info(
+            "Tribute webhook data: %s",
+            json.dumps(payload, ensure_ascii=False),
+        )
+
+        event_name = payload.get("name")
+        data = payload.get("payload", {})
+
+        user_id = data.get("telegram_user_id")
+        if not user_id:
+            return ignored("missing_telegram_user_id")
+
+        amount_value = data.get("amount", 0)
+        currency = data.get("currency", "RUB").upper()
+        amount_float = round(amount_value / 100.0, 2) 
+
+        if event_name == "new_donation": 
+            await self._handle_new_donation(user_id, amount_float, currency, data)
+        elif event_name == "cancelled_subscription":
+            await self._handle_cancellation(user_id)
+    
+        return ok({"event": event_name or "unknown"})
+
+    async def _handle_new_donation(self, user_id: int, amount: float, currency: str, data: dict):
+        try:
+            if not user_id:
+                logger.warning(f"No telegram_user_id in webhook data")
+                return
+        
+            async with self.db.session_factory() as session:
+                payment = await self.db.create_payment(
+                    user_id=int(user_id),
+                    amount=amount,
+                    payment_type='tribute',
+                    description=f'Пополнение через Tribute: {amount} {currency}',
+                    status='completed'
+                )
+            
+                await self.db.add_balance(int(user_id), amount)
+            
+                try:
+                    success_msg = (
+                        f"✅ **Платеж через Tribute получен!**\n\n"
+                        f"💰 Сумма: {amount} {currency}\n"
+                        f"🎉 Средства зачислены на баланс!\n\n"
+                        f"💳 Ваш текущий баланс можно посмотреть в главном меню."
+                    )
+                
+                    from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+                    keyboard = InlineKeyboardMarkup(inline_keyboard=[
+                        [InlineKeyboardButton(text="💰 Мой баланс", callback_data="balance")],
+                        [InlineKeyboardButton(text="🏠 Главное меню", callback_data="main_menu")]
+                    ])
+                
+                    await self.bot.send_message(
+                        int(user_id),
+                        success_msg,
+                        reply_markup=keyboard,
+                        parse_mode="Markdown"
+                    )
+                except Exception as e:
+                    logger.error(f"Failed to send Tribute payment success message to user {user_id}: {e}")
+
+                await session.commit()
+                logger.info(f"Successfully processed Tribute donation: {amount} {currency} for user {user_id}")
+                
+        except Exception as e:
+            logger.error(f"Error handling tribute donation: {e}")
+
+    async def _handle_cancellation(self, user_id: int):
+        try:
+            cancellation_msg = (
+                "🚨 Ваш платеж Tribute был отменен.\n\n"
+                "Если это произошло по ошибке, обратитесь в поддержку."
+            )
+            
+            await self.bot.send_message(
+                int(user_id),
+                cancellation_msg,
+                parse_mode="HTML"
+            )
+            
+            logger.info(f"Tribute subscription cancelled for user {user_id}")
+                    
+        except Exception as e:
+            logger.error(f"Error handling tribute cancellation for user {user_id}: {e}")
+
+
+async def tribute_webhook_route(request: web.Request):
+    tribute_service: TributeService = request.app['tribute_service']
+    raw_body = await request.read()
+    signature_header = request.headers.get('trbt-signature')
+    return await tribute_service.handle_webhook(raw_body, signature_header)
@@ -3,8 +3,6 @@ import secrets
 import string
 from datetime import datetime, timedelta
 from typing import Tuple, Optional, Dict, Any
-from database import Database
-from database import ReferralProgram, ReferralEarning

 logger = logging.getLogger(__name__)

@@ -245,252 +243,6 @@ def format_user_subscription_info(user_sub: Dict[str, Any], subscription: Dict[s
 def log_user_action(user_id: int, action: str, details: str = ""):
    logger.info(f"USER_ACTION: {user_id} - {action}" + (f" - {details}" if details else ""))

-async def process_referral_rewards(user_id: int, amount: float, payment_id: int, db: Database, bot=None):
-    try:
-        import os
-        
-        threshold = float(os.getenv('REFERRAL_THRESHOLD', '300.0'))
-        first_reward = float(os.getenv('REFERRAL_FIRST_REWARD', '150.0'))
-        referred_bonus = float(os.getenv('REFERRAL_REFERRED_BONUS', '150.0'))
-        percentage = float(os.getenv('REFERRAL_PERCENTAGE', '0.25'))
-        
-        referral = await db.get_referral_by_referred_id(user_id)
-        
-        if not referral:
-            logger.debug(f"No referral found for user {user_id}")
-            return
-        
-        user = await db.get_user_by_telegram_id(user_id)
-        if not user:
-            logger.error(f"User {user_id} not found")
-            return
-        
-        logger.info(f"Processing referral rewards for user {user_id}, amount {amount}, referrer {referral.referrer_id}")
-        
-        if not referral.first_reward_paid and user.balance >= threshold:
-            logger.info(f"Processing first reward for referral {referral.id} (threshold: {threshold}, reward: {first_reward})")
-            
-            await db.add_balance(referral.referrer_id, first_reward)
-            
-            await db.create_payment(
-                user_id=referral.referrer_id,
-                amount=first_reward,
-                payment_type='referral',
-                description=f'Первая награда за реферала ID:{user_id}',
-                status='completed'
-            )
-            
-            success = await db.create_referral_earning(
-                referrer_id=referral.referrer_id,
-                referred_id=user_id,
-                amount=first_reward,
-                earning_type='first_reward',
-                related_payment_id=payment_id
-            )
-            
-            if success:
-                logger.info(f"First reward paid: {first_reward}₽ to referrer {referral.referrer_id}")
-                
-                if bot:
-                    try:
-                        await bot.send_message(
-                            referral.referrer_id,
-                            f"🎉 Поздравляем! Ваш реферал пополнил баланс на {threshold}₽+\n\n"
-                            f"💰 Вам начислено {first_reward}₽ за приведенного друга!\n"
-                            f"Теперь вы будете получать {percentage*100:.0f}% с каждого его следующего платежа."
-                        )
-                        
-                        await bot.send_message(
-                            user_id,
-                            f"🎁 Бонус активирован! Вам начислено {referred_bonus}₽ за переход по реферальной ссылке!"
-                        )
-                        
-                        await db.add_balance(user_id, referred_bonus)
-                        await db.create_payment(
-                            user_id=user_id,
-                            amount=referred_bonus,
-                            payment_type='referral',
-                            description='Бонус за переход по реферальной ссылке',
-                            status='completed'
-                        )
-                        
-                        logger.info(f"Referral bonus notifications sent and balance updated")
-                        
-                    except Exception as e:
-                        logger.error(f"Failed to send referral notifications: {e}")
-            else:
-                logger.error(f"Failed to create first reward earning")
-        
-        if amount > 0 and referral.first_reward_paid:  
-            percentage_reward = amount * percentage
-            
-            if percentage_reward >= 0.01:
-                await db.add_balance(referral.referrer_id, percentage_reward)
-                
-                await db.create_payment(
-                    user_id=referral.referrer_id,
-                    amount=percentage_reward,
-                    payment_type='referral',
-                    description=f'{percentage*100:.0f}% дохода от реферала ID:{user_id}',
-                    status='completed'
-                )
-                
-                success = await db.create_referral_earning(
-                    referrer_id=referral.referrer_id,
-                    referred_id=user_id,
-                    amount=percentage_reward,
-                    earning_type='percentage',
-                    related_payment_id=payment_id
-                )
-                
-                if success:
-                    logger.info(f"Percentage reward paid: {percentage_reward:.2f}₽ ({percentage*100:.0f}%) to referrer {referral.referrer_id}")
-                    
-                    if bot and percentage_reward >= 1.0:
-                        try:
-                            await bot.send_message(
-                                referral.referrer_id,
-                                f"💰 Реферальный доход!\n\n"
-                                f"Ваш реферал совершил платеж на {amount:.2f}₽\n"
-                                f"Вам начислено: {percentage_reward:.2f}₽ ({percentage*100:.0f}%)"
-                            )
-                        except Exception as e:
-                            logger.error(f"Failed to send percentage notification: {e}")
-                else:
-                    logger.error(f"Failed to create percentage earning")
-        elif amount > 0 and not referral.first_reward_paid:
-            logger.info(f"Skipping percentage reward for user {user_id} - first reward not yet paid")
-    
-    except Exception as e:
-        logger.error(f"Error processing referral rewards: {e}")
-
-async def create_referral_from_start_param(user_telegram_id: int, start_param: str, db: Database, bot=None):
-    try:
-        if not start_param.startswith("ref_"):
-            return False
-        
-        referrer_id = int(start_param.replace("ref_", ""))
-        
-        if referrer_id == user_telegram_id:
-            logger.warning(f"User {user_telegram_id} tried to refer themselves")
-            return False
-        
-        existing_referral = await db.get_referral_by_referred_id(user_telegram_id)
-        
-        if existing_referral:
-            logger.info(f"User {user_telegram_id} already has referrer")
-            return False
-        
-        referral_code = await db.generate_unique_referral_code(referrer_id)
-        
-        referral = await db.create_referral(referrer_id, user_telegram_id, referral_code)
-        
-        if referral:
-            logger.info(f"Created referral: {referrer_id} -> {user_telegram_id} with code {referral_code}")
-            
-            if bot:
-                try:
-                    referrer = await db.get_user_by_telegram_id(referrer_id)
-                    if referrer:
-                        await bot.send_message(
-                            referrer_id,
-                            f"🎉 Отлично! По вашей ссылке зарегистрировался новый пользователь!\n\n"
-                            f"Вы получите 150₽ после того, как он пополнит баланс на 300₽.\n"
-                            f"И будете получать 25% с каждого его платежа!"
-                        )
-                except Exception as e:
-                    logger.error(f"Failed to notify referrer: {e}")
-            
-            return True
-        
-        return False
-        
-    except (ValueError, TypeError) as e:
-        logger.warning(f"Invalid referral parameter: {start_param}")
-        return False
-    except Exception as e:
-        logger.error(f"Error creating referral from start param: {e}")
-        return False
-
-async def create_referral_from_promocode(user_telegram_id: int, referral_code: str, db: Database, bot=None):
-    try:
-        if not referral_code.startswith("REF"):
-            return False
-        
-        logger.info(f"Trying to use referral code {referral_code} for user {user_telegram_id}")
-        
-        async with db.session_factory() as session:
-            from sqlalchemy import select
-            result = await session.execute(
-                select(ReferralProgram).where(ReferralProgram.referral_code == referral_code)
-            )
-            referral_record = result.scalar_one_or_none()
-            
-            if not referral_record:
-                logger.warning(f"No referrer found for code {referral_code}")
-                return False
-            
-            referrer_id = referral_record.referrer_id
-            
-            if referrer_id == user_telegram_id:
-                logger.warning(f"User {user_telegram_id} tried to use own referral code")
-                return False
-            
-            existing_referral = await db.get_referral_by_referred_id(user_telegram_id)
-            
-            if existing_referral:
-                logger.info(f"User {user_telegram_id} already has referrer")
-                return False
-            
-            referral = await db.create_referral(referrer_id, user_telegram_id, referral_code)
-            
-            if referral:
-                logger.info(f"Created referral from promocode: {referrer_id} -> {user_telegram_id}")
-                
-                if bot:
-                    try:
-                        await bot.send_message(
-                            referrer_id,
-                            f"🎉 По вашему промокоду {referral_code} зарегистрировался новый пользователь!\n\n"
-                            f"Вы получите 150₽ после того, как он пополнит баланс на 300₽."
-                        )
-                    except Exception as e:
-                        logger.error(f"Failed to notify referrer: {e}")
-                
-                return True
-            
-            return False
-        
-    except Exception as e:
-        logger.error(f"Error creating referral from promocode: {e}")
-        return False
-
-def generate_referral_link(bot_username: str, user_id: int) -> str:
-    if not bot_username:
-        return ""
-    
-    if bot_username.startswith('@'):
-        bot_username = bot_username[1:]
-    
-    return f"https://t.me/{bot_username}?start=ref_{user_id}"
-
-def validate_referral_code(code: str) -> bool:
-    if not code or not code.startswith("REF"):
-        return False
-    if len(code) < 4 or len(code) > 20:
-        return False
-    return True
-
-def format_referral_stats(stats: dict, lang: str = 'ru') -> str:
-    if lang == 'ru':
-        return (f"👥 Приглашено: {stats['total_referrals']}\n"
-                f"✅ Активных: {stats['active_referrals']}\n"
-                f"💰 Заработано: {stats['total_earned']:.2f}₽")
-    else:
-        return (f"👥 Invited: {stats['total_referrals']}\n"
-                f"✅ Active: {stats['active_referrals']}\n"
-                f"💰 Earned: ${stats['total_earned']:.2f}")
-
 def bytes_to_gb(bytes_value: int) -> float:
    if not bytes_value or bytes_value == 0:
        return 0.0
@@ -0,0 +1,70 @@
+import logging
+from aiohttp import web, ClientSession
+from aiogram import Bot
+from database import Database
+from config import Config
+from tribute_service import TributeService, tribute_webhook_route
+
+logger = logging.getLogger(__name__)
+
+class WebhookServer:
+    def __init__(self, bot: Bot, db: Database, config: Config):
+        self.bot = bot
+        self.db = db
+        self.config = config
+        self.app = None
+        self.runner = None
+        self.site = None
+        
+    async def create_app(self):
+        self.app = web.Application()
+        
+        tribute_service = TributeService(self.bot, self.config, self.db)
+        
+        self.app['tribute_service'] = tribute_service
+        
+        self.app.router.add_post(self.config.TRIBUTE_WEBHOOK_PATH, tribute_webhook_route)
+        
+        async def health_check(request):
+            return web.json_response({"status": "ok", "service": "tribute-webhooks"})
+        
+        self.app.router.add_get('/health', health_check)
+        
+        logger.info(f"Webhook server configured with route: {self.config.TRIBUTE_WEBHOOK_PATH}")
+        return self.app
+    
+    async def start(self):
+        try:
+            if not self.app:
+                await self.create_app()
+            
+            self.runner = web.AppRunner(self.app)
+            await self.runner.setup()
+            
+            self.site = web.TCPSite(
+                self.runner, 
+                host='0.0.0.0', 
+                port=self.config.TRIBUTE_WEBHOOK_PORT
+            )
+            
+            await self.site.start()
+            
+            logger.info(f"✅ Webhook server started on port {self.config.TRIBUTE_WEBHOOK_PORT}")
+            logger.info(f"🎯 Tribute webhook URL: http://your-server:{self.config.TRIBUTE_WEBHOOK_PORT}{self.config.TRIBUTE_WEBHOOK_PATH}")
+            
+        except Exception as e:
+            logger.error(f"❌ Failed to start webhook server: {e}")
+            raise
+    
+    async def stop(self):
+        try:
+            if self.site:
+                await self.site.stop()
+                logger.info("Webhook site stopped")
+            
+            if self.runner:
+                await self.runner.cleanup()
+                logger.info("Webhook runner cleaned up")
+                
+        except Exception as e:
+            logger.error(f"Error stopping webhook server: {e}")
Author	SHA1	Message	Date
Egor	c101cb3d3f	Update README.md	2025-08-14 05:29:41 +03:00
Egor	63912af43b	Update README.md	2025-08-14 05:26:12 +03:00
Egor	d19263dd79	Update .env.example	2025-08-14 05:08:03 +03:00
Egor	f8c9c59a03	Update database.py	2025-08-14 04:45:02 +03:00
Egor	5595f7a954	Update admin_handlers.py	2025-08-14 04:44:33 +03:00
Egor	bac4527945	Update autopay_service.py	2025-08-14 04:44:09 +03:00
Egor	51da8bcb72	Update remnawave_api.py	2025-08-14 04:41:38 +03:00
Egor	8aa6e7e245	Update subscription_monitor.py	2025-08-14 04:40:29 +03:00
Egor	5029b35d14	Update subscription_monitor.py	2025-08-14 04:39:37 +03:00
Egor	2412027d9b	Update handlers.py	2025-08-14 04:39:17 +03:00
Egor	ddff5219e5	Create webhook_server.py	2025-08-14 04:38:58 +03:00
Egor	346bc18b58	Create tribute_service.py	2025-08-14 04:38:12 +03:00
Egor	c256ae3664	Update keyboards.py	2025-08-14 04:37:33 +03:00
Egor	2b47358a9e	Update config.py	2025-08-14 04:36:58 +03:00
Egor	e0b041ce44	Update main.py	2025-08-14 04:36:41 +03:00
Egor	3f64dee927	Update database.py	2025-08-13 08:02:35 +03:00
Egor	67c5ebeabd	Update admin_handlers.py	2025-08-13 08:02:18 +03:00
Egor	84bc8e96cc	Update database.py	2025-08-13 07:58:18 +03:00
Egor	2d30cec7c6	Update lucky_game.py	2025-08-13 07:55:50 +03:00
Egor	5f5f66178b	Update lucky_game.py	2025-08-13 07:50:17 +03:00
Egor	e9fadec0ac	Update database.py	2025-08-13 07:49:40 +03:00
Egor	10008e51ff	Update admin_handlers.py	2025-08-13 07:39:20 +03:00
Egor	3098610d17	Update database.py	2025-08-13 07:31:29 +03:00
Egor	7a2566d320	Update admin_handlers.py	2025-08-13 07:31:09 +03:00
Egor	01ba8ca53e	Update subscription_monitor.py	2025-08-13 07:09:12 +03:00
Egor	2a0a2dccff	Update README.md	2025-08-13 06:55:22 +03:00
Egor	66a6f32d4c	Update .env.example	2025-08-13 06:51:35 +03:00
Egor	02b3f61953	Update translations.py	2025-08-13 06:37:10 +03:00
Egor	dc08526255	Update config.py	2025-08-13 06:36:52 +03:00
Egor	2ca339610b	Update subscription_monitor.py	2025-08-13 06:36:32 +03:00
Egor	ffe65937c1	Update README.md	2025-08-12 19:16:27 +03:00
Egor	4b6f03eef5	Update README.md	2025-08-12 19:15:02 +03:00
Egor	d2f530a7fe	Update bedolaga.sh	2025-08-12 19:10:37 +03:00
Egor	44ea4b6b13	Update .env.example	2025-08-12 18:55:22 +03:00
Egor	ebc8421a70	Update README.md	2025-08-12 18:52:20 +03:00
Egor	526f142dea	Update remnawave_api.py	2025-08-12 18:12:34 +03:00
Egor	ca431d36e6	Add files via upload	2025-08-12 03:49:13 +03:00
Egor	68a81bdd89	Delete screens/уведомления/Снимок экрана 2025-08-12 в 01.45.14.png	2025-08-12 03:48:59 +03:00
Fr1ngg	68a3d713ef	Update README.md	2025-08-12 03:19:42 +03:00
Fr1ngg	50d3d08e38	Update README.md	2025-08-12 03:14:42 +03:00
Fr1ngg	9a2fec4d8f	Update README.md	2025-08-12 03:10:34 +03:00
Fr1ngg	e68b1d2092	Add files via upload	2025-08-12 02:48:15 +03:00
Fr1ngg	6dfedef81e	Update README.md	2025-08-12 02:36:41 +03:00
Fr1ngg	317e39c823	Update keyboards.py	2025-08-12 02:34:19 +03:00
Fr1ngg	0072a3cb71	Update translations.py	2025-08-12 02:34:03 +03:00
Fr1ngg	8d021c1530	Update database.py	2025-08-12 02:33:44 +03:00
Fr1ngg	23606dc2d4	Update admin_handlers.py	2025-08-12 02:33:23 +03:00
Fr1ngg	0838c4196d	Add files via upload	2025-08-12 01:47:52 +03:00
Fr1ngg	65605a0de2	Create 1	2025-08-12 01:47:38 +03:00
Fr1ngg	a20ac80281	Delete screens/уведомления	2025-08-12 01:47:25 +03:00
Fr1ngg	02e83fb0d0	Create уведомления	2025-08-12 01:47:13 +03:00
Fr1ngg	eddad0db6e	Add files via upload	2025-08-12 01:46:00 +03:00
Fr1ngg	ffad0afb61	Delete screens/Balance/Снимок экрана 2025-08-09 в 07.54.52.png	2025-08-12 01:44:40 +03:00
Fr1ngg	83eed8e1cd	Add files via upload	2025-08-12 01:44:17 +03:00
Fr1ngg	0c7c8abade	Add files via upload	2025-08-12 01:42:18 +03:00
Fr1ngg	a064890ed8	Delete screens/adminpanel/Снимок экрана 2025-08-09 в 08.09.05.png	2025-08-12 01:41:33 +03:00
Fr1ngg	f310f4a35e	Delete screens/sub/Снимок экрана 2025-08-09 в 08.05.47.png	2025-08-12 01:41:14 +03:00
Fr1ngg	0268e09882	Delete screens/Главное меню/Mainmenu.png	2025-08-12 01:40:23 +03:00
Fr1ngg	449814d0df	Add files via upload	2025-08-12 01:40:09 +03:00
Fr1ngg	a3d3577103	Update README.md	2025-08-12 01:37:43 +03:00
Fr1ngg	a3086fdd2c	Update README.md	2025-08-12 01:34:57 +03:00
Fr1ngg	daafc6a41e	Update README.md	2025-08-12 01:31:42 +03:00
Fr1ngg	c27ee116f7	Update README.md	2025-08-12 01:28:56 +03:00
Fr1ngg	5167cde443	Update bedolaga.sh	2025-08-12 01:25:30 +03:00
Fr1ngg	34542d3a9c	Update bedolaga.sh	2025-08-12 01:09:56 +03:00
Fr1ngg	e73d1df4cc	Update logo2.svg	2025-08-12 01:05:39 +03:00
Fr1ngg	f9a95c3d48	Update README.md	2025-08-12 01:04:53 +03:00
Fr1ngg	2dd2b5fdbf	Update README.md	2025-08-12 01:04:37 +03:00
Fr1ngg	896f1db9d4	Update README.md	2025-08-11 23:09:23 +03:00
Fr1ngg	a1bd2d775f	Create emergency_fix.py	2025-08-11 22:54:05 +03:00
Fr1ngg	8cbe23f9ed	Update database.py	2025-08-11 22:31:17 +03:00
Fr1ngg	edc891c93d	Update README.md	2025-08-11 22:06:49 +03:00
Fr1ngg	2d706a4be0	Update keyboards.py	2025-08-11 22:01:38 +03:00
Fr1ngg	32cb81ef34	Update handlers.py	2025-08-11 22:01:09 +03:00
Fr1ngg	88aa3c4a3d	Update database.py autopay mod	2025-08-11 22:00:43 +03:00
Fr1ngg	e813d3ccb7	Create autopay_service.py	2025-08-11 22:00:19 +03:00
Fr1ngg	a24d7a4e24	Update main.py	2025-08-11 21:59:51 +03:00
Fr1ngg	39987b9717	Update admin_handlers.py autopay mod	2025-08-11 21:59:31 +03:00
Fr1ngg	c77a1ea4f8	Update README.md	2025-08-11 17:57:35 +03:00
Fr1ngg	64b5d90d66	Update README.md	2025-08-11 03:00:54 +03:00
Fr1ngg	5a1fb32e1d	Update admin_handlers.py	2025-08-11 02:58:19 +03:00
Fr1ngg	c4d8108e8c	Update config.py	2025-08-11 02:53:37 +03:00
Fr1ngg	1350d80083	Update database.py	2025-08-11 02:51:28 +03:00
Fr1ngg	e0cc218007	Update handlers.py	2025-08-11 02:49:06 +03:00
Fr1ngg	bcaf8f2247	Update keyboards.py	2025-08-11 02:48:36 +03:00
Fr1ngg	d1190ed9dc	Update stars_handlers.py	2025-08-11 02:47:05 +03:00
Fr1ngg	513d6037d4	Update subscription_monitor.py	2025-08-11 02:46:40 +03:00
Fr1ngg	e86012b2ab	Update translations.py	2025-08-11 02:46:11 +03:00
Fr1ngg	214e381dc5	Update README.md	2025-08-10 10:41:22 +03:00
Fr1ngg	aa79cb670b	Update .env.example	2025-08-10 10:30:33 +03:00
Fr1ngg	f0106e15fa	Create stars_handlers.py	2025-08-10 10:26:28 +03:00
Fr1ngg	1d194c6be2	Update .env.example	2025-08-10 10:18:03 +03:00
Fr1ngg	6917890007	Update admin_handlers.py	2025-08-10 10:15:34 +03:00
Fr1ngg	1c69de7ecd	Update config.py	2025-08-10 10:13:14 +03:00
Fr1ngg	62188793d9	Update database.py	2025-08-10 10:12:21 +03:00
Fr1ngg	585ee2d42b	Update handlers.py	2025-08-10 10:11:12 +03:00
Fr1ngg	2a58cfd45c	Update keyboards.py	2025-08-10 10:10:54 +03:00
Fr1ngg	93003c5fe0	Update main.py	2025-08-10 10:10:27 +03:00
Fr1ngg	91b0787d72	Update README.md	2025-08-10 07:04:17 +03:00
Fr1ngg	315277d4b0	Create bedolaga.sh	2025-08-10 06:56:04 +03:00
Fr1ngg	1821c0d89d	Delete run.sh	2025-08-10 06:54:40 +03:00
Fr1ngg	5650da0c5f	Update README.md	2025-08-10 03:56:42 +03:00
Fr1ngg	0ca8b73cef	Update .env.example	2025-08-10 03:51:10 +03:00
Fr1ngg	6bab26ab27	Update lucky_game.py	2025-08-10 03:44:57 +03:00
Fr1ngg	a72243e7fa	Update keyboards.py	2025-08-10 03:42:56 +03:00
Fr1ngg	5bd86d9cf7	Update config.py	2025-08-10 03:40:36 +03:00
Fr1ngg	00fd3fbadb	Update database.py	2025-08-10 03:39:51 +03:00
Fr1ngg	b806f40797	Update middlewares.py	2025-08-10 03:38:20 +03:00
Fr1ngg	c82aa1d253	Update main.py	2025-08-10 03:37:51 +03:00
Fr1ngg	071919f0db	Update remnawave_api.py	2025-08-10 03:36:51 +03:00
Fr1ngg	ab41e96ba5	Update subscription_monitor.py	2025-08-10 03:34:52 +03:00
Fr1ngg	95a470ba7b	Update admin_handlers.py	2025-08-10 03:32:41 +03:00
Fr1ngg	1e0653ed33	Update referral_utils.py	2025-08-10 03:27:15 +03:00
Fr1ngg	3f0df08031	Update handlers.py	2025-08-10 03:25:53 +03:00
Fr1ngg	8c3bc8a5ba	Update utils.py	2025-08-10 03:22:42 +03:00
Fr1ngg	3a5a8f48e4	Update README.md	2025-08-09 11:31:02 +03:00
Fr1ngg	f4b99ffb09	Rename logo.svg to logo2.svg	2025-08-09 11:30:57 +03:00
Fr1ngg	0c6afdebc3	Update README.md	2025-08-09 11:30:17 +03:00
Fr1ngg	98b382ba2f	Update logo.svg	2025-08-09 11:29:57 +03:00
Fr1ngg	54a24385b1	Update README.md	2025-08-09 08:54:57 +03:00
Fr1ngg	3eeb84cdae	Update README.md	2025-08-09 08:29:02 +03:00
Fr1ngg	204a10ae14	Update README.md	2025-08-09 08:26:02 +03:00
Fr1ngg	ba1dd7547e	Create logo.svg	2025-08-09 08:24:25 +03:00
Fr1ngg	238585c257	Update .gitignore	2025-08-09 08:24:02 +03:00
Fr1ngg	d8ebe1ad13	Add files via upload	2025-08-09 08:18:01 +03:00
Fr1ngg	819df3e93a	Create 1	2025-08-09 08:13:36 +03:00
Fr1ngg	99e46feafa	Delete screens/sub/1	2025-08-09 08:07:05 +03:00
Fr1ngg	a432c8ab54	Add files via upload	2025-08-09 08:06:52 +03:00
Fr1ngg	d740b7560c	Create 1	2025-08-09 08:06:17 +03:00
Fr1ngg	91c4c73d7e	Delete screens/Balance/1	2025-08-09 08:05:33 +03:00
Fr1ngg	4ce2384f27	Update handlers.py	2025-08-09 08:04:43 +03:00
Fr1ngg	02a6289d56	Add files via upload	2025-08-09 07:57:18 +03:00
Fr1ngg	52ae6eba81	Create 1	2025-08-09 07:55:29 +03:00
Fr1ngg	080b6e74a2	Add files via upload	2025-08-09 07:54:08 +03:00
Fr1ngg	ad7d32023c	Delete screens/Luckgame/1	2025-08-09 07:53:17 +03:00
Fr1ngg	1baf8fbe37	Add files via upload	2025-08-09 07:53:03 +03:00
Fr1ngg	758ca6a373	Create 1	2025-08-09 07:52:38 +03:00
Fr1ngg	65504d0a23	Delete screens/1	2025-08-09 07:50:15 +03:00
Fr1ngg	0409f4e2e2	Delete screens/Рефералы/1	2025-08-09 07:49:57 +03:00
Fr1ngg	8ca63e939a	Add files via upload	2025-08-09 07:49:38 +03:00
Fr1ngg	25a621fd51	Delete screens/Главное меню/1	2025-08-09 07:43:58 +03:00
Fr1ngg	3f71a8aff7	Rename Снимок экрана 2025-08-09 в 07.42.12.png to Mainmenu.png	2025-08-09 07:43:45 +03:00
Fr1ngg	6ec81c37b9	Add files via upload	2025-08-09 07:42:41 +03:00
Fr1ngg	8a9ff98da8	Create 1	2025-08-09 07:40:31 +03:00
Fr1ngg	bb7e29eeac	Create 1	2025-08-09 07:40:05 +03:00
Fr1ngg	27d8783104	Create 1	2025-08-09 07:39:34 +03:00
Fr1ngg	9a01e6db43	Create .gitignore	2025-08-09 07:37:50 +03:00
Fr1ngg	b341ddf9d9	Update README.md	2025-08-09 07:33:26 +03:00
Fr1ngg	3c8d0ac859	Update README.md	2025-08-09 07:33:03 +03:00
Fr1ngg	3f529c0dee	Update README.md	2025-08-09 07:19:13 +03:00