Merge branch 'multi-deployment' of github:git-sid/ticketfrei into multi-deployment

# Conflicts:
#	active_bots/telegrambot.py
This commit is contained in:
b3yond 2018-09-09 17:52:23 +02:00
commit 0624bcb378

View file

@ -12,7 +12,8 @@ class TelegramBot(Bot):
tb = Telegram(user.get_telegram_credentials()) tb = Telegram(user.get_telegram_credentials())
seen_tg = user.get_seen_tg() seen_tg = user.get_seen_tg()
try: try:
updates = tb.get_updates(offset=seen_tg+1).wait() updates = tb.get_updates(offset=seen_tg + 1,
allowed_updates="message").wait()
except TypeError: except TypeError:
updates = tb.get_updates().wait() updates = tb.get_updates().wait()
reports = [] reports = []