fix test

Signed-off-by: Ben Vidulich <ben@vidulich.nz>
nextcloud · Aug 8, 2024 · 36f3010 · 36f3010
1 parent 5525e95
commit 36f3010
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
@@ -137,19 +137,20 @@ public function fetch(
         $url = $url2->getNormalizedURL();
         $resource = $this->reader->read($url, null, $lastModified);
 
-        if ($resource->getResponse()->getLastModified() instanceof DateTime) {
-            $lastModified = $resource->getResponse()->getLastModified();
-        }
-
         $location     = $resource->getUrl();
         $parsedFeed   = $resource->getFeed();
         $feed = $this->buildFeed(
             $parsedFeed,
             $url,
-            $location,
-            $lastModified
+            $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();
@@ -490,7 +491,7 @@ protected function getFavicon(FeedInterface $feed, string $url): ?string
      *
      * @return Feed
      */
-    protected function buildFeed(FeedInterface $feed, string $url, string $location, ?DateTime $httpLastModified): Feed
+    protected function buildFeed(FeedInterface $feed, string $url, string $location): Feed
     {
         $newFeed = new Feed();
 
@@ -502,8 +503,8 @@ protected function buildFeed(FeedInterface $feed, string $url, string $location,
         $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 ($httpLastModified instanceof DateTime) {
-            $newFeed->setHttpLastModified($httpLastModified->format(DateTime::RSS));
+        if ($feed->getLastModified() instanceof DateTime) {
+            $newFeed->setHttpLastModified($feed->getLastModified()->format(DateTime::RSS));
         }
         $newFeed->setAdded($this->time->getTime());