From a918d4838872ee505db80a25a8997dacc5b5021c Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Mon, 19 Feb 2018 21:18:58 -0500 Subject: [PATCH] eliminated Telegram sticker/image support because nuxref.com has no CA --- apprise/plugins/NotifyTelegram.py | 110 +----------------------------- 1 file changed, 1 insertion(+), 109 deletions(-) diff --git a/apprise/plugins/NotifyTelegram.py b/apprise/plugins/NotifyTelegram.py index 17fe9e68..e6ed2ac3 100644 --- a/apprise/plugins/NotifyTelegram.py +++ b/apprise/plugins/NotifyTelegram.py @@ -67,12 +67,6 @@ IS_CHAT_ID_RE = re.compile( re.IGNORECASE, ) -# Disable image support for now -# The stickers/images are kind of big and consume a lot of space -# It's not as appealing as just having the post not contain -# an image at all. -TELEGRAM_IMAGE_XY = NotifyImageSize.XY_32 - # Used to break path apart into list of chat identifiers CHAT_ID_LIST_DELIM = re.compile(r'[ \t\r\n,#\\/]+') @@ -95,7 +89,7 @@ class NotifyTelegram(NotifyBase): """ super(NotifyTelegram, self).__init__( title_maxlen=250, body_maxlen=4096, - image_size=TELEGRAM_IMAGE_XY, notify_format=notify_format, + notify_format=notify_format, **kwargs) try: @@ -134,94 +128,6 @@ class NotifyTelegram(NotifyBase): self.logger.warning('No chat_id(s) were specified.') raise TypeError('No chat_id(s) were specified.') - def notify_image(self, chat_id, notify_type, **kwargs): - """ - Sends the notification image based on the specified chat id - - """ - image_content = self.image_raw(notify_type) - if image_content is None: - # Nothing to do - return True - - # prepare our image URL - url = '%s%s/%s' % ( - self.notify_url, - self.bot_token, - 'sendPhoto' - ) - - # Set up our upload - files = {'photo': ('%s.png' % notify_type, image_content)} - - payload = { - 'chat_id': chat_id, - 'disable_notification': True, - } - - self.logger.debug( - 'Telegram (image) POST URL: %s (cert_verify=%r)' % ( - url, self.verify_certificate)) - - self.logger.debug( - 'Telegram (image) Payload: %s' % str(payload)) - - try: - r = requests.post( - url, - data=payload, - headers={ - 'User-Agent': self.app_id, - }, - files=files, - verify=self.verify_certificate, - ) - - if r.status_code != requests.codes.ok: - # We had a problem - try: - # Try to get the error message if we can: - error_msg = loads(r.text)['description'] - - except: - error_msg = None - - try: - if error_msg: - self.logger.warning( - 'Failed to send Telegram Image:%s ' - 'notification: (%s) %s.' % ( - payload['chat_id'], - r.status_code, error_msg)) - - else: - self.logger.warning( - 'Failed to send Telegram Image:%s ' - 'notification: %s (error=%s).' % ( - payload['chat_id'], - HTTP_ERROR_MAP[r.status_code], - r.status_code)) - - except KeyError: - self.logger.warning( - 'Failed to send Telegram Image:%s ' - 'notification (error=%s).' % ( - payload['chat_id'], - r.status_code)) - - return False - - except requests.RequestException as e: - self.logger.warning( - 'A Connection error occured sending Telegram:%s ' % ( - payload['chat_id']) + 'notification.' - ) - self.logger.debug('Socket Exception: %s' % str(e)) - return False - - # We were successful - return True - def notify(self, title, body, notify_type, **kwargs): """ Perform Telegram Notification @@ -279,20 +185,6 @@ class NotifyTelegram(NotifyBase): # ID payload['chat_id'] = chat_id.group('idno') - if not self.notify_image( - chat_id=payload['chat_id'], notify_type=notify_type): - # Uh oh... The image failed to post if we get here - - if len(chat_ids) > 0: - # Prevent thrashing requests - self.throttle() - - # Flag our error - has_error = True - - # Move along - continue - self.logger.debug('Telegram POST URL: %s' % url) self.logger.debug('Telegram POST URL: %s (cert_verify=%r)' % ( url, self.verify_certificate,