telegram_libs 0.1.26__tar.gz → 0.1.28__tar.gz

{telegram_libs-0.1.26 → telegram_libs-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: telegram_libs
-Version: 0.1.26
+Version: 0.1.28
 Summary: Common libraries for Telegram bots
 Author: Andrey Gritsaenko gricaenko.95a@gmail.com
 Requires-Python: >=3.11,<4.0

{telegram_libs-0.1.26 → telegram_libs-0.1.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "telegram_libs"
-version = "0.1.26"
+version = "0.1.28"
 description = "Common libraries for Telegram bots"
 authors = ["Andrey Gritsaenko gricaenko.95a@gmail.com"]
 readme = "README.md"

{telegram_libs-0.1.26 → telegram_libs-0.1.28}/src/telegram_libs/mongo.py

@@ -1,6 +1,9 @@
+from datetime import datetime
+from telegram import Update
 from pymongo.mongo_client import MongoClient
 from pymongo.server_api import ServerApi
-from telegram_libs.constants import MONGO_URI, DEBUG
+from telegram_libs.constants import MONGO_URI, DEBUG, SUBSCRIPTION_DB_NAME
+from telegram import Update
 
 
 class MongoManager:
@@ -18,6 +21,11 @@ class MongoManager:
         self.users_collection = self.db["users_test"] if DEBUG else self.db["users"]
         self.payments_collection = self.db["order_test"] if DEBUG else self.db["order"]
         self.user_schema = {"user_id": None, **(kwargs.get("user_schema") or {})}
+        self.subscription_collection = (
+            self.client[SUBSCRIPTION_DB_NAME]["subscriptions"]
+            if not DEBUG
+            else self.client[SUBSCRIPTION_DB_NAME]["subscriptions_test"]
+        )
 
     def create_user(self, user_id: int) -> None:
         """Create a new user in the database."""
@@ -57,4 +65,56 @@ class MongoManager:
         """Update an order for a user."""
         self.payments_collection.update_one(
             {"user_id": user_id, "order_id": order_id}, {"$set": updates}
-        )
+        )
+
+    def get_user_info(self, update: Update) -> dict:
+        """Get user information from the update object."""
+        user = update.effective_user
+        user_data = self.get_user_data(user.id)
+        
+        return {
+            "user_id": user.id,
+            "username": user.username,
+            "first_name": user.first_name,
+            "last_name": user.last_name,
+            "lang": user_data.get("language", "en"),
+            **user_data,
+        }
+
+    def get_subscription(self, user_id: int) -> dict:
+        """Get user's subscription data from the shared subscription database."""
+        subscription = self.subscription_collection.find_one({"user_id": user_id})
+        if not subscription:
+            return {"user_id": user_id, "is_premium": False}
+        return subscription
+
+    def update_subscription(self, user_id: int, updates: dict) -> None:
+        """Update user's subscription data in the shared subscription database."""
+        self.subscription_collection.update_one(
+            {"user_id": user_id}, {"$set": updates}, upsert=True
+        )
+
+    def add_subscription_payment(self, user_id: int, payment_data: dict) -> None:
+        """Add a subscription payment record."""
+        self.subscription_collection.update_one(
+            {"user_id": user_id},
+            {
+                "$push": {"payments": payment_data},
+                "$set": {
+                    "is_premium": True,
+                    "premium_expiration": payment_data["expiration_date"],
+                    "last_payment": payment_data["date"],
+                },
+            },
+            upsert=True,
+        )
+
+    def check_subscription_status(self, user_id: int) -> bool:
+        """Check if user has an active subscription."""
+        subscription = self.get_subscription(user_id)
+
+        if not subscription.get("is_premium"):
+            return False
+
+        expiration = datetime.fromisoformat(subscription["premium_expiration"])
+        return expiration > datetime.now()

{telegram_libs-0.1.26 → telegram_libs-0.1.28}/src/telegram_libs/payment.py

@@ -3,8 +3,6 @@ from logging import getLogger
 from telegram import Update
 from telegram.ext import ContextTypes
 from telegram_libs.translation import t
-from telegram_libs.subscription import add_subscription_payment
-from telegram_libs.utils import get_user_info
 from telegram_libs.mongo import MongoManager
 from telegram_libs.logger import BotLogger
 
@@ -36,7 +34,7 @@ async def precheckout_handler(update: Update, context: ContextTypes.DEFAULT_TYPE
 
 async def successful_payment(update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager, bot_logger: BotLogger) -> None:
     """Handle successful payments"""
-    user_info = get_user_info(update, mongo_manager)
+    user_info = mongo_manager.get_user_info(update)
     user_id = user_info["user_id"]
     lang = user_info["lang"]
     payment_info = update.message.successful_payment
@@ -72,7 +70,7 @@ async def successful_payment(update: Update, context: ContextTypes.DEFAULT_TYPE,
     current_time = datetime.now()
 
     # Add subscription payment to shared subscription database
-    add_subscription_payment(
+    mongo_manager.add_subscription_payment(
         user_id,
         {
             "order_id": payment_info.provider_payment_charge_id,

{telegram_libs-0.1.26 → telegram_libs-0.1.28}/src/telegram_libs/subscription.py

@@ -1,64 +1,12 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from telegram import Update, LabeledPrice, InlineKeyboardMarkup, InlineKeyboardButton
 from telegram.ext import ContextTypes
-from telegram_libs.constants import SUBSCRIPTION_DB_NAME, DEBUG, BOTS_AMOUNT
+from telegram_libs.constants import BOTS_AMOUNT, DEBUG
 from telegram_libs.mongo import MongoManager
-from telegram_libs.utils import get_user_info
 from telegram_libs.translation import t
 from telegram_libs.logger import BotLogger
 
 
-# Define the subscription database and collection
-mongo_manager_instance = MongoManager(mongo_database_name=SUBSCRIPTION_DB_NAME)
-subscription_collection = (
-    mongo_manager_instance.client[SUBSCRIPTION_DB_NAME]["subscriptions"]
-    if not DEBUG
-    else mongo_manager_instance.client[SUBSCRIPTION_DB_NAME]["subscriptions_test"]
-)
-
-
-def get_subscription(user_id: int) -> dict:
-    """Get user's subscription data from the shared subscription database."""
-    subscription = subscription_collection.find_one({"user_id": user_id})
-    if not subscription:
-        return {"user_id": user_id, "is_premium": False}
-    return subscription
-
-
-def update_subscription(user_id: int, updates: dict) -> None:
-    """Update user's subscription data in the shared subscription database."""
-    subscription_collection.update_one(
-        {"user_id": user_id}, {"$set": updates}, upsert=True
-    )
-
-
-def add_subscription_payment(user_id: int, payment_data: dict) -> None:
-    """Add a subscription payment record."""
-    subscription_collection.update_one(
-        {"user_id": user_id},
-        {
-            "$push": {"payments": payment_data},
-            "$set": {
-                "is_premium": True,
-                "premium_expiration": payment_data["expiration_date"],
-                "last_payment": payment_data["date"],
-            },
-        },
-        upsert=True,
-    )
-
-
-def check_subscription_status(user_id: int) -> bool:
-    """Check if user has an active subscription."""
-    subscription = get_subscription(user_id)
-
-    if not subscription.get("is_premium"):
-        return False
-
-    expiration = datetime.fromisoformat(subscription["premium_expiration"])
-    return expiration > datetime.now()
-
-
 async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboardMarkup:
     """Get subscription keyboard
 
@@ -149,7 +97,7 @@ async def subscribe_command(
     update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager, bot_logger: BotLogger
 ) -> None:
     """Show subscription options"""
-    user_info = get_user_info(update, mongo_manager)
+    user_info = mongo_manager.get_user_info(update)
     user_id = user_info["user_id"]
     lang = user_info["lang"]
     bot_name = context.bot.name
@@ -166,11 +114,11 @@ async def check_subscription_command(
     update: Update, context: ContextTypes.DEFAULT_TYPE, mongo_manager: MongoManager
 ):
     """Check user's subscription status"""
-    user_info = get_user_info(update, mongo_manager)
+    user_info = mongo_manager.get_user_info(update)
     user_id = user_info["user_id"]
     lang = user_info["lang"]
 
-    subscription = get_subscription(user_id)
+    subscription = mongo_manager.get_subscription(user_id)
     if subscription.get("is_premium"):
         expiration = datetime.fromisoformat(subscription["premium_expiration"])
         remaining = (expiration - datetime.now()).days
@@ -183,7 +131,7 @@ async def check_subscription_command(
                 )
             )
         else:
-            update_subscription(user_id, {"is_premium": False})
+            mongo_manager.update_subscription(user_id, {"is_premium": False})
             await update.message.reply_text(t("subscription.expired", lang))
     else:
         await update.message.reply_text(t("subscription.none", lang))

telegram_libs-0.1.28/src/telegram_libs/utils.py

@@ -0,0 +1,117 @@
+from logging import basicConfig, getLogger, INFO
+from datetime import datetime
+from telegram import (
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
+)
+from telegram import Update
+from telegram.ext import ContextTypes
+from telegram_libs.constants import BOTS, BOTS_AMOUNT
+from telegram_libs.translation import t
+from telegram_libs.mongo import MongoManager
+from telegram_libs.logger import BotLogger
+
+
+
+basicConfig(
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=INFO
+)
+logger = getLogger(__name__)
+
+
+async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboardMarkup:
+    """Get subscription keyboard
+
+    Args:
+        update (Update): Update object
+        lang (str): Language code
+
+    Returns:
+        InlineKeyboardMarkup: Inline keyboard markup
+    """
+    await update.message.reply_text(
+        t("subscription.info", lang, common=True).format(BOTS_AMOUNT - 1)
+    )
+    return [
+        [
+            InlineKeyboardButton(
+                t("subscription.plans.1month", lang, common=True), callback_data="sub_1month"
+            ),
+            InlineKeyboardButton(
+                t("subscription.plans.3months", lang, common=True), callback_data="sub_3months"
+            ),
+        ],
+        [
+            InlineKeyboardButton(
+                t("subscription.plans.1year", lang, common=True), callback_data="sub_1year"
+            ),
+        ],
+    ]
+    
+
+async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger) -> None:
+    user_id = update.effective_user.id
+    bot_name = context.bot.name
+    bot_logger.log_action(user_id, "more_bots_list_command", bot_name)
+    message = "Here is the list of all bots:\n\n"
+    bots_list  = "\n".join(
+        f"- <a href='{url}'>{name}</a>" for url, name in BOTS.items()
+    )
+    message += bots_list
+    await update.message.reply_text(message, disable_web_page_preview=True, parse_mode='HTML')
+    
+    
+class RateLimitManager:
+    """Rate limit manager to handle user rate limits."""
+    
+    def __init__(self, mongo_manager: MongoManager, rate_limit: int = 5):
+        self.mongo_manager = mongo_manager
+        self.rate_limit = rate_limit
+
+    def check_limit(self, user_id: int) -> tuple[bool, dict]:
+        """Check if user has exceeded the daily rate limit."""
+        # Get today's date and reset time to midnight
+        today = datetime.now().date()
+
+        # If last action date is not today, reset the counter
+        user_data = self.mongo_manager.get_user_data(user_id)
+        last_action_date_str = user_data.get("last_action_date")
+        if last_action_date_str:
+            last_action_date = datetime.fromisoformat(last_action_date_str).date()
+            if last_action_date != today:
+                self.mongo_manager.update_user_data(
+                    user_id,
+                    {
+                        "actions_today": 0,
+                        "last_action_date": datetime.now().isoformat(),
+                    },
+                )
+                return True, user_data
+
+        # Check if user has exceeded the limit
+        actions_today = user_data.get("actions_today", 0)
+        if actions_today >= self.rate_limit:
+            return False, user_data
+
+        return True, user_data
+    
+    def check_and_increment(self, user_id: int) -> bool:
+        """Check if user can perform an action and increment the count if allowed."""
+        if self.mongo_manager.check_subscription_status(user_id):
+            return True
+
+        can_perform, user_data = self.check_limit(user_id)
+        if can_perform:
+            self.increment_action_count(user_id, user_data)
+            return True
+        return False
+
+    def increment_action_count(self, user_id: int, user_data: dict = None) -> None:
+        """Increment the daily action count for the user."""
+        if user_data is None:
+            user_data = self.mongo_manager.get_user_data(user_id)
+        current_actions = user_data.get("actions_today", 0)
+        self.mongo_manager.update_user_data(
+            user_id,
+            {"actions_today": current_actions + 1, "last_action_date": datetime.now().isoformat()},
+        )

telegram_libs-0.1.26/src/telegram_libs/utils.py

@@ -1,74 +0,0 @@
-from logging import basicConfig, getLogger, INFO
-from telegram import (
-    InlineKeyboardButton,
-    InlineKeyboardMarkup,
-)
-from telegram import Update
-from telegram.ext import ContextTypes
-from telegram_libs.constants import BOTS, BOTS_AMOUNT
-from telegram_libs.translation import t
-from telegram_libs.mongo import MongoManager
-from telegram_libs.logger import BotLogger
-
-
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=INFO
-)
-logger = getLogger(__name__)
-
-
-async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboardMarkup:
-    """Get subscription keyboard
-
-    Args:
-        update (Update): Update object
-        lang (str): Language code
-
-    Returns:
-        InlineKeyboardMarkup: Inline keyboard markup
-    """
-    await update.message.reply_text(
-        t("subscription.info", lang, common=True).format(BOTS_AMOUNT - 1)
-    )
-    return [
-        [
-            InlineKeyboardButton(
-                t("subscription.plans.1month", lang, common=True), callback_data="sub_1month"
-            ),
-            InlineKeyboardButton(
-                t("subscription.plans.3months", lang, common=True), callback_data="sub_3months"
-            ),
-        ],
-        [
-            InlineKeyboardButton(
-                t("subscription.plans.1year", lang, common=True), callback_data="sub_1year"
-            ),
-        ],
-    ]
-    
-
-async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_logger: BotLogger) -> None:
-    user_id = update.effective_user.id
-    bot_name = context.bot.name
-    bot_logger.log_action(user_id, "more_bots_list_command", bot_name)
-    message = "Here is the list of all bots:\n\n"
-    bots_list  = "\n".join(
-        f"- <a href='{url}'>{name}</a>" for url, name in BOTS.items()
-    )
-    message += bots_list
-    await update.message.reply_text(message, disable_web_page_preview=True, parse_mode='HTML')
-    
-    
-def get_user_info(update: Update, mongo_manager: MongoManager) -> dict:
-    """Get user information from the update object."""
-    user = update.effective_user
-    user_data = mongo_manager.get_user_data(user.id)
-    
-    return {
-        "user_id": user.id,
-        "username": user.username,
-        "first_name": user.first_name,
-        "last_name": user.last_name,
-        "lang": user_data.get("language", "en"),
-        **user_data,
-    }