diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-19 08:06:56 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-19 08:06:56 +0300 |
| commit | eab69f8796c1d42b2e0d08282b5ff1859f689a8a (patch) | |
| tree | a7ec25ba4300ded6cccd974857e49a0debbd019c /classes/RSSUtils.php | |
| parent | f4973264d35cd95a110225b2e274a38bf9c7f3a6 (diff) | |
| parent | ce36b27a0d01bcc61114028d0f8ec3d3e20d30de (diff) | |
Merge branch 'feature/orm-and-misc' into 'master'
Use ORM in more places, deprecate const SUBSTRING_FOR_DATE, some minor fixes
See merge request tt-rss/tt-rss!135
Diffstat (limited to 'classes/RSSUtils.php')
| -rw-r--r-- | classes/RSSUtils.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php index 9403cebdd..d367d91dc 100644 --- a/classes/RSSUtils.php +++ b/classes/RSSUtils.php @@ -344,11 +344,13 @@ class RSSUtils { $cache = DiskCache::instance('feeds'); $feed_obj = ORM::for_table('ttrss_feeds') - ->select_expr("ttrss_feeds.*, - ".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional, - (favicon_is_custom IS NOT TRUE AND - (favicon_last_checked IS NULL OR favicon_last_checked < NOW() - INTERVAL '12 hour')) AS favicon_needs_check") - ->find_one($feed); + ->select('ttrss_feeds.*') + ->select_many_expr([ + 'last_unconditional' => 'SUBSTRING_FOR_DATE(last_unconditional, 1, 19)', + 'favicon_needs_check' => "(favicon_is_custom IS NOT TRUE AND + (favicon_last_checked IS NULL OR favicon_last_checked < NOW() - INTERVAL '12 hour'))", + ]) + ->find_one($feed); if ($feed_obj) { $feed_obj->last_update_started = Db::NOW(); @@ -677,7 +679,7 @@ class RSSUtils { $items = $rss->get_items(); - if (!is_array($items)) { + if (count($items) === 0) { Debug::log("no articles found.", Debug::LOG_VERBOSE); $feed_obj->set([ |