From b1bd9a4829b4c54d806bff4181364f177f869023 Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 25 Apr 2024 12:19:42 +0300 Subject: [PATCH] feed-featured-fix-2 --- resolvers/reader.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/resolvers/reader.py b/resolvers/reader.py index 134b3a26..4ca82506 100644 --- a/resolvers/reader.py +++ b/resolvers/reader.py @@ -51,14 +51,17 @@ def filter_my(info, session, q): def apply_filters(q, filters, author_id=None): if isinstance(filters, dict): if filters.get("reacted"): - q.join(Reaction, Reaction.created_by == author_id) + q = q.join( + Reaction, + and_( + Reaction.shout == Shout.id, + Reaction.created_by == author_id, + ), + ) - by_featured = filters.get("featured", "not set") - if isinstance(by_featured, bool): - if by_featured: - q = q.filter(Shout.featured_at.is_not(None)) - else: - q = q.filter(Shout.featured_at.is_(None)) + by_featured = filters.get("featured", "") + if isinstance(by_featured, bool) and by_featured: + q = q.filter(Shout.featured_at > Shout.published_at) by_layouts = filters.get("layouts") if by_layouts: q = q.filter(Shout.layout.in_(by_layouts))