michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-03 00:31:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding more work for the view filter

Browse source
This commit is contained in:
Alan Roberts 2024-08-13 15:56:38 -04:00 • committed by JollyDevelopment
parent de7c8c9d4c
commit 25091be841
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/main/routes.py
View file

@ -100,6 +100,12 @@ def home_page(type, sort, view_filter):
if current_user.is_anonymous:
flash(_('Create an account to tailor this feed to your interests.'))
# view filter
# anon can only filter to local/all
# if view_filter == 'local':
# posts = Post.query.filter(Post.from_bot == False, Post.nsfw == False, Post.nsfl == False, Post.deleted == False, Post.instance_id == 1)
# else:
# posts = Post.query.filter(Post.from_bot == False, Post.nsfw == False, Post.nsfl == False, Post.deleted == False)
posts = Post.query.filter(Post.from_bot == False, Post.nsfw == False, Post.nsfl == False, Post.deleted == False)
posts = posts.join(Community, Community.id == Post.community_id)
if type == 'home':
@ -146,6 +152,12 @@ def home_page(type, sort, view_filter):
posts = posts.filter(Post.user_id.not_in(blocked_accounts))
content_filters = user_filters_home(current_user.id)
# view filter - subscribed/local/all
if view_filter == 'subscribed':
posts = posts.filter(CommunityMember.user_id == current_user.id)
elif view_filter == 'local':
posts = posts.filter(Post.instance_id == 1)
# Sorting
if sort == 'hot':
posts = posts.order_by(desc(Post.ranking)).order_by(desc(Post.posted_at))
@ -156,6 +168,8 @@ def home_page(type, sort, view_filter):
elif sort == 'active':
posts = posts.order_by(desc(Post.last_active))
# flash(_(f'posts: {posts}'))
# Pagination
posts = posts.paginate(page=page, per_page=100 if current_user.is_authenticated and not low_bandwidth else 50, error_out=False)
if type == 'home':
@ -187,7 +201,6 @@ def home_page(type, sort, view_filter):
recently_upvoted = []
recently_downvoted = []
flash(_(f'view_filter: {view_filter}'))
return render_template('index.html', posts=posts, active_communities=active_communities, show_post_community=True,
POST_TYPE_IMAGE=POST_TYPE_IMAGE, POST_TYPE_LINK=POST_TYPE_LINK, POST_TYPE_VIDEO=POST_TYPE_VIDEO, POST_TYPE_POLL=POST_TYPE_POLL,

8
app/templates/_view_filter_nav.html
View file

@ -1,7 +1,9 @@
<div class="btn-group mt-1 mb-2" style="float: right;">
<a href="/{{ type }}/{{ sort }}/subscribed" class="btn {{ 'btn-primary' if view_filter == 'subscribed' else 'btn-outline-secondary' }}" rel="nofollow noindex">
{{ _('Subscribed') }}
</a>
{% if not current_user.is_anonymous %}
<a href="/{{ type }}/{{ sort }}/subscribed" class="btn {{ 'btn-primary' if view_filter == 'subscribed' else 'btn-outline-secondary' }}" rel="nofollow noindex">
{{ _('Subscribed') }}
</a>
{% endif %}
<a href="/{{ type }}/{{ sort }}/local" class="btn {{ 'btn-primary' if view_filter == 'local' else 'btn-outline-secondary' }}" rel="nofollow noindex">
{{ _('Local') }}
</a>