telegram_libs 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

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/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/locales/ru.json

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

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

@@ -1,15 +1,14 @@
-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 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(
@@ -18,10 +17,6 @@ basicConfig(
 logger = getLogger(__name__)
 
 
-FEEDBACK_WAITING = "feedback_waiting"
-SUPPORT_WAITING = "support_waiting"
-
-
 async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboardMarkup:
     """Get subscription keyboard
 
@@ -53,7 +48,9 @@ async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboard
     
 
 async def more_bots_list_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    message = """Here is the list of all bots: \n\n
+    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>
@@ -63,66 +60,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:
-    """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)
+    register_support_handlers(app, bot_name)

{telegram_libs-0.1.12.dist-info → telegram_libs-0.1.14.dist-info}/METADATA

@@ -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.14.dist-info/RECORD

@@ -0,0 +1,13 @@
+telegram_libs/__init__.py,sha256=tHt37nTBhFUaP1SwstK9uimoxDRg5wuoGaq9AxuGM5k,82
+telegram_libs/constants.py,sha256=F6pgwAuv2FgGZxxFwYYJomM4_hosexLoYsvHXQiuVNg,538
+telegram_libs/locales/en.json,sha256=TDueYazTaytYCs8_6Z7-HeulGyqz5ze3Cm4mXYKFX8Q,549
+telegram_libs/locales/ru.json,sha256=bHIuq9MFIhqIEvbf5j5HM1E9egtsjrTTIx50s6C9PpY,785
+telegram_libs/mongo.py,sha256=7UOy_cE0ofIbH7QiiirAjOgo_FM9JImtgxQ8ouEsFeo,245
+telegram_libs/subscription.py,sha256=d7xmzplUrm1nNlWlkqW6dddOYa3t_7PAM3iPme0K5F0,1690
+telegram_libs/support_handlers.py,sha256=T0ukR2gak0XknkA5RZ8Kjd1KeZAxH1BftQNg6bub5kw,2165
+telegram_libs/translation.py,sha256=8Kb2cgqKKZH4X_i2Le0V_K1imZdoaCzYAca831DOBig,2049
+telegram_libs/utils.py,sha256=Cqm0tnQHNr1e3xC94ZRZ162ee7CYX7eaIyfddCULfYE,2276
+telegram_libs-0.1.14.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
+telegram_libs-0.1.14.dist-info/METADATA,sha256=9ee1xhzQfFi0vrwWogt62d-pBuM6b_1SIiZoPrl8-uw,804
+telegram_libs-0.1.14.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+telegram_libs-0.1.14.dist-info/RECORD,,

telegram_libs-0.1.12.dist-info/RECORD

@@ -1,12 +0,0 @@
-telegram_libs/__init__.py,sha256=Goxb5nZfiXVHZrzSy70a7AtGf3AiUSDJhBWl57NR_g4,82
-telegram_libs/constants.py,sha256=F6pgwAuv2FgGZxxFwYYJomM4_hosexLoYsvHXQiuVNg,538
-telegram_libs/locales/en.json,sha256=kMGNE9ThGbaKH3PwappBGkWRgTupPETTG46zCMU5myk,749
-telegram_libs/locales/ru.json,sha256=lShsh98seaHRtanmq1IRv8_bgRLieTaq-jHjaoOwS0M,1134
-telegram_libs/mongo.py,sha256=7UOy_cE0ofIbH7QiiirAjOgo_FM9JImtgxQ8ouEsFeo,245
-telegram_libs/subscription.py,sha256=d7xmzplUrm1nNlWlkqW6dddOYa3t_7PAM3iPme0K5F0,1690
-telegram_libs/translation.py,sha256=8Kb2cgqKKZH4X_i2Le0V_K1imZdoaCzYAca831DOBig,2049
-telegram_libs/utils.py,sha256=qHxOZ0KfrSKsFDhlpKLjGKDInTBXHmjtPxTHTFkCplE,5125
-telegram_libs-0.1.12.dist-info/LICENSE,sha256=ZXkWPZbCc61L29Gz6ZHPwn1c4Pm0TnfIqtx8jGWi9F4,1069
-telegram_libs-0.1.12.dist-info/METADATA,sha256=8PtxVYaFnAwBi2XFIXu8I2MjTg_6Gq_jmgZS-Q_tI2g,804
-telegram_libs-0.1.12.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-telegram_libs-0.1.12.dist-info/RECORD,,