From 743bdc856cb8da981c166b253d446cc039d315a6 Mon Sep 17 00:00:00 2001 From: Jason McBrayer Date: Sun, 26 Aug 2018 19:47:48 -0400 Subject: [PATCH] Make filtering preference work again --- .../migrations/0013_auto_20180826_1935.py | 19 +++++++++++++++++++ brutaldon/views.py | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 brutaldon/migrations/0013_auto_20180826_1935.py diff --git a/brutaldon/migrations/0013_auto_20180826_1935.py b/brutaldon/migrations/0013_auto_20180826_1935.py new file mode 100644 index 0000000..e048094 --- /dev/null +++ b/brutaldon/migrations/0013_auto_20180826_1935.py @@ -0,0 +1,19 @@ +# Generated by Django 2.1 on 2018-08-26 23:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('brutaldon', '0012_auto_20180826_1853'), + ] + + operations = [ + migrations.AlterField( + model_name='preference', + name='theme', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='brutaldon.Theme'), + ), + ] diff --git a/brutaldon/views.py b/brutaldon/views.py index 4ea1920..30c5589 100644 --- a/brutaldon/views.py +++ b/brutaldon/views.py @@ -103,9 +103,9 @@ def timeline(request, timeline='home', timeline_name='Home', max_id=None, since_ next = None # This filtering has to be done *after* getting next/prev links - if request.session.get('filter_replies', False): + if account.preferences.filter_replies: data = [x for x in data if not x.in_reply_to_id] - if request.session.get('filter_boosts', False): + if account.preferences.filter_boosts: data = [x for x in data if not x.reblog] return render(request, 'main/%s_timeline.html' % timeline, {'toots': data, 'form': form, 'timeline': timeline,