No old ID (#2276)

* No old ID

https://github.com/FreshRSS/FreshRSS/issues/2273

* PostgreSQL insert or ignore

1 files changed, 3 insertions, 7 deletions

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d5ae235ad..7f36e0388 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -377,17 +377,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						$read_upon_reception = $feed->attributes('read_upon_reception') !== null ? (
 								$feed->attributes('read_upon_reception')
 							) : FreshRSS_Context::$user_conf->mark_when['reception'];
-						if ($isNewFeed) {
-							$id = min(time(), $entry_date) . uSecString();
-							$entry->_isRead($read_upon_reception);
-						} elseif ($entry_date < $date_min) {
-							$id = min(time(), $entry_date) . uSecString();
+						$id = uTimeString();
+						$entry->_id($id);
+						if ($entry_date < $date_min) {
 							$entry->_isRead(true);	//Old article that was not in database. Probably an error, so mark as read
 						} else {
-							$id = uTimeString();
 							$entry->_isRead($read_upon_reception);
 						}
-						$entry->_id($id);
 
 						$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
 						if ($entry === null) {