Mastodon
/
forget-cancellare-vecchi-toot
mirror of https://github.com/codl/forget
2
0
Fork 0
Code Issues Releases Wiki Activity

oops handle twitter errors correctly

This commit is contained in:
codl 2017-09-04 23:08:19 +02:00
parent edf7732e67
commit 214e1f30cd
No known key found for this signature in database
GPG Key ID: 6CD7C8891ED1233A
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/twitter.py
View File

@ -1,4 +1,4 @@
from twitter import Twitter, OAuth, TwitterError from twitter import Twitter, OAuth, TwitterHTTPError, TwitterError
from werkzeug.urls import url_decode from werkzeug.urls import url_decode
from model import OAuthToken, Account, Post, TwitterArchive from model import OAuthToken, Account, Post, TwitterArchive
from app import db, app, sentry from app import db, app, sentry
@ -9,6 +9,7 @@ from zipfile import ZipFile
from io import BytesIO from io import BytesIO
from lib.exceptions import PermanentError, TemporaryError from lib.exceptions import PermanentError, TemporaryError
from urllib.error import URLError from urllib.error import URLError
import json
def get_login_url(callback='oob', consumer_key=None, consumer_secret=None): def get_login_url(callback='oob', consumer_key=None, consumer_secret=None):
@ -78,7 +79,7 @@ def get_twitter_for_acc(account):
try: try:
t.account.verify_credentials() t.account.verify_credentials()
return t return t
except TwitterError as e: except TwitterHTTPError as e:
if e.e.code == 401: if e.e.code == 401:
# token revoked # token revoked
@ -211,10 +212,16 @@ def chunk_twitter_archive(archive_id):
def handle_error(e): def handle_error(e):
if isinstance(e, TwitterError): if isinstance(e, TwitterHTTPError):
if e.code and e.code == 326: try:
# account locked lol rip data = json.loads(e.read())
# although this is a temporary error in twitter terms if 'errors' in data.keys():
# it's best not to waste api calls on locked accounts for error in data['errors']:
raise PermanentError(e) if error.get('code') == 326:
# account locked lol rip
# although this is a temporary error in twitter terms
# it's best not to waste api calls on locked accounts
raise PermanentError(e)
except Exception:
pass
raise TemporaryError(e) raise TemporaryError(e)