juergen/ticketfrei
1
0
Fork 0
Code Issues 15 Pull requests Releases Wiki Activity

Merge pull request #95 from ticketfrei/master

Browse source 
2.1.3 Release
This commit is contained in:
b3yond 2019-05-04 12:15:41 +02:00 committed by GitHub
parent c203393b53 079166e74c
commit 7712d27d1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
active_bots/mastodonbot.py
View file

@ -2,7 +2,7 @@
from bot import Bot from bot import Bot
import logging import logging
from mastodon import Mastodon from mastodon import Mastodon, MastodonServerError
import re import re
from report import Report from report import Report
@ -25,8 +25,8 @@ class MastodonBot(Bot):
return mentions return mentions
try: try:
notifications = m.notifications() notifications = m.notifications()
except Exception: except MastodonServerError:
logger.error("Unknown Mastodon API Error.", exc_info=True) logger.error("Unknown Mastodon API Error: 502")
return mentions return mentions
for status in notifications: for status in notifications:
if (status['type'] == 'mention' and if (status['type'] == 'mention' and

6
active_bots/telegrambot.py
View file

@ -32,6 +32,12 @@ class TelegramBot(Bot):
logger.error("Unknown Telegram error code: " + str(update)) logger.error("Unknown Telegram error code: " + str(update))
return reports return reports
user.save_seen_tg(update.update_id) user.save_seen_tg(update.update_id)
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 update.message.text.lower() == "/start": if update.message.text.lower() == "/start":
user.add_telegram_subscribers(update.message.sender.id) user.add_telegram_subscribers(update.message.sender.id)
tb.send_message( tb.send_message(

2
active_bots/twitterbot.py
View file

@ -73,7 +73,7 @@ class TwitterBot(Bot):
def post(self, user, report): def post(self, user, report):
try: try:
api = self.get_api(user) api = self.get_api(user)
except IndexError: except TypeError:
return # no twitter account for this user. return # no twitter account for this user.
try: try:
if report.source == self: if report.source == self: