From 1c91928e597cad6d41b10ce4b3f34b130453ad27 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Tue, 31 May 2022 15:46:01 +0200
Subject: If items of feed do not provide an author fallback to feed author
 (#1803)

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 lib/Fetcher/FeedFetcher.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib/Fetcher')

diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
index 27421f525..209722c97 100755
--- a/lib/Fetcher/FeedFetcher.php
+++ b/lib/Fetcher/FeedFetcher.php
@@ -134,6 +134,7 @@ class FeedFetcher implements IFeedFetcher
         $items = [];
         $RTL = $this->determineRtl($parsedFeed);
         $feedName = $parsedFeed->getTitle();
+        $feedAuthor = $parsedFeed->getAuthor();
         $this->logger->debug(
             'Feed {url} was modified since last fetch. #{count} items',
             [
@@ -155,7 +156,7 @@ class FeedFetcher implements IFeedFetcher
                 }
             }
 
-            $builtItem = $this->buildItem($item, $body, $currRTL);
+            $builtItem = $this->buildItem($item, $body, $currRTL, $feedAuthor);
             $this->logger->debug(
                 'Added item {title} for feed {feed} lastmodified: {datetime}',
                 [
@@ -226,11 +227,16 @@ class FeedFetcher implements IFeedFetcher
      * @param ItemInterface $parsedItem The item to use
      * @param string|null   $body       Text of the item, if not provided use description from $parsedItem
      * @param bool          $RTL        True if the feed is RTL (Right-to-left)
+     * @param string|null   $feedAuthor Author of the feed as fallback when the item has no Author
      *
      * @return Item
      */
-    protected function buildItem(ItemInterface $parsedItem, ?string $body = null, bool $RTL = false): Item
-    {
+    protected function buildItem(
+        ItemInterface $parsedItem,
+        ?string $body = null,
+        bool $RTL = false,
+        $feedAuthor = null
+    ): Item {
         $item = new Item();
         $item->setUnread(true);
         $itemLink = $parsedItem->getLink();
@@ -272,7 +278,9 @@ class FeedFetcher implements IFeedFetcher
         if ($itemTitle !== null) {
             $item->setTitle($this->decodeTwice($itemTitle));
         }
-        $author = $parsedItem->getAuthor();
+
+        $author = $parsedItem->getAuthor() ?? $feedAuthor;
+
         if ($author !== null && $author->getName() !== null) {
             $item->setAuthor($this->decodeTwice($author->getName()));
         }
-- 
cgit v1.2.3