telegram_libs 0.1.11__tar.gz → 0.1.13__tar.gz

{telegram_libs-0.1.11 → telegram_libs-0.1.13}/PKG-INFO

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

{telegram_libs-0.1.11 → telegram_libs-0.1.13}/pyproject.toml

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

{telegram_libs-0.1.11 → telegram_libs-0.1.13}/src/telegram_libs/__init__.py

@@ -2,4 +2,4 @@
 Telegram Libs - Common libraries for Telegram bots
 """
 
-__version__ = "0.1.11"
+__version__ = "0.1.13"

{telegram_libs-0.1.11 → telegram_libs-0.1.13}/src/telegram_libs/utils.py

@@ -1,13 +1,24 @@
+from functools import partial
+from logging import basicConfig, getLogger, INFO
+from datetime import datetime
 from telegram import (
     InlineKeyboardButton,
     InlineKeyboardMarkup,
 )
 from telegram import Update
 from telegram.ext import ContextTypes, Application, CommandHandler, MessageHandler, filters
+from telegram.ext.filters import BaseFilter
 from telegram_libs.constants import BOTS_AMOUNT
 from telegram_libs.translation import t
 from telegram_libs.mongo import mongo_client
-from functools import partial
+
+
+
+basicConfig(
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=INFO
+)
+logger = getLogger(__name__)
+
 
 FEEDBACK_WAITING = "feedback_waiting"
 SUPPORT_WAITING = "support_waiting"
@@ -54,7 +65,7 @@ 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')
     
 
-async def support_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+async def handle_support_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     """Support command handler"""
     await update.message.reply_text(
         t("support.message", update.effective_user.language_code, common=True)
@@ -62,55 +73,59 @@ async def support_command(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
     context.user_data[SUPPORT_WAITING] = True
     
 
-async def handle_support_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str) -> None:
-    """Handle user's support message"""
-    if context.user_data.get(SUPPORT_WAITING):
-        support_db = mongo_client["support"]
-        support_collection = support_db["support"]
-        support_doc = {
-            "user_id": update.effective_user.id,
-            "username": update.effective_user.username,
-            "message": update.message.text,
-            "bot_name": bot_name,
-            "timestamp": update.message.date.isoformat(),
-            "resolved": False,
-        }
-        support_collection.insert_one(support_doc)
-        await update.message.reply_text(t("support.response", update.effective_user.language_code, common=True))
-        context.user_data[SUPPORT_WAITING] = False
-    
+async def _handle_user_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str) -> None:
+    """Handle user's support or feedback message"""
+    if context.user_data.get(FEEDBACK_WAITING):
+        db_name = "feedback"
+        collection_name = "feedback"
+        message_key = "feedback.response"
+        doc_field_name = "feedback"
+        context_key = FEEDBACK_WAITING
+        extra_fields = {}
+    elif context.user_data.get(SUPPORT_WAITING):
+        db_name = "support"
+        collection_name = "support"
+        message_key = "support.response"
+        doc_field_name = "message"
+        context_key = SUPPORT_WAITING
+        extra_fields = {"resolved": False}
+    else:
+        # Should not happen if filter is correct
+        return
 
-async def feedback_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    db = mongo_client[db_name]
+    collection = db[collection_name]
+    doc = {
+        "user_id": update.effective_user.id,
+        "username": update.effective_user.username,
+        doc_field_name: update.message.text,
+        "bot_name": bot_name,
+        "timestamp": datetime.now().isoformat(),
+    }
+    doc.update(extra_fields)
+    collection.insert_one(doc)
+    await update.message.reply_text(t(message_key, update.effective_user.language_code, common=True))
+    context.user_data[context_key] = False
+
+
+async def handle_feedback_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     """Feedback command handler"""
     await update.message.reply_text(
         t("feedback.message", update.effective_user.language_code, common=True)
     )
     context.user_data[FEEDBACK_WAITING] = True
- 
-    
-async def handle_feedback_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str) -> None:
-    """Handle user's feedback message"""
-    if context.user_data.get(FEEDBACK_WAITING):
-        feedback_db = mongo_client["feedback"]
-        feedback_collection = feedback_db["feedback"]
-        feedback_doc = {
-            "user_id": update.effective_user.id,
-            "username": update.effective_user.username,
-            "feedback": update.message.text,
-            "bot_name": bot_name,
-            "timestamp": update.message.date.isoformat(),
-        }
-        feedback_collection.insert_one(feedback_doc)
-        await update.message.reply_text(t("feedback.response", update.effective_user.language_code, common=True))
-        context.user_data[FEEDBACK_WAITING] = False
-        
-        
+
+
+class CombinedFeedbackSupportFilter(BaseFilter):
+    def __call__(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> bool:
+        return context.user_data.get(FEEDBACK_WAITING, False) or context.user_data.get(SUPPORT_WAITING, False)
+
+
 def register_feedback_and_support_handlers(app: Application, bot_name: str) -> None:
     """Register feedback and support handlers for the bot"""
-    app.add_handler(CommandHandler("feedback", feedback_command))
-    app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, partial(handle_feedback_response, bot_name=bot_name)))
-    app.add_handler(CommandHandler("support", support_command))
-    app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, partial(handle_support_response, bot_name=bot_name)))
+    app.add_handler(CommandHandler("feedback", handle_feedback_command))
+    app.add_handler(CommandHandler("support", handle_support_command))
+    app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND & CombinedFeedbackSupportFilter(), partial(_handle_user_response, bot_name=bot_name)))
 
 
 def register_common_handlers(app: Application, bot_name: str) -> None: