djsundog/brutaldon
1
0
Fork 0
mirror of http://git.carcosa.net/jmcbray/brutaldon.git synced 2024-11-23 07:13:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77 from cyisfor/catch_session_expiration_error

Browse Source 
Mastodon.py raises an error when session is expired
This commit is contained in:
GCU Prosthetic Conscience 2020-07-01 08:37:40 -04:00 committed by GitHub
commit ab5b734dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
brutaldon/views.py
View File

@ -133,7 +133,7 @@ def br_login_required(function=None, home_url=None, redirect_field_name=None):
def _dec(view_func): def _dec(view_func):
def _view(request, *args, **kwargs): def _view(request, *args, **kwargs):
if not is_logged_in(request): def not_logged_in():
url = None url = None
if redirect_field_name and redirect_field_name in request.REQUEST: if redirect_field_name and redirect_field_name in request.REQUEST:
url = request.REQUEST[redirect_field_name] url = request.REQUEST[redirect_field_name]
@ -142,8 +142,14 @@ def br_login_required(function=None, home_url=None, redirect_field_name=None):
if not url: if not url:
url = "/" url = "/"
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
if not is_logged_in(request):
return not_logged_in()
else: else:
try:
return view_func(request, *args, **kwargs) return view_func(request, *args, **kwargs)
except MastodonAPIError:
# mastodon must have expired our session
return not_logged_in()
_view.__name__ = view_func.__name__ _view.__name__ = view_func.__name__
_view.__dict__ = view_func.__dict__ _view.__dict__ = view_func.__dict__