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

update_rss_feed: fix BLACKLISTED_TAGS not working properly, simplify tag-related code

This commit is contained in:
Andrew Dolgov 2020-12-20 23:12:45 +03:00
parent 5f733604f0
commit f59c567831
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/article.php
View File

@ -218,7 +218,7 @@ class Article extends Handler_Protected {
$id = clean($_REQUEST["id"]); $id = clean($_REQUEST["id"]);
$tags_str = clean($_REQUEST["tags_str"]); $tags_str = clean($_REQUEST["tags_str"]);
$tags = array_unique(trim_array(explode(",", $tags_str))); $tags = array_unique(array_map('trim', explode(",", $tags_str)));
$this->pdo->beginTransaction(); $this->pdo->beginTransaction();

41
classes/rssutils.php
View File

@ -1174,7 +1174,7 @@ class RSSUtils {
foreach ($article_filters as $f) { foreach ($article_filters as $f) {
if ($f["type"] == "tag") { if ($f["type"] == "tag") {
$manual_tags = trim_array(explode(",", $f["param"])); $manual_tags = array_map('trim', explode(",", mb_strtolower($f["param"])));
foreach ($manual_tags as $tag) { foreach ($manual_tags as $tag) {
array_push($entry_tags, $tag); array_push($entry_tags, $tag);
@ -1184,28 +1184,19 @@ class RSSUtils {
// Skip boring tags // Skip boring tags
$boring_tags = trim_array(explode(",", mb_strtolower(get_pref( $boring_tags = array_map('trim',
'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8'))); explode(",", mb_strtolower(
get_pref('BLACKLISTED_TAGS', $owner_uid))));
$filtered_tags = array(); $entry_tags = FeedItem_Common::normalize_categories(
$tags_to_cache = array(); array_unique(
array_diff($entry_tags, $boring_tags)));
foreach ($entry_tags as $tag) { Debug::log("filtered tags: " . implode(", ", $entry_tags), Debug::$LOG_VERBOSE);
if (array_search($tag, $boring_tags) === false) {
array_push($filtered_tags, $tag);
}
}
$filtered_tags = array_unique($filtered_tags);
if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
}
// Save article tags in the database // Save article tags in the database
if (count($filtered_tags) > 0) { if (count($entry_tags) > 0) {
$tsth = $pdo->prepare("SELECT id FROM ttrss_tags $tsth = $pdo->prepare("SELECT id FROM ttrss_tags
WHERE tag_name = ? AND post_int_id = ? AND WHERE tag_name = ? AND post_int_id = ? AND
@ -1215,25 +1206,25 @@ class RSSUtils {
(owner_uid,tag_name,post_int_id) (owner_uid,tag_name,post_int_id)
VALUES (?, ?, ?)"); VALUES (?, ?, ?)");
$filtered_tags = FeedItem_Common::normalize_categories($filtered_tags); foreach ($entry_tags as $tag) {
foreach ($filtered_tags as $tag) {
$tsth->execute([$tag, $entry_int_id, $owner_uid]); $tsth->execute([$tag, $entry_int_id, $owner_uid]);
if (!$tsth->fetch()) { if (!$tsth->fetch()) {
$usth->execute([$owner_uid, $tag, $entry_int_id]); $usth->execute([$owner_uid, $tag, $entry_int_id]);
} }
array_push($tags_to_cache, $tag);
} }
/* update the cache */ /* update the cache */
$tags_str = join(",", $tags_to_cache);
$tsth = $pdo->prepare("UPDATE ttrss_user_entries $tsth = $pdo->prepare("UPDATE ttrss_user_entries
SET tag_cache = ? WHERE ref_id = ? SET tag_cache = ? WHERE ref_id = ?
AND owner_uid = ?"); AND owner_uid = ?");
$tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
$tsth->execute([
join(",", $entry_tags),
$entry_ref_id,
$owner_uid
]);
} }
Debug::log("article processed", Debug::$LOG_VERBOSE); Debug::log("article processed", Debug::$LOG_VERBOSE);

6
include/functions.php
View File

@ -396,12 +396,6 @@
return uniqid(base_convert(rand(), 10, 36)); return uniqid(base_convert(rand(), 10, 36));
} }
function trim_array($array) {
$tmp = $array;
array_walk($tmp, 'trim');
return $tmp;
}
function T_sprintf() { function T_sprintf() {
$args = func_get_args(); $args = func_get_args();
return vsprintf(__(array_shift($args)), $args); return vsprintf(__(array_shift($args)), $args);