diff --git a/src/fabledassistant/routes/briefing.py b/src/fabledassistant/routes/briefing.py index 1eb4d8e..5943241 100644 --- a/src/fabledassistant/routes/briefing.py +++ b/src/fabledassistant/routes/briefing.py @@ -360,8 +360,8 @@ async def list_news(): ON r.rss_item_id = i.id AND r.user_id = :uid WHERE f.user_id = :uid AND (:feed_id IS NULL OR f.id = :feed_id) - AND i.published_at >= NOW() - make_interval(days => :days) - ORDER BY i.published_at DESC NULLS LAST + AND COALESCE(i.published_at, i.fetched_at) >= NOW() - make_interval(days => :days) + ORDER BY COALESCE(i.published_at, i.fetched_at) DESC LIMIT :limit OFFSET :offset """).bindparams(uid=g.user.id, days=days, limit=limit, offset=offset, feed_id=feed_id)