discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

feed-filter-fix
All checks were successful
Deploy on push / deploy (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Untone 2024-05-01 05:02:35 +03:00
parent dc9c66c00f
commit 79f21387a5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resolvers/reader.py
View File

@ -59,10 +59,14 @@ def apply_filters(q, filters, author_id=None):
), ),
) )
if filters.get("featured"): featured_filter = filters.get("featured", "")
if isinstance(featured_filter, bool):
if featured_filter:
q = q.filter(Shout.featured_at.is_not(None)) q = q.filter(Shout.featured_at.is_not(None))
else:
q = q.filter(Shout.featured_at.is_(None))
by_layouts = filters.get("layouts") by_layouts = filters.get("layouts")
if by_layouts: if by_layouts and isinstance(by_layouts, list):
q = q.filter(Shout.layout.in_(by_layouts)) q = q.filter(Shout.layout.in_(by_layouts))
by_author = filters.get("author") by_author = filters.get("author")
if by_author: if by_author:
@ -181,7 +185,7 @@ async def load_shouts_by(_, _info, options):
# order # order
order_by = Shout.featured_at if filters.get("featured") else Shout.published_at order_by = Shout.featured_at if filters.get("featured") else Shout.published_at
order_str = options.get("order_by") order_str = options.get("order_by")
if order_str in ["likes", "shouts", "followers", "comments", "last_comment"]: if order_str in ["likes", "followers", "comments", "last_comment"]:
q = q.order_by(desc(text(f"{order_str}_stat"))) q = q.order_by(desc(text(f"{order_str}_stat")))
query_order_by = ( query_order_by = (
desc(order_by) if options.get("order_by_desc", True) else asc(order_by) desc(order_by) if options.get("order_by_desc", True) else asc(order_by)