diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-12-03 19:52:02 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-12-03 19:52:02 +0100 |
| commit | f0d4f2762d2b74eeadf2fb64ff83039b5cc16c26 (patch) | |
| tree | ebdb0bcffeb4370d1fa08defe7313dbf5f02e47a /p/api | |
| parent | eb2c2d9a01ba54865b944f75d8436f933ed3ebfc (diff) | |
Rework keepmax (#5905)
* Rework keepmax
fix https://github.com/FreshRSS/FreshRSS/issues/5702
fix https://github.com/FreshRSS/FreshRSS/issues/5870
* More WIP
* Minor progress
* Progress
* Beta
* Improved debug message
* Revert noCommit
* Fix variable reset
* Remove debug syslogs
Diffstat (limited to 'p/api')
| -rw-r--r-- | p/api/greader.php | 5 | ||||
| -rw-r--r-- | p/api/pshb.php | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/p/api/greader.php b/p/api/greader.php index 67d82cf4d..91a7b5d13 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -327,7 +327,10 @@ final class GReaderAPI { $importService = new FreshRSS_Import_Service($user); $importService->importOpml($opml); if ($importService->lastStatus()) { - FreshRSS_feed_Controller::actualizeFeed(0, '', true); + [, , $nb_new_articles] = FreshRSS_feed_Controller::actualizeFeeds(); + if ($nb_new_articles > 0) { + FreshRSS_feed_Controller::commitNewEntries(); + } invalidateHttpCache($user); exit('OK'); } else { diff --git a/p/api/pshb.php b/p/api/pshb.php index 85bc5681a..d48ece0aa 100644 --- a/p/api/pshb.php +++ b/p/api/pshb.php @@ -133,8 +133,11 @@ foreach ($users as $userFilename) { Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled, 'user'); Minz_Translate::reset(FreshRSS_Context::$user_conf->language); - list($updated_feeds, $feed, $nb_new_articles) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie); - if ($updated_feeds > 0 || $feed != false) { + [$updated_feeds, , $nb_new_articles] = FreshRSS_feed_Controller::actualizeFeeds(null, $self, null, $simplePie); + if ($nb_new_articles > 0) { + FreshRSS_feed_Controller::commitNewEntries(); + } + if ($updated_feeds > 0) { $nb++; } else { Minz_Log::warning('Warning: User ' . $username . ' does not subscribe anymore to ' . $self, PSHB_LOG); |