michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 11:26:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix for extra cross-posts exclusion commit

Browse source
This commit is contained in:
freamon 2024-12-14 14:55:14 +00:00
parent 46c150cecf
commit d4e9ff14d9
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/main/routes.py
View file

@ -116,7 +116,6 @@ def home_page(sort, view_filter):
posts = posts.order_by(desc(Post.last_active))
# Pagination
"""
if view_filter == 'subscribed' and current_user.is_authenticated and sort == 'new':
# use python list instead of DB query
posts = posts.all()
@ -125,8 +124,8 @@ def home_page(sort, view_filter):
already_seen = []
limit = 100 if not low_bandwidth else 50
#i = -1 # option 1: don't exclude cross-posts
#i = limit - 1 # option 2: exclude cross-posts from the first page only
i = (limit * 10) - 1 # option 3: exclude cross-posts across a 'magic number' of pages
#i = min(limit - 1, len(posts) - 1) # option 2: exclude cross-posts from the first page only
i = min((limit * 10) - 1, len(posts) - 1) # option 3: exclude cross-posts across a 'magic number' of pages
#i = len(posts) - 1 # option 4: exclude all cross-posts ever
while i >= 0:
if not posts[i].cross_posts:
@ -147,10 +146,9 @@ def home_page(sort, view_filter):
next_url = url_for('main.index', page=next_page, sort=sort, view_filter=view_filter) if next_page else None
prev_url = url_for('main.index', page=previous_page, sort=sort, view_filter=view_filter) if previous_page else None
else:
"""
posts = posts.paginate(page=page, per_page=100 if current_user.is_authenticated and not low_bandwidth else 50, error_out=False)
next_url = url_for('main.index', page=posts.next_num, sort=sort, view_filter=view_filter) if posts.has_next else None
prev_url = url_for('main.index', page=posts.prev_num, sort=sort, view_filter=view_filter) if posts.has_prev and page != 1 else None
posts = posts.paginate(page=page, per_page=100 if current_user.is_authenticated and not low_bandwidth else 50, error_out=False)
next_url = url_for('main.index', page=posts.next_num, sort=sort, view_filter=view_filter) if posts.has_next else None
prev_url = url_for('main.index', page=posts.prev_num, sort=sort, view_filter=view_filter) if posts.has_prev and page != 1 else None
# Active Communities
active_communities = Community.query.filter_by(banned=False)

6
app/templates/index.html
View file

@ -15,12 +15,12 @@
{% include "_home_nav.html" %}
{% include "_view_filter_nav.html" %}
<div class="post_list h-feed">
{% for post in posts.items -%}
{% for post in posts %}
{% include 'post/_post_teaser.html' %}
{% else -%}
{% else %}
<p>{{ _('No posts yet. Join some communities to see more.') }}</p>
<p><a class="btn btn-primary" href="/communities">{{ _('More communities') }}</a></p>
{% endfor -%}
{% endfor %}
</div>
<nav aria-label="Pagination" class="mt-4" role="navigation">