diff options
| author | liuguopei <liugp11@chinatelecom.cn> | 2020-11-09 17:01:03 +0800 |
|---|---|---|
| committer | liuguopei <liugp11@chinatelecom.cn> | 2020-11-09 17:01:03 +0800 |
| commit | 45e57daa845c0397ffd6b72f2e777913676e3ce8 (patch) | |
| tree | 12cacb9513f46f17b3d0ed47e52bf01ea2eb3e22 | |
| parent | 2fd8c96edd91a37fc22def123a717b89adba0725 (diff) | |
| download | telegram-mail-bot-45e57daa845c0397ffd6b72f2e777913676e3ce8.tar.gz telegram-mail-bot-45e57daa845c0397ffd6b72f2e777913676e3ce8.tar.bz2 telegram-mail-bot-45e57daa845c0397ffd6b72f2e777913676e3ce8.zip | |
update telegram api
2 files changed, 35 insertions, 29 deletions
@@ -12,4 +12,4 @@ pyzmail36 = "*" pylint = "*" [requires] -python_version = "3.6" +python_version = "3.9" @@ -1,13 +1,13 @@ import logging import os -from telegram import ParseMode +from telegram import ParseMode, Update from telegram.constants import MAX_MESSAGE_LENGTH -from telegram.ext import (Updater, CommandHandler) +from telegram.ext import (Updater, CommandHandler, CallbackContext) from utils.client import EmailClient logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s:%(lineno)d' - ' - %(message)s', filename='/var/log/mailbot.log', + ' - %(message)s', filename='/tmp/log/mailbot.log', level=logging.INFO) logger = logging.getLogger(__name__) @@ -23,37 +23,43 @@ def handle_large_text(text): yield out text = text.lstrip(out) -def error(bot, update, _error): +def error(update: Update, context: CallbackContext) -> None: """Log Errors caused by Updates.""" - logger.warning('Update "%s" caused error "%s"', update, _error) + logger.warning('Update "%s" caused error "%s"', update, context.error) -def start_callback(bot, update): +def start_callback(update: Update, context: CallbackContext) -> None: msg = "Use /help to get help" update.message.reply_text(msg) -def _help(bot, update): +def _help(update: Update, context: CallbackContext) -> None: """Send a message when the command /help is issued.""" - help_str = "*Mailbox Setting*: \n" \ - "/setting 123456@example.com yourpassword" - bot.send_message(update.message.chat_id, - parse_mode=ParseMode.MARKDOWN, + help_str = """邮箱设置: +/setting john.doe@example.com password +/inbox +/get mail_index +/help get help""" + # help_str = "*Mailbox Setting*:\n" \ + # "/setting john.doe@example.com password\n" \ + # "/inbox\n" \ + # "/get mail_index" + context.bot.send_message(update.message.chat_id, + # parse_mode=ParseMode.MARKDOWN, text=help_str) -def setting_email(bot, update, args, job_queue, chat_data): +def setting_email(update: Update, context: CallbackContext) -> None: global email_addr, email_passwd, inbox_num - chat_id = update.message.chat_id - email_addr = args[0] - email_passwd = args[1] + email_addr = context.args[0] + email_passwd = context.args[1] logger.info("received setting_email command.") update.message.reply_text("Configure email success!") with EmailClient(email_addr, email_passwd) as client: inbox_num = client.get_mails_count() - job = job_queue.run_repeating(periodic_task, 120, context=chat_id) - chat_data['job'] = job + context.job_queue.run_repeating(periodic_task, interval=60, context=update.message.chat_id) + # chat_data['job'] = job logger.info("periodic task scheduled.") -def periodic_task(bot, job): +def periodic_task(context: CallbackContext) -> None: global inbox_num logger.info("entering periodic task.") with EmailClient(email_addr, email_passwd) as client: @@ -62,11 +68,11 @@ def periodic_task(bot, job): mail = client.get_mail_by_index(new_inbox_num) content = mail.__repr__() for text in handle_large_text(content): - bot.send_message(job.context, + context.bot.send_message(context.job.context, text=text) inbox_num = new_inbox_num -def inbox(bot, update): +def inbox(update: Update, context: CallbackContext) -> None: logger.info("received inbox command.") with EmailClient(email_addr, email_passwd) as client: global inbox_num @@ -76,23 +82,24 @@ def inbox(bot, update): " time you checked." % \ (new_num, new_num - inbox_num) inbox_num = new_num - bot.send_message(update.message.chat_id, + context.bot.send_message(update.message.chat_id, parse_mode=ParseMode.MARKDOWN, text=reply_text) -def get_email(bot, update, args): - index = args[0] +def get_email(update: Update, context: CallbackContext) -> None: + index = context.args[0] logger.info("received get command.") with EmailClient(email_addr, email_passwd) as client: mail = client.get_mail_by_index(index) content = mail.__repr__() for text in handle_large_text(content): - bot.send_message(update.message.chat_id, + context.bot.send_message(update.message.chat_id, text=text) def main(): # Create the EventHandler and pass it your bot's token. - updater = Updater(token=bot_token) + updater = Updater(token=bot_token, use_context=True) + print(bot_token) # Get the dispatcher to register handlers dp = updater.dispatcher @@ -103,12 +110,11 @@ def main(): dp.add_handler(CommandHandler("help", _help)) # # Add command handler to set email address and account. - dp.add_handler(CommandHandler("setting", setting_email, pass_args=True, - pass_job_queue=True, pass_chat_data=True)) + dp.add_handler(CommandHandler("setting", setting_email)) dp.add_handler(CommandHandler("inbox", inbox)) - dp.add_handler(CommandHandler("get", get_email, pass_args=True)) + dp.add_handler(CommandHandler("get", get_email)) dp.add_error_handler(error) |