Skip to content

Commit 690b251

Browse files
committed
#281 - telegram() custom endpoint & handle no internet
1 parent ed36f96 commit 690b251

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

tagui.py

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ def ask(text_to_prompt = ''):
12301230
else:
12311231
return input(text_to_prompt + space_padding)
12321232

1233-
def telegram(telegram_id = None, text_to_send = None):
1233+
def telegram(telegram_id = None, text_to_send = None, custom_endpoint = None):
12341234
if telegram_id is None or telegram_id == '':
12351235
print('[RPA][ERROR] - Telegram ID missing for telegram()')
12361236
return False
@@ -1245,17 +1245,25 @@ def telegram(telegram_id = None, text_to_send = None):
12451245
telegram_endpoint = 'https://tebel.org/rpapybot'
12461246
telegram_params = {'chat_id': telegram_id, 'text': text_to_send}
12471247

1248-
if _python2_env():
1249-
import json; import urllib
1250-
telegram_endpoint = telegram_endpoint + '/sendMessage.php?' + urllib.urlencode(telegram_params)
1251-
telegram_response = urllib.urlopen(telegram_endpoint).read()
1252-
return json.loads(telegram_response)['ok']
1253-
1254-
else:
1255-
import json; import urllib.request; import urllib.parse
1256-
telegram_endpoint = telegram_endpoint + '/sendMessage.php?' + urllib.parse.urlencode(telegram_params)
1257-
telegram_response = urllib.request.urlopen(telegram_endpoint).read()
1258-
return json.loads(telegram_response)['ok']
1248+
if custom_endpoint is not None and custom_endpoint != '':
1249+
telegram_endpoint = custom_endpoint
1250+
1251+
# handle case where no internet or url is invalid
1252+
try:
1253+
if _python2_env():
1254+
import json; import urllib
1255+
telegram_endpoint = telegram_endpoint + '/sendMessage.php?' + urllib.urlencode(telegram_params)
1256+
telegram_response = urllib.urlopen(telegram_endpoint).read()
1257+
return json.loads(telegram_response)['ok']
1258+
1259+
else:
1260+
import json; import urllib.request; import urllib.parse
1261+
telegram_endpoint = telegram_endpoint + '/sendMessage.php?' + urllib.parse.urlencode(telegram_params)
1262+
telegram_response = urllib.request.urlopen(telegram_endpoint).read()
1263+
return json.loads(telegram_response)['ok']
1264+
1265+
except Exception as e:
1266+
return False
12591267

12601268
def keyboard(keys_and_modifiers = None):
12611269
if not _started():

0 commit comments

Comments
 (0)