Merge pull request #106 from ticketfrei/masto502

More detailed Mastodon Server errors
master
b3yond 2019-08-11 10:06:46 +02:00 committed by GitHub
commit 6461a011e9
1 changed files with 14 additions and 2 deletions

View File

@ -21,12 +21,24 @@ class MastodonBot(Bot):
try:
m = mastodon.Mastodon(*user.get_masto_credentials())
except TypeError:
# logger.error("No Mastodon Credentials in database.", exc_info=True)
# No Mastodon Credentials in database.
return mentions
try:
notifications = m.notifications()
except mastodon.MastodonInternalServerError:
logger.error("Mastodon Error: 500. Server: " + m.instance()['urls']['streaming_api'])
return mentions
except mastodon.MastodonBadGatewayError:
logger.error("Mastodon Error: 502. Server: " + m.instance()['urls']['streaming_api'])
return mentions
except mastodon.MastodonServiceUnavailableError:
logger.error("Mastodon Error: 503. Server: " + m.instance()['urls']['streaming_api'])
return mentions
except mastodon.MastodonGatewayTimeoutError:
logger.error("Mastodon Error: 504. Server: " + m.instance()['urls']['streaming_api'])
return mentions
except mastodon.MastodonServerError:
logger.error("Unknown Mastodon API Error: 502")
logger.error("Unknown Mastodon Server Error. Server: " + m.instance()['urls']['streaming_api'], exc_info=True)
return mentions
for status in notifications:
if (status['type'] == 'mention' and