djsundog
/
brutaldon
mirror of http://git.carcosa.net/jmcbray/brutaldon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor more things, make settings and notes respect theme.

This commit is contained in:
Jason McBrayer 2018-04-25 23:07:58 -04:00
parent 12d61820bf
commit d199327d35
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
brutaldon/views.py
View File

@ -28,21 +28,22 @@ def get_mastodon(request):
ratelimit_method="pace") ratelimit_method="pace")
return mastodon return mastodon
def fullbrutalism_p(request):
if request.session.has_key('fullbrutalism'):
fullbrutalism = request.session['fullbrutalism']
else:
fullbrutalism = False
return fullbrutalism
def timeline(request, timeline='home', timeline_name='Home'): def timeline(request, timeline='home', timeline_name='Home'):
try: try:
mastodon = get_mastodon(request) mastodon = get_mastodon(request)
except NotLoggedInException: except NotLoggedInException:
return redirect(login) return redirect(login)
data = mastodon.timeline(timeline) data = mastodon.timeline(timeline)
if request.session.has_key('fullbrutalism'):
fullbrutalism = request.session['fullbrutalism']
else:
fullbrutalism = False
return render(request, 'main/timeline.html', return render(request, 'main/timeline.html',
{'toots': data, 'timeline': timeline_name, {'toots': data, 'timeline': timeline_name,
'fullbrutalism': fullbrutalism}) 'fullbrutalism': fullbrutalism_p(request)})
def home(request): def home(request):
return timeline(request, 'home', 'Home') return timeline(request, 'home', 'Home')
@ -116,7 +117,8 @@ def note(request):
mastodon = get_mastodon(request) mastodon = get_mastodon(request)
notes = mastodon.notifications() notes = mastodon.notifications()
return render(request, 'main/notifications.html', return render(request, 'main/notifications.html',
{'notes': notes,'timeline': 'Notifications'}) {'notes': notes,'timeline': 'Notifications',
'fullbrutalism': fullbrutalism_p(request)})
def settings(request): def settings(request):
@ -126,7 +128,10 @@ def settings(request):
request.session['fullbrutalism'] = form.cleaned_data['fullbrutalism'] request.session['fullbrutalism'] = form.cleaned_data['fullbrutalism']
return redirect(home) return redirect(home)
else: else:
return render(request, 'setup/settings.html', {'form' : form }) return render(request, 'setup/settings.html',
{'form' : form, 'fullbrutalism': fullbrutalism_p(request)})
else: else:
form = SettingsForm(request.session) form = SettingsForm(request.session)
return render(request, 'setup/settings.html', { 'form': form }) return render(request, 'setup/settings.html',
{ 'form': form, 'fullbrutalism': fullbrutalism_p(request)})