xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a return type warning in 'Pref_Filters'.

Browse Source 
'Pref_Filters#get_details()' gets passed the ID of an existing filter, so we don't need to handle some edge case of it not existing.
This commit is contained in:
wn_
2025-01-06 14:30:54 +00:00
parent 0da9ef81bd
commit 2eb3c150c2
1 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
classes/Pref_Filters.php
View File

@@ -763,58 +763,54 @@ class Pref_Filters extends Handler_Protected {
->group_by_expr('f.title, f.match_any_rule, f.inverse') ->group_by_expr('f.title, f.match_any_rule, f.inverse')
->find_one(); ->find_one();
if ($filter) { $title = $filter->title ?: __('[No caption]');
$title = $filter->title ?: __('[No caption]'); $title_summary = [
$title_summary = [ sprintf(
sprintf( _ngettext("%s (%d rule)", "%s (%d rules)", (int) $filter->num_rules),
_ngettext("%s (%d rule)", "%s (%d rules)", (int) $filter->num_rules), $title,
$title, $filter->num_rules)];
$filter->num_rules)];
if ($filter->match_any_rule) array_push($title_summary, __("matches any rule")); if ($filter->match_any_rule) array_push($title_summary, __("matches any rule"));
if ($filter->inverse) array_push($title_summary, __("inverse")); if ($filter->inverse) array_push($title_summary, __("inverse"));
$actions = ORM::for_table("ttrss_filters2_actions") $actions = ORM::for_table("ttrss_filters2_actions")
->where("filter_id", $id) ->where("filter_id", $id)
->order_by_asc('id') ->order_by_asc('id')
->find_many(); ->find_many();
/** @var array<string> $actions_summary */ /** @var array<string> $actions_summary */
$actions_summary = []; $actions_summary = [];
$cumulative_score = 0; $cumulative_score = 0;
// we're going to show a summary adjustment so we skip individual score action descriptions here // we're going to show a summary adjustment so we skip individual score action descriptions here
foreach ($actions as $action) { foreach ($actions as $action) {
if ($action->action_id == self::ACTION_SCORE) { if ($action->action_id == self::ACTION_SCORE) {
$cumulative_score += (int) $action->action_param; $cumulative_score += (int) $action->action_param;
continue; continue;
}
array_push($actions_summary, "<li>" . self::_get_action_name($action) . "</li>");
} }
// inject a fake action description using cumulative filter score array_push($actions_summary, "<li>" . self::_get_action_name($action) . "</li>");
if ($cumulative_score != 0) {
array_unshift($actions_summary,
"<li>" . self::_get_action_name(["action_id" => self::ACTION_SCORE, "action_param" => $cumulative_score]) . "</li>");
}
if (count($actions_summary) > self::MAX_ACTIONS_TO_DISPLAY) {
$actions_not_shown = count($actions_summary) - self::MAX_ACTIONS_TO_DISPLAY;
$actions_summary = array_slice($actions_summary, 0, self::MAX_ACTIONS_TO_DISPLAY);
array_push($actions_summary,
"<li class='text-muted'><em>" . sprintf(_ngettext("(+%d action)", "(+%d actions)", $actions_not_shown), $actions_not_shown)) . "</em></li>";
}
return [
'title' => $title,
'title_summary' => implode(', ', $title_summary),
'actions_summary' => implode('', $actions_summary),
];
} }
return []; // inject a fake action description using cumulative filter score
if ($cumulative_score != 0) {
array_unshift($actions_summary,
"<li>" . self::_get_action_name(["action_id" => self::ACTION_SCORE, "action_param" => $cumulative_score]) . "</li>");
}
if (count($actions_summary) > self::MAX_ACTIONS_TO_DISPLAY) {
$actions_not_shown = count($actions_summary) - self::MAX_ACTIONS_TO_DISPLAY;
$actions_summary = array_slice($actions_summary, 0, self::MAX_ACTIONS_TO_DISPLAY);
array_push($actions_summary,
"<li class='text-muted'><em>" . sprintf(_ngettext("(+%d action)", "(+%d actions)", $actions_not_shown), $actions_not_shown)) . "</em></li>";
}
return [
'title' => $title,
'title_summary' => implode(', ', $title_summary),
'actions_summary' => implode('', $actions_summary),
];
} }
function join(): void { function join(): void {