Merge pull request #5 from progeroffline/developing

Move private channels to close functionality section

src/bot/handlers/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from .channels_join_requests import *
+from .close_functionality import *
 from .payment import *
 from .start import *

src/bot/handlers/close_functionality.py

@@ -0,0 +1,12 @@
+from aiogram import types
+from filters import UserSubscribedFilter
+from keyboards import inline as inline_keyboard
+from loader import dp
+
+
+@dp.message_handler(UserSubscribedFilter(), text='Show close functionality')
+async def show_private_channels(message: types.Message):
+    await message.answer(
+        text='You can subscribe to closed channels.',
+        reply_markup=await inline_keyboard.channels(),
+    )

src/bot/handlers/payment.py

@@ -6,7 +6,6 @@
                          USDT_TRC20_WALLET_ADDRESS)
 from database import transactions
 from filters.user_not_subscribed import UserNotSubscribedFilter
-from keyboards import inline as inline_keyboards
 from keyboards import reply as reply_keyboards
 from loader import dp
 from statesgroup import GetTxidFromUser
@@ -42,7 +41,6 @@ async def check_transaction(message: types.Message, state: FSMContext):
         await message.answer(
             text='Great, wait for the end of the transaction, '
                  'and I will notify you when the subscription is charged.',
-            reply_markup=await inline_keyboards.channels(),
         )
     else:
         await message.answer(

src/bot/utils/subscription_checker.py

@@ -9,16 +9,16 @@
 
 
 async def task(bot: 'aiogram.Bot'):
-   records = await transactions.get_new()
-   for record in records:
-      if await tronscan_service.check_transaction_for_correct_data(record.txid):
-         await transactions.set_status(True, database_id=record.id)
-         await users.set_days_sub_end(
-            count_days=NUMBER_DAYS_FROM_ONE_PAYMENT,
-            telegram_id=record.owner_telegram_id,
-         ) 
-
-         await bot.send_message(
-            chat_id=record.owner_telegram_id,
-            text='Congratulations, you now have access to limited functionality.'
+    records = await transactions.get_new()
+    for record in records:
+        if await tronscan_service.check_transaction_for_correct_data(record.txid):
+            await transactions.set_status(True, database_id=record.id)
+            await users.set_days_sub_end(
+                count_days=NUMBER_DAYS_FROM_ONE_PAYMENT,
+                telegram_id=record.owner_telegram_id,
+            ) 
+            await bot.send_message(
+                chat_id=record.owner_telegram_id,
+                text='Congratulations, you now have access to limited functionality.'
+            )