mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-06 14:17:27 +02:00
Code Issues Projects Releases Wiki Activity

Use ORM in 'Counters::get_feeds()' (and simplify stuff).

Browse Source
This commit is contained in:
wn_ 2025-05-18 14:51:47 +00:00
parent 2fa54cc627
commit cdd48bb1fa
1 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
classes/Counters.php
View File

@ -147,63 +147,34 @@ class Counters {
private static function get_feeds(?array $feed_ids = null): array { private static function get_feeds(?array $feed_ids = null): array {
$ret = []; $ret = [];
$pdo = Db::pdo(); if (is_array($feed_ids) && count($feed_ids) === 0)
return $ret;
if (is_array($feed_ids)) { $feeds = ORM::for_table('ttrss_feeds')
if (count($feed_ids) == 0) ->table_alias('f')
return []; ->select_many('f.id', 'f.title', 'f.last_error')
->select_many_expr([
'count' => 'SUM(CASE WHEN ue.unread THEN 1 ELSE 0 END)',
'count_marked' => 'SUM(CASE WHEN ue.marked THEN 1 ELSE 0 END)',
'last_updated' => 'SUBSTRING_FOR_DATE(f.last_updated,1,19)',
])
->join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue')
->where('ue.owner_uid', $_SESSION['uid'])
->group_by('f.id');
$feed_ids_qmarks = arr_qmarks($feed_ids); if (is_array($feed_ids))
$feeds->where_in('f.id', $feed_ids);
$sth = $pdo->prepare("SELECT f.id, foreach ($feeds->find_many() as $feed) {
f.title, $ret[] = [
SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated, 'id' => $feed->id,
f.last_error, 'title' => truncate_string($feed->title, 30),
SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count, 'error' => $feed->last_error,
SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked 'updated' => TimeHelper::make_local_datetime($feed->last_updated),
FROM ttrss_feeds f, ttrss_user_entries ue 'counter' => (int) $feed->count,
WHERE f.id = ue.feed_id AND ue.owner_uid = ? AND f.id IN ($feed_ids_qmarks) 'markedcounter' => (int) $feed->count_marked,
GROUP BY f.id"); 'ts' => Feeds::_has_icon($feed->id) ? (int) filemtime(Feeds::_get_icon_file($feed->id)) : 0,
$sth->execute([$_SESSION['uid'], ...$feed_ids]);
} else {
$sth = $pdo->prepare("SELECT f.id,
f.title,
SUBSTRING_FOR_DATE(f.last_updated,1,19) AS last_updated,
f.last_error,
SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
FROM ttrss_feeds f, ttrss_user_entries ue
WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
GROUP BY f.id");
$sth->execute(["uid" => $_SESSION['uid']]);
}
while ($line = $sth->fetch()) {
$id = $line["id"];
$last_updated = TimeHelper::make_local_datetime($line['last_updated']);
if (Feeds::_has_icon($id)) {
$ts = filemtime(Feeds::_get_icon_file($id));
} else {
$ts = 0;
}
$cv = [
"id" => $id,
"updated" => $last_updated,
"counter" => (int) $line["count"],
"markedcounter" => (int) $line["count_marked"],
"ts" => (int) $ts
]; ];
$cv["error"] = $line["last_error"];
$cv["title"] = truncate_string($line["title"], 30);
array_push($ret, $cv);
} }
return $ret; return $ret;