From 2d0e6b95a7663d0c17898608f189fc02fe688ae7 Mon Sep 17 00:00:00 2001 From: me Date: Tue, 27 Jan 2026 16:14:48 +0300 Subject: [PATCH] upd --- main.py | 211 ++++++++++++++++++++++++++++++++++------------- requirements.txt | 2 + 2 files changed, 156 insertions(+), 57 deletions(-) diff --git a/main.py b/main.py index 37758f4..aa57f5b 100644 --- a/main.py +++ b/main.py @@ -2,10 +2,12 @@ import os import logging import subprocess import email +import tempfile +import html2text from email import policy from email.parser import BytesParser -from telegram import Update -from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes +from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup +from telegram.ext import Application, CommandHandler, MessageHandler, CallbackQueryHandler, filters, ContextTypes # Enable logging logging.basicConfig( @@ -30,32 +32,59 @@ def check_authorization(update: Update) -> bool: async def start(update: Update, context: ContextTypes.DEFAULT_TYPE): """Send a message when the command /start is issued.""" + keyboard = [ + [InlineKeyboardButton("šŸ“¬ Check Mail", callback_data="checkmail")], + [InlineKeyboardButton("ā“ Help", callback_data="help")] + ] + reply_markup = InlineKeyboardMarkup(keyboard) + await update.message.reply_text( - 'Hi! I am Fymious Bot. Send me any message and I will echo it back!\n\n' - 'Available commands:\n' - '/start - Start the bot\n' - '/help - Show help message\n' - '/checkmail - List new emails\n' - '/readmail - Read a specific email' + 'Hi! I am Fymious Bot šŸ¤–\n\n' + 'Use the buttons below to check your emails!', + reply_markup=reply_markup ) async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): """Send a message when the command /help is issued.""" - await update.message.reply_text( + query = update.callback_query + if query: + await query.answer() + message = query.message + else: + message = update.message + + keyboard = [[InlineKeyboardButton("šŸ“¬ Check Mail", callback_data="checkmail")]] + reply_markup = InlineKeyboardMarkup(keyboard) + + help_text = ( 'Available commands:\n' '/start - Start the bot\n' '/help - Show this help message\n' '/checkmail - List new emails in your mailbox\n' - '/readmail - Read a specific email (e.g., /readmail 1)\n' - '\nJust send me any text and I will echo it back!' + '/readmail - Read a specific email\n\n' + 'Or just use the buttons below!' ) + + if query: + await query.edit_message_text(help_text, reply_markup=reply_markup) + else: + await message.reply_text(help_text, reply_markup=reply_markup) async def check_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): """Check for new emails in the mailserver.""" + query = update.callback_query + if query: + await query.answer() + message = query.message + user = query.from_user + else: + message = update.message + user = update.effective_user + # Check authorization if not check_authorization(update): - await update.message.reply_text("āŒ You are not authorized to use this command.") - logger.warning(f"Unauthorized access attempt by user {update.effective_user.id}") + await message.reply_text("āŒ You are not authorized to use this command.") + logger.warning(f"Unauthorized access attempt by user {user.id}") return try: @@ -68,7 +97,7 @@ async def check_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): ) if result.returncode != 0: - await update.message.reply_text( + await message.reply_text( f"āŒ Error checking mail:\n`{result.stderr}`", parse_mode='Markdown' ) @@ -79,71 +108,97 @@ async def check_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): emails = [e.strip().strip("'") for e in emails if e.strip()] if not emails or emails == ['']: - await update.message.reply_text("šŸ“­ No new emails!") - # Clear stored emails + keyboard = [[InlineKeyboardButton("šŸ”„ Refresh", callback_data="checkmail")]] + reply_markup = InlineKeyboardMarkup(keyboard) + await message.reply_text("šŸ“­ No new emails!", reply_markup=reply_markup) context.user_data['emails'] = [] return - # Store email list in user context for readmail command + # Store email list in user context context.user_data['emails'] = emails # Format the response response = f"šŸ“¬ You have {len(emails)} new email(s):\n\n" for i, email_file in enumerate(emails, 1): - # Parse email filename to extract info parts = email_file.split(',') - timestamp_part = parts[0] if parts else email_file size_part = parts[1] if len(parts) > 1 else "" - # Extract size in bytes - size_bytes = "" if size_part.startswith('S='): - size_bytes = size_part[2:] try: - size_kb = int(size_bytes) / 1024 + size_kb = int(size_part[2:]) / 1024 size_str = f"{size_kb:.1f} KB" except ValueError: - size_str = size_bytes + " bytes" + size_str = "?" else: - size_str = "unknown size" + size_str = "?" - response += f"{i}. {timestamp_part} ({size_str})\n" + response += f"{i}. Email ({size_str})\n" - response += f"\nšŸ’” Use /readmail to read an email" - await update.message.reply_text(response) + # Create inline keyboard with buttons for each email + keyboard = [] + # Add buttons in rows of 2 + for i in range(1, len(emails) + 1, 2): + row = [InlineKeyboardButton(f"šŸ“§ #{i}", callback_data=f"read_{i}")] + if i + 1 <= len(emails): + row.append(InlineKeyboardButton(f"šŸ“§ #{i+1}", callback_data=f"read_{i+1}")) + keyboard.append(row) + + # Add refresh button + keyboard.append([InlineKeyboardButton("šŸ”„ Refresh", callback_data="checkmail")]) + + reply_markup = InlineKeyboardMarkup(keyboard) + + if query: + await query.edit_message_text(response, reply_markup=reply_markup) + else: + await message.reply_text(response, reply_markup=reply_markup) except subprocess.TimeoutExpired: - await update.message.reply_text("āŒ Command timed out. Mail server might be slow.") + await message.reply_text("āŒ Command timed out. Mail server might be slow.") except FileNotFoundError: - await update.message.reply_text("āŒ Docker command not found. Is Docker installed?") + await message.reply_text("āŒ Docker command not found. Is Docker installed?") except Exception as e: logger.error(f"Error checking mail: {e}") - await update.message.reply_text(f"āŒ An error occurred: {str(e)}") + await message.reply_text(f"āŒ An error occurred: {str(e)}") -async def read_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): +async def read_mail_handler(update: Update, context: ContextTypes.DEFAULT_TYPE, email_num: int = None): """Read a specific email by number.""" + query = update.callback_query + if query: + await query.answer() + message = query.message + user = query.from_user + else: + message = update.message + user = update.effective_user + # Check authorization if not check_authorization(update): - await update.message.reply_text("āŒ You are not authorized to use this command.") - logger.warning(f"Unauthorized access attempt by user {update.effective_user.id}") + await message.reply_text("āŒ You are not authorized to use this command.") + logger.warning(f"Unauthorized access attempt by user {user.id}") return # Check if user has checked mail first if 'emails' not in context.user_data or not context.user_data['emails']: - await update.message.reply_text("šŸ“­ Please use /checkmail first to see available emails.") + await message.reply_text("šŸ“­ Please use /checkmail first to see available emails.") return - # Parse email number from command - if not context.args: - await update.message.reply_text("āŒ Please specify an email number. Usage: /readmail 1") - return + # Get email number from callback or command args + if email_num is None: + if not context.args: + await message.reply_text("āŒ Please specify an email number. Usage: /readmail 1") + return + try: + email_num = int(context.args[0]) + except ValueError: + await message.reply_text("āŒ Invalid email number. Please provide a number.") + return try: - email_num = int(context.args[0]) emails = context.user_data['emails'] if email_num < 1 or email_num > len(emails): - await update.message.reply_text(f"āŒ Invalid email number. Please choose between 1 and {len(emails)}") + await message.reply_text(f"āŒ Invalid email number. Please choose between 1 and {len(emails)}") return # Get the email filename (array is 0-indexed) @@ -158,7 +213,7 @@ async def read_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): ) if result.returncode != 0: - await update.message.reply_text(f"āŒ Error reading email:\n`{result.stderr.decode()}`", parse_mode='Markdown') + await message.reply_text(f"āŒ Error reading email:\n`{result.stderr.decode()}`", parse_mode='Markdown') return # Parse email @@ -170,46 +225,87 @@ async def read_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): to_addr = msg.get('To', 'Unknown') date = msg.get('Date', 'Unknown') - # Get email body + # Get email body - handle both plain text and HTML body = "" + html_body = "" + if msg.is_multipart(): for part in msg.walk(): content_type = part.get_content_type() - if content_type == "text/plain": + if content_type == "text/plain" and not body: try: body = part.get_content() - break + except: + pass + elif content_type == "text/html" and not html_body: + try: + html_body = part.get_content() except: pass else: try: - body = msg.get_content() + content_type = msg.get_content_type() + if content_type == "text/html": + html_body = msg.get_content() + else: + body = msg.get_content() except: body = "Could not extract email body" + # If we have HTML but no plain text, convert HTML to text + if html_body and not body: + h = html2text.HTML2Text() + h.ignore_links = False + h.ignore_images = True + h.ignore_emphasis = False + body = h.handle(html_body) + # Truncate body if too long (Telegram has message length limits) max_body_length = 3000 if len(body) > max_body_length: body = body[:max_body_length] + "\n\n... (truncated)" # Format response - response = f"šŸ“§ **Email #{email_num}**\n\n" - response += f"**From:** {from_addr}\n" - response += f"**To:** {to_addr}\n" - response += f"**Date:** {date}\n" - response += f"**Subject:** {subject}\n" + response = f"šŸ“§ *Email #{email_num}*\n\n" + response += f"*From:* {from_addr}\n" + response += f"*To:* {to_addr}\n" + response += f"*Date:* {date}\n" + response += f"*Subject:* {subject}\n" response += f"\nā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”ā”\n\n" response += body - await update.message.reply_text(response, parse_mode='Markdown') + # Add back button + keyboard = [[InlineKeyboardButton("ā¬…ļø Back to List", callback_data="checkmail")]] + reply_markup = InlineKeyboardMarkup(keyboard) + + if query: + await query.edit_message_text(response, parse_mode='Markdown', reply_markup=reply_markup) + else: + await message.reply_text(response, parse_mode='Markdown', reply_markup=reply_markup) - except ValueError: - await update.message.reply_text("āŒ Invalid email number. Please provide a number.") except subprocess.TimeoutExpired: - await update.message.reply_text("āŒ Command timed out while reading email.") + await message.reply_text("āŒ Command timed out while reading email.") except Exception as e: - logger.error(f"Error reading mail: {e}") - await update.message.reply_text(f"āŒ An error occurred: {str(e)}") + logger.error(f"Error reading mail: {e}", exc_info=True) + await message.reply_text(f"āŒ An error occurred: {str(e)}") + +async def read_mail(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Read mail command handler.""" + await read_mail_handler(update, context) + +async def button_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Handle button callbacks.""" + query = update.callback_query + + if query.data == "checkmail": + await check_mail(update, context) + elif query.data == "help": + await help_command(update, context) + elif query.data.startswith("read_"): + email_num = int(query.data.split("_")[1]) + await read_mail_handler(update, context, email_num) + else: + await query.answer("Unknown action") async def echo(update: Update, context: ContextTypes.DEFAULT_TYPE): """Echo the user message.""" @@ -229,6 +325,7 @@ def main(): application.add_handler(CommandHandler("help", help_command)) application.add_handler(CommandHandler("checkmail", check_mail)) application.add_handler(CommandHandler("readmail", read_mail)) + application.add_handler(CallbackQueryHandler(button_callback)) application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, echo)) # Start the Bot diff --git a/requirements.txt b/requirements.txt index 234da17..1008101 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,3 @@ python-telegram-bot==21.0 +html2text==2024.2.26 +playwright==1.49.0