telegram_libs 0.1.26__py3-none-any.whl → 0.1.27__py3-none-any.whl

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/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/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/utils.py

@@ -1,4 +1,5 @@
 from logging import basicConfig, getLogger, INFO
+from datetime import datetime
 from telegram import (
     InlineKeyboardButton,
     InlineKeyboardMarkup,
@@ -11,6 +12,7 @@ from telegram_libs.mongo import MongoManager
 from telegram_libs.logger import BotLogger
 
 
+
 basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=INFO
 )
@@ -59,16 +61,49 @@ async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_T
     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)
+class RateLimitManager:
+    """Rate limit manager to handle user rate limits."""
     
-    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 __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) -> bool:
+        """Check if user has exceeded the daily rate limit."""
+        # Premium users have no limits
+        if self.mongo_manager.check_subscription_status(user_id):
+            return True
+
+        # 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
+
+        # Check if user has exceeded the limit
+        actions_today = user_data.get("actions_today", 0)
+        if actions_today >= self.rate_limit:
+            return False
+
+        return True
+
+    def increment_action_count(self, user_id: int) -> None:
+        """Increment the daily action count for the user."""
+        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.dist-info → telegram_libs-0.1.27.dist-info}/METADATA

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

{telegram_libs-0.1.26.dist-info → telegram_libs-0.1.27.dist-info}/RECORD

@@ -5,13 +5,13 @@ telegram_libs/handlers.py,sha256=d5-4FvjyWcJeN1i3dHTYhF-2P4j7PbM1QElloFR_llg,241
 telegram_libs/locales/en.json,sha256=4VVkME7lCKW6ZjkopaoA6Uq3DLbEVkWacGei3GNSXFM,843
 telegram_libs/locales/ru.json,sha256=LYI6rAlwdNLaTGgkrALn31Lt7jC3SZteei8P_i7ZpQI,1208
 telegram_libs/logger.py,sha256=oikvkZMk2kOLvQI9hVMUGMCoSnOPf_fhMvv2SbO-STo,891
-telegram_libs/mongo.py,sha256=MmnW7wgdZNz4jyhjYSx_CLsLasdiXt2tGenOFhTTVTw,2450
-telegram_libs/payment.py,sha256=PSoagCTUt4xad-39kVYc2tcFgaPMQsP9eplCVqI9hnc,3661
-telegram_libs/subscription.py,sha256=PFgoWKgjRrjzBjK-AMrESt_7aFk0pa8Qr_Wl1aQIoW8,6430
+telegram_libs/mongo.py,sha256=j1UIGnldvaNZaFPltCvEUcUOOCoquBWvqPh7Q2HTrvY,4776
+telegram_libs/payment.py,sha256=cNb2vnBlYI_6KnTGz-PCM0uKahW2uGjHVn1mGYlYG-4,3564
+telegram_libs/subscription.py,sha256=NJlh1kcDfasX1XLpkVfe1UbZslpWSC1hXHaum0kfG8A,4693
 telegram_libs/support.py,sha256=a3BA7g3seVBUMasv65SzxebLayLigA069wvDcStYbCM,2748
 telegram_libs/translation.py,sha256=8Kb2cgqKKZH4X_i2Le0V_K1imZdoaCzYAca831DOBig,2049
-telegram_libs/utils.py,sha256=9TzQt6PD_BAO5uHoYpReIM5mNeW0AcEHe-bihmIueEk,2382
-telegram_libs-0.1.26.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
-telegram_libs-0.1.26.dist-info/METADATA,sha256=6X8P4fgGRmKwXnsql_J_-hUXY4SJEAoLTWX_LyVUb2Q,804
-telegram_libs-0.1.26.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-telegram_libs-0.1.26.dist-info/RECORD,,
+telegram_libs/utils.py,sha256=YnxeZFBLEb95swNlER6Vulv3-TXXVgUTGmzpYUROVY0,3796
+telegram_libs-0.1.27.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
+telegram_libs-0.1.27.dist-info/METADATA,sha256=DhniNOJ1-RW0DhJNn2QvH6lWL0tH56SvRNMrJPVUbOw,804
+telegram_libs-0.1.27.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+telegram_libs-0.1.27.dist-info/RECORD,,