valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add HOOK_FILTER_TRIGGERED (for filter debugging)

This commit is contained in:
Andrew Dolgov 2018-12-06 19:15:00 +03:00
parent e9cf8e8e35
commit a01c33d654
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/pluginhost.php
View File

@ -57,6 +57,7 @@ class PluginHost {
const HOOK_SEND_LOCAL_FILE = 37; const HOOK_SEND_LOCAL_FILE = 37;
const HOOK_UNSUBSCRIBE_FEED = 38; const HOOK_UNSUBSCRIBE_FEED = 38;
const HOOK_SEND_MAIL = 39; const HOOK_SEND_MAIL = 39;
const HOOK_FILTER_TRIGGERED = 40;
const KIND_ALL = 1; const KIND_ALL = 1;
const KIND_SYSTEM = 2; const KIND_SYSTEM = 2;

19
classes/rssutils.php
View File

@ -769,13 +769,25 @@ class RSSUtils {
/* Collect article tags here so we could filter by them: */ /* Collect article tags here so we could filter by them: */
$matched_rules = array(); $matched_rules = [];
$matched_filters = [];
$article_filters = RSSUtils::get_article_filters($filters, $article["title"], $article_filters = RSSUtils::get_article_filters($filters, $article["title"],
$article["content"], $article["link"], $article["author"], $article["content"], $article["link"], $article["author"],
$article["tags"], $matched_rules); $article["tags"], $matched_rules, $matched_filters);
// $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
$plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
}
if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) { if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
if (count($matched_filters != 0)) {
print_r($matched_filters);
}
Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE); Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
if (count($matched_rules) != 0) { if (count($matched_rules) != 0) {
@ -1342,7 +1354,7 @@ class RSSUtils {
return $params; return $params;
} }
static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false) { static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
$matches = array(); $matches = array();
foreach ($filters as $filter) { foreach ($filters as $filter) {
@ -1409,6 +1421,7 @@ class RSSUtils {
if ($filter_match) { if ($filter_match) {
if (is_array($matched_rules)) array_push($matched_rules, $rule); if (is_array($matched_rules)) array_push($matched_rules, $rule);
if (is_array($matched_filters)) array_push($matched_filters, $filter);
foreach ($filter["actions"] AS $action) { foreach ($filter["actions"] AS $action) {
array_push($matches, $action); array_push($matches, $action);

3
include/functions.php
View File

@ -1945,7 +1945,8 @@
} }
} }
$filter = array(); $filter = [];
$filter["id"] = $filter_id;
$filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]); $filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
$filter["inverse"] = sql_bool_to_bool($line["inverse"]); $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
$filter["rules"] = $rules; $filter["rules"] = $rules;