Merge branch 'nextcloud:master' into fix-scrolling-with-key-navigation

CHANGELOG.md

@@ -10,7 +10,8 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 
 
 ### Fixed
-- Allow feed title to be null in DB. #2745
+- Allow feed title to be null in DB. (#2745)
+- Store HTTP last modified date from response header (#2724)
 
 # Releases
 ## [25.0.0-alpha8] - 2024-07-07

lib/Fetcher/FeedFetcher.php

@@ -73,7 +73,7 @@ class FeedFetcher implements IFeedFetcher
      * @var FetcherConfig
      */
     private $fetcherConfig;
-     
+
     /**
      * @var Cache
      */
@@ -145,6 +145,12 @@ public function fetch(
             $location
         );
 
+        if (!is_null($resource->getResponse()->getLastModified())) {
+            $feed->setHttpLastModified($resource->getResponse()->getLastModified()->format(DateTime::RSS));
+        } elseif (!is_null($lastModified)) {
+            $feed->setHttpLastModified($lastModified->format(DateTime::RSS));
+        }
+
         $items = [];
         $RTL = $this->determineRtl($parsedFeed);
         $feedName = $parsedFeed->getTitle();
@@ -373,11 +379,11 @@ protected function getFavicon(FeedInterface $feed, string $url): ?string
         $favicon = null;
         // trim the string because authors do funny things
         $feed_logo = $feed->getLogo();
-        
+
         if (!is_null($feed_logo)) {
             $favicon = trim($feed_logo);
         }
-        
+
         ini_set('user_agent', FetcherConfig::DEFAULT_USER_AGENT);
 
         $base_url = new Net_URL2($url);
@@ -494,16 +500,12 @@ protected function buildFeed(FeedInterface $feed, string $url, string $location)
             $title = strip_tags($this->decodeTwice($feed->getTitle()));
             $newFeed->setTitle($title);
         }
+
         $newFeed->setUrl($url);  // the url used to add the feed
         $newFeed->setLocation($location);  // the url where the feed was found
         $newFeed->setLink($feed->getLink());  // <link> attribute in the feed
-        if ($feed->getLastModified() instanceof DateTime) {
-            $newFeed->setHttpLastModified($feed->getLastModified()->format(DateTime::RSS));
-        }
         $newFeed->setAdded($this->time->getTime());
 
-
-
         $favicon = $this->getFavicon($feed, $url);
         $newFeed->setFaviconLink($favicon);