Merge pull request #104 from ticketfrei/hotfix-tg-2.1.6

Hotfix tg 2.1.6
This commit is contained in:
b3yond 2019-08-09 15:46:30 +03:00 committed by GitHub
commit fc0ffca1f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,6 +23,7 @@ class TelegramBot(Bot):
# return when telegram returns an error code
if update in [303, 404, 420, 500, 502]:
return reports
# log unusual telegram error messages
if isinstance(update, int):
try:
logger.error("City " + str(user.uid) +
@ -31,18 +32,21 @@ class TelegramBot(Bot):
except TypeError:
logger.error("Unknown Telegram error code: " + str(update))
return reports
# save the last message, so it doesn't get crawled again
user.save_seen_tg(update.update_id)
# complain if message is a photo
if update.message.photo:
tb.send_message(
update.message.sender.id,
"Sending Photos is not supported for privacy reasons. Can "
"you describe it as text instead?")
continue
if hasattr(update.message, 'text'):
# complain if message is a media file
if update.message.text is None:
tb.send_message(
update.message.sender.id,
"We only support text only reporting for privacy reasons."
"Can you describe it as text instead?")
"We only support text reporting for privacy reasons. Can "
"you describe it as text instead?")
continue
if update.message.text.lower() == "/start":
user.add_telegram_subscribers(update.message.sender.id)