From 9d632a917ec85f87071dc94ad85396ce57afb5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20CHABERNAUD?= Date: Mon, 30 Dec 2019 23:57:49 +0100 Subject: [PATCH] add conditions picture and/or message --- telegram.py | 11 +++++++---- telegram.yml | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/telegram.py b/telegram.py index 74bab0c..f7d2266 100644 --- a/telegram.py +++ b/telegram.py @@ -39,12 +39,15 @@ class Telegram(plugins.Plugin): message = Voice(lang=config['main']['lang']).on_last_session_tweet(last_session) bot = telegram.Bot(self.options['bot_token']) - bot.sendPhoto(chat_id=self.options['chat_id'], photo=open(picture, 'rb')) - bot.sendMessage(chat_id=self.options['chat_id'], text=message, disable_web_page_preview=True) + if self.options['send_picture'] is True: + bot.sendPhoto(chat_id=self.options['chat_id'], photo=open(picture, 'rb')) + logging.info("telegram: picture sent") + if self.options['send_message'] is True: + bot.sendMessage(chat_id=self.options['chat_id'], text=message, disable_web_page_preview=True) + logging.info("telegram: message sent: %s" % message) last_session.save_session_id() - logging.info("telegram: %s" % message) - display.set('status', 'Message sent!') + display.set('status', 'Telegram notification sent!') display.update(force=True) except Exception: logging.exception("Error while sending on Telegram") diff --git a/telegram.yml b/telegram.yml index f29126c..5b04e47 100644 --- a/telegram.yml +++ b/telegram.yml @@ -3,3 +3,5 @@ telegram: bot_token: ~ bot_name: pwnagotchi chat_id: ~ + send_picture: true + send_message: true