telegram_libs 0.1.12__tar.gz → 0.1.14__tar.gz

{telegram_libs-0.1.12 → telegram_libs-0.1.14}/PKG-INFO

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

{telegram_libs-0.1.12 → telegram_libs-0.1.14}/pyproject.toml

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

{telegram_libs-0.1.12 → telegram_libs-0.1.14}/src/telegram_libs/__init__.py

@@ -2,4 +2,4 @@
 Telegram Libs - Common libraries for Telegram bots
 """
 
-__version__ = "0.1.12"
+__version__ = "0.1.14"

{telegram_libs-0.1.12 → telegram_libs-0.1.14}/src/telegram_libs/locales/en.json

@@ -9,11 +9,7 @@
     "info": "Buying a subscription you will get unlimited access to other {0} bots, to see all bots click /more"
   },
   "support": {
-    "message": "If you have any questions or need help, please write it now and we will solve your issue as soon as possible.",
+    "message": "Write down any questions, issues or suggestions you have, and we will resolve them as soon as possible 👇 ",
     "response": "Thank you! Our support team will contact you soon."
-  },
-  "feedback": {
-    "message": "We appreciate your feedback! Please send your suggestions or issues and we will review them as soon as possible.",
-    "response": "Thank you for your feedback!"
   }
 }

{telegram_libs-0.1.12 → telegram_libs-0.1.14}/src/telegram_libs/locales/ru.json

@@ -9,11 +9,7 @@
     "info": "Купив подписку, вы получите неограниченный доступ к другим {0} ботам, чтобы увидеть всех ботов, нажмите /more"
   },
   "support": {
-    "message": "Если у вас есть вопросы или нужна помощь, пожалуйста, напишите сейчас, и мы решим вашу проблему как можно скорее.",
+    "message": "Напишите любые вопросы, проблемы, или предложения и мы решим их как можно скорее 👇 ",
     "response": "Спасибо! Наша служба поддержки свяжется с вами в ближайшее время."
-  },
-  "feedback": {
-    "message": "Мы ценим ваш отзыв! Пожалуйста, присылайте ваши предложения или проблемы, и мы рассмотрим их как можно скорее.",
-    "response": "Спасибо за ваш отзыв!"
   }
 }

telegram_libs-0.1.14/src/telegram_libs/support_handlers.py

@@ -0,0 +1,57 @@
+from functools import partial
+from datetime import datetime
+from telegram import Update
+from telegram.ext import ContextTypes, Application, CommandHandler, MessageHandler, filters
+from telegram.ext.filters import BaseFilter
+from telegram_libs.mongo import mongo_client
+from telegram_libs.translation import t
+
+
+SUPPORT_WAITING = "support_waiting"
+
+
+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)
+    )
+    context.user_data[SUPPORT_WAITING] = True
+    
+
+async def _handle_user_response(update: Update, context: ContextTypes.DEFAULT_TYPE, bot_name: str) -> None:
+    """Handle user's support message"""
+    if 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
+
+    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
+
+
+class SupportFilter(BaseFilter):
+    def __call__(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> bool:
+        return context.user_data.get(SUPPORT_WAITING, False)
+
+
+def register_support_handlers(app: Application, bot_name: str) -> None:
+    """Register support handlers for the bot"""
+    app.add_handler(CommandHandler("support", handle_support_command))
+    app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND & SupportFilter(), partial(_handle_user_response, bot_name=bot_name))) 

telegram_libs-0.1.14/src/telegram_libs/utils.py

@@ -0,0 +1,66 @@
+from logging import basicConfig, getLogger, INFO
+from telegram import (
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
+)
+from telegram import Update
+from telegram.ext import ContextTypes, Application, CommandHandler
+from telegram_libs.constants import BOTS_AMOUNT
+from telegram_libs.translation import t
+from telegram_libs.mongo import mongo_client
+from telegram_libs.support_handlers import register_support_handlers
+
+
+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(int(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) -> None:
+    message = """Here is the list of all bots: 
+
+
+    - <a href="https://t.me/MagMediaBot">Remove Background</a>
+    - <a href="https://t.me/UpscaleImageGBot">Upscale Image</a>
+    - <a href="https://t.me/GenerateBackgroundGBot">Generate a Background</a>
+    - <a href="https://t.me/kudapoyti_go_bot">Recommend a place to visit</a>
+    - <a href="https://t.me/TryOnOutfitGBot">Try On Outfit</a>
+    """
+    await update.message.reply_text(message, disable_web_page_preview=True, parse_mode='HTML')
+    
+
+def register_common_handlers(app: Application, bot_name: str) -> None:
+    """Register common handlers for the bot"""
+    app.add_handler(CommandHandler("more", more_bots_list_command))
+    register_support_handlers(app, bot_name)

telegram_libs-0.1.12/src/telegram_libs/utils.py

@@ -1,128 +0,0 @@
-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_libs.constants import BOTS_AMOUNT
-from telegram_libs.translation import t
-from telegram_libs.mongo import mongo_client
-
-
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=INFO
-)
-logger = getLogger(__name__)
-
-
-FEEDBACK_WAITING = "feedback_waiting"
-SUPPORT_WAITING = "support_waiting"
-
-
-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(int(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) -> None:
-    message = """Here is the list of all bots: \n\n
-    - <a href="https://t.me/MagMediaBot">Remove Background</a>
-    - <a href="https://t.me/UpscaleImageGBot">Upscale Image</a>
-    - <a href="https://t.me/GenerateBackgroundGBot">Generate a Background</a>
-    - <a href="https://t.me/kudapoyti_go_bot">Recommend a place to visit</a>
-    - <a href="https://t.me/TryOnOutfitGBot">Try On Outfit</a>
-    """
-    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:
-    """Support command handler"""
-    await update.message.reply_text(
-        t("support.message", update.effective_user.language_code, common=True)
-    )
-    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": datetime.now().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 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": datetime.now().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
-        
-        
-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)))
-
-
-def register_common_handlers(app: Application, bot_name: str) -> None:
-    """Register common handlers for the bot"""
-    app.add_handler(CommandHandler("more", more_bots_list_command))
-    register_feedback_and_support_handlers(app, bot_name)