mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2025-12-23 21:47:44 -05:00
* feat: Add user modified functionality Closes https://github.com/FreshRSS/FreshRSS/issues/7862 Changes proposed in this pull request: This is an implementation of the proposed feature. It allows entries to have a new field that will be updated whenever an item is marked as read/unread or bookmark/removed from bookmarks. And a new sort criteria to sort by it. How to test the feature manually: 1. Mark items from a feed as read/unread 2. Mark items from a feed as bookmark / remove bookmark 3. Sort by the new criteria * feat: Add sort functionality * feat: Add sort nav button * fix: Use correct migrations * fix: Add internationalization * fix: Linter errors * chore: PR comments * Update app/i18n/fr/index.php Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr> * Update app/i18n/pl/index.php Co-authored-by: Inverle <inverle@proton.me> * Update app/i18n/nl/index.php Co-authored-by: Frans de Jonge <fransdejonge@gmail.com> * make fix-all * Fixes * More fixes sort * Fix wrong index * Fix unneeded column * Fix auto-create indexes * Some copilot suggestions * One more fix Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr> --------- Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr> Co-authored-by: Inverle <inverle@proton.me> Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
109 lines
3.1 KiB
PHP
109 lines
3.1 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAOSQLite {
|
|
|
|
#[\Override]
|
|
public static function hasNativeHex(): bool {
|
|
return true;
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlHexDecode(string $x): string {
|
|
return 'decode(' . $x . ", 'hex')";
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlHexEncode(string $x): string {
|
|
return 'encode(' . $x . ", 'hex')";
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlIgnoreConflict(string $sql): string {
|
|
return rtrim($sql, ' ;') . ' ON CONFLICT DO NOTHING';
|
|
}
|
|
|
|
#[\Override]
|
|
protected static function sqlLimitAll(): string {
|
|
// https://www.postgresql.org/docs/current/queries-limit.html
|
|
return 'ALL';
|
|
}
|
|
|
|
#[\Override]
|
|
public static function sqlRandom(): string {
|
|
return 'RANDOM()';
|
|
}
|
|
|
|
#[\Override]
|
|
protected static function sqlRegex(string $expression, string $regex, array &$values): string {
|
|
$matches = static::regexToSql($regex);
|
|
if (isset($matches['pattern'])) {
|
|
$matchType = $matches['matchType'] ?? '';
|
|
if (str_contains($matchType, 'm')) {
|
|
// newline-sensitive matching
|
|
$matches['pattern'] = '(?m)' . $matches['pattern'];
|
|
}
|
|
$values[] = $matches['pattern'];
|
|
if (str_contains($matchType, 'i')) {
|
|
// case-insensitive matching
|
|
return "{$expression} ~* ?";
|
|
} else {
|
|
// case-sensitive matching
|
|
return "{$expression} ~ ?";
|
|
}
|
|
}
|
|
return '';
|
|
}
|
|
|
|
#[\Override]
|
|
protected function registerSqlFunctions(string $sql): void {
|
|
// Nothing to do for PostgreSQL
|
|
}
|
|
|
|
/** @param array{0:string,1:int,2:string} $errorInfo */
|
|
#[\Override]
|
|
protected function autoUpdateDb(array $errorInfo): bool {
|
|
if (isset($errorInfo[0])) {
|
|
if ($errorInfo[0] === FreshRSS_DatabaseDAO::ER_BAD_FIELD_ERROR || $errorInfo[0] === FreshRSS_DatabaseDAOPGSQL::UNDEFINED_COLUMN) {
|
|
$errorLines = explode("\n", $errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise
|
|
foreach (['attributes', 'lastUserModified'] as $column) {
|
|
if (str_contains($errorLines[0], $column)) {
|
|
return $this->addColumn($column);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
#[\Override]
|
|
public function commitNewEntries(): bool {
|
|
//TODO: Update to PostgreSQL 9.5+ syntax with ON CONFLICT DO NOTHING
|
|
$sql = 'DO $$
|
|
DECLARE
|
|
maxrank bigint := (SELECT MAX(id) FROM `_entrytmp`);
|
|
rank bigint := (SELECT maxrank - COUNT(*) FROM `_entrytmp`);
|
|
BEGIN
|
|
INSERT INTO `_entry`
|
|
(id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes)
|
|
(SELECT rank + row_number() OVER(ORDER BY date, id) AS id, guid, title, author, content,
|
|
link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes
|
|
FROM `_entrytmp` AS etmp
|
|
WHERE NOT EXISTS (
|
|
SELECT 1 FROM `_entry` AS ereal
|
|
WHERE (etmp.id = ereal.id) OR (etmp.id_feed = ereal.id_feed AND etmp.guid = ereal.guid))
|
|
ORDER BY date, id);
|
|
DELETE FROM `_entrytmp` WHERE id <= maxrank;
|
|
END $$;';
|
|
$hadTransaction = $this->pdo->inTransaction();
|
|
if (!$hadTransaction) {
|
|
$this->pdo->beginTransaction();
|
|
}
|
|
$result = $this->pdo->exec($sql) !== false;
|
|
if (!$hadTransaction) {
|
|
$this->pdo->commit();
|
|
}
|
|
return $result;
|
|
}
|
|
}
|