mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2025-12-23 21:47:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

More uniform SQL search and PHP search (#8329)

Browse Source 
* More uniform SQL search and PHP search
The behaviour depends though on the database.
Improve https://github.com/FreshRSS/FreshRSS/discussions/8265#discussioncomment-15278980

* Try to use transliterator_transliterate function instead
This commit is contained in:
Alexandre Alapetite
2025-12-20 11:06:39 +01:00
committed by GitHub
parent f71636955f
commit af1e5cb9bc
4 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Models/DatabaseDAO.php
View File

@@ -482,4 +482,33 @@ SQL;
return true;
}
/**
* Remove accents from characters and lowercase. Relevant for emulating MySQL utf8mb4_unicode_ci collation.
* Example: `Café` becomes `cafe`.
*/
private static function removeAccentsLower(string $str): string {
if (function_exists('transliterator_transliterate')) {
// https://unicode-org.github.io/icu/userguide/transforms/general/#overview
$transliterated = transliterator_transliterate('NFD; [:Nonspacing Mark:] Remove; NFC; Lower', $str);
if ($transliterated !== false) {
return $transliterated;
}
}
return strtolower(strtr($str,
'ÀÁÂÃÄÅàáâãäåÒÓÔÕÖØòóôõöøÈÉÊËèéêëÇçÌÍÎÏìíîïÙÚÛÜùúûüÿÑñ',
'AAAAAAaaaaaaOOOOOOooooooEEEEeeeeCcIIIIiiiiUUUUuuuuyNn'
));
}
/**
* PHP emulation of the SQL ILIKE operation of the selected database.
* Note that it depends on the database collation settings and Unicode extensions.
*/
public static function strilike(string $haystack, string $needle): bool {
// Implementation approximating MySQL/MariaDB `LIKE` with `utf8mb4_unicode_ci` collation.
$haystack = self::removeAccentsLower($haystack);
$needle = self::removeAccentsLower($needle);
return str_contains($haystack, $needle);
}
}

15
app/Models/DatabaseDAOPGSQL.php
View File

@@ -99,4 +99,19 @@ SQL;
}
return $ok;
}
#[\Override]
public static function strilike(string $haystack, string $needle): bool {
if (function_exists('mb_stripos')) {
return mb_stripos($haystack, $needle, 0, 'UTF-8') !== false;
}
if (function_exists('transliterator_transliterate')) {
$haystack_ = transliterator_transliterate('Lower', $haystack);
$needle_ = transliterator_transliterate('Lower', $needle);
if ($haystack_ !== false && $needle_ !== false) {
return str_contains($haystack_, $needle_);
}
}
return stripos($haystack, $needle) !== false;
}
}

5
app/Models/DatabaseDAOSQLite.php
View File

@@ -99,4 +99,9 @@ class FreshRSS_DatabaseDAOSQLite extends FreshRSS_DatabaseDAO {
}
return $ok;
}
#[\Override]
public static function strilike(string $haystack, string $needle): bool {
return stripos($haystack, $needle) !== false;
}
}

24
app/Models/Entry.php
View File

@@ -625,6 +625,10 @@ HTML;
}
public function matches(FreshRSS_BooleanSearch $booleanSearch): bool {
static $databaseDao = null;
if (!($databaseDao instanceof FreshRSS_DatabaseDAO)) {
$databaseDao = FreshRSS_Factory::createDatabaseDAO();
}
$ok = true;
foreach ($booleanSearch->searches() as $filter) {
if ($filter instanceof FreshRSS_BooleanSearch) {
@@ -695,7 +699,7 @@ HTML;
}
if ($ok && $filter->getAuthor() !== null) {
foreach ($filter->getAuthor() as $author) {
$ok &= stripos(implode(';', $this->authors), $author) !== false;
$ok &= $databaseDao::strilike(implode(';', $this->authors), $author);
}
}
if ($ok && $filter->getAuthorRegex() !== null) {
@@ -705,7 +709,7 @@ HTML;
}
if ($ok && $filter->getNotAuthor() !== null) {
foreach ($filter->getNotAuthor() as $author) {
$ok &= stripos(implode(';', $this->authors), $author) === false;
$ok &= !$databaseDao::strilike(implode(';', $this->authors), $author);
}
}
if ($ok && $filter->getNotAuthorRegex() !== null) {
@@ -715,7 +719,7 @@ HTML;
}
if ($ok && $filter->getIntitle() !== null) {
foreach ($filter->getIntitle() as $title) {
$ok &= stripos($this->title, $title) !== false;
$ok &= $databaseDao::strilike($this->title, $title);
}
}
if ($ok && $filter->getIntitleRegex() !== null) {
@@ -725,7 +729,7 @@ HTML;
}
if ($ok && $filter->getNotIntitle() !== null) {
foreach ($filter->getNotIntitle() as $title) {
$ok &= stripos($this->title, $title) === false;
$ok &= !$databaseDao::strilike($this->title, $title);
}
}
if ($ok && $filter->getNotIntitleRegex() !== null) {
@@ -735,7 +739,7 @@ HTML;
}
if ($ok && $filter->getIntext() !== null) {
foreach ($filter->getIntext() as $content) {
$ok &= stripos($this->content, $content) !== false;
$ok &= $databaseDao::strilike($this->content, $content);
}
}
if ($ok && $filter->getIntextRegex() !== null) {
@@ -745,7 +749,7 @@ HTML;
}
if ($ok && $filter->getNotIntext() !== null) {
foreach ($filter->getNotIntext() as $content) {
$ok &= stripos($this->content, $content) === false;
$ok &= !$databaseDao::strilike($this->content, $content);
}
}
if ($ok && $filter->getNotIntextRegex() !== null) {
@@ -758,7 +762,7 @@ HTML;
$found = false;
foreach ($this->tags as $tag1) {
$tag1 = ltrim($tag1, '#');
if (strcasecmp($tag1, $tag2) === 0) {
if ($databaseDao::strilike($tag1, $tag2)) {
$found = true;
break;
}
@@ -784,7 +788,7 @@ HTML;
$found = false;
foreach ($this->tags as $tag1) {
$tag1 = ltrim($tag1, '#');
if (strcasecmp($tag1, $tag2) === 0) {
if ($databaseDao::strilike($tag1, $tag2)) {
$found = true;
break;
}
@@ -827,12 +831,12 @@ HTML;
}
if ($ok && $filter->getSearch() !== null) {
foreach ($filter->getSearch() as $needle) {
$ok &= (stripos($this->title, $needle) !== false || stripos($this->content, $needle) !== false);
$ok &= ($databaseDao::strilike($this->title, $needle) || $databaseDao::strilike($this->content, $needle));
}
}
if ($ok && $filter->getNotSearch() !== null) {
foreach ($filter->getNotSearch() as $needle) {
$ok &= (stripos($this->title, $needle) === false && stripos($this->content, $needle) === false);
$ok &= (!$databaseDao::strilike($this->title, $needle) && !$databaseDao::strilike($this->content, $needle));
}
}
if ($ok && $filter->getSearchRegex() !== null) {