Fix a crash on threads with filters
This commit is contained in:
parent
0007547a7c
commit
b06c664cd5
|
@ -18,15 +18,15 @@ mastodon.status_context(<numerical id>)
|
|||
<h1 id="title" class="title">
|
||||
Thread
|
||||
</h1>
|
||||
{% for ancestor in context.ancestors %}
|
||||
{% include "main/toot_partial.html" with toot=ancestor %}
|
||||
<hr class="is-hidden">
|
||||
{% for ancestor in ancestors %}
|
||||
{% include "main/toot_partial.html" with toot=ancestor %}
|
||||
<hr class="is-hidden">
|
||||
{% endfor %}
|
||||
{% include "main/toot_partial.html" with toot=toot active=True %}
|
||||
<hr class="is-hidden">
|
||||
{% for descendant in context.descendants %}
|
||||
{% include "main/toot_partial.html" with toot=descendant %}
|
||||
<hr class="is-hidden">
|
||||
{% for descendant in descendants %}
|
||||
{% include "main/toot_partial.html" with toot=descendant %}
|
||||
<hr class="is-hidden">
|
||||
{% endfor %}
|
||||
|
||||
{% if not preferences.no_javascript %}
|
||||
|
|
|
@ -425,12 +425,14 @@ def thread(request, id):
|
|||
filters = get_filters(mastodon, context='thread')
|
||||
|
||||
# Apply filters
|
||||
context.ancestors = [x for x in context.ancestors if not toot_matches_filters(x, filters)]
|
||||
context.descendants = [x for x in context.descendants if not toot_matches_filters(x, filters)]
|
||||
ancestors = [x for x in context.ancestors if not toot_matches_filters(x, filters)]
|
||||
descendants = [x for x in context.descendants if not toot_matches_filters(x, filters)]
|
||||
|
||||
|
||||
return render(request, 'main/thread.html',
|
||||
{'context': context, 'toot': toot,
|
||||
'ancestors': ancestors,
|
||||
'descendants': descendants,
|
||||
'own_acct': request.session['user'],
|
||||
'notifications': notifications,
|
||||
'preferences': account.preferences})
|
||||
|
|
Loading…
Reference in New Issue