mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup of code

This commit is contained in:
Bart274 2020-01-31 14:38:38 +01:00 committed by evilhero
parent d96265d008
commit 7f44f4a278
No known key found for this signature in database
GPG Key ID: 3E12C51E39D91142
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mylar/notifiers.py
View File

@ -340,25 +340,21 @@ class TELEGRAM:
else: else:
self.token = test_token self.token = test_token
def notify(self, message, imageurl=None): def notify(self, message, imageUrl=None):
if imageurl: # Construct message
payload = {'chat_id': self.userid, 'text': message}
sendMethod = "sendMessage"
if imageUrl:
# Construct message # Construct message
payload = {'chat_id': self.userid, 'caption': message, 'photo': imageurl} payload = {'chat_id': self.userid, 'caption': message, 'photo': imageUrl}
sendMethod = "sendPhoto"
# Send message to user using Telegram's Bot API # Send message to user using Telegram's Bot API
try: try:
response = requests.post(self.TELEGRAM_API % (self.token, "sendPhoto"), json=payload, verify=True) response = requests.post(self.TELEGRAM_API % (self.token, sendMethod), json=payload, verify=True)
except Exception, e: except Exception as e:
logger.info(u'Telegram notify failed: ' + str(e)) logger.info('Telegram notify failed: ' + str(e))
else:
# Construct message
payload = {'chat_id': self.userid, 'text': message}
# Send message to user using Telegram's Bot API
try:
response = requests.post(self.TELEGRAM_API % (self.token, "sendMessage"), json=payload, verify=True)
except Exception, e:
logger.info(u'Telegram notify failed: ' + str(e))
# Error logging # Error logging
sent_successfuly = True sent_successfuly = True