fix feed title issues

Co-authored-by: Sean Molenaar <[email protected]> Signed-off-by: Benjamin Brahmer <[email protected]>
nextcloud · Nov 13, 2024 · 05e9819 · 05e9819
1 parent bb29359
commit 05e9819
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,10 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 # Unreleased
 ## [25.x.x]
 ### Changed
+- If title of feed is empty during creation set hostname of feed as title (#2872)
 
 ### Fixed
+- Feed without Title returned by DB causes exception (#2872)
 
 # Releases
 ## [25.0.0-alpha14] - 2024-11-10

diff --git a/lib/Db/Feed.php b/lib/Db/Feed.php
@@ -241,9 +241,9 @@ public function getPreventUpdate(): bool
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getTitle(): string
+    public function getTitle(): ?string
     {
         return $this->title;
     }

diff --git a/lib/Service/FeedServiceV2.php b/lib/Service/FeedServiceV2.php
@@ -232,7 +232,7 @@ public function create(
         if ($this->existsForUser($userId, $feedUrl)) {
             throw new ServiceConflictException('Feed with this URL exists');
         }
-        
+
         if ($feed === null) {
             throw new ServiceNotFoundException('Failed to fetch feed');
         }
@@ -242,11 +242,15 @@ public function create(
             ->setHttpLastModified(null)
             ->setArticlesPerUpdate(count($items));
 
-        if (!is_null($title)) {
+        if ($title !== null) {
             $feed->setTitle($title);
         }
+
+        if ($feed->getTitle() === null) {
+            $feed->setTitle(parse_url($feedUrl)['host']);
+        }
 
-        if (!is_null($user)) {
+        if ($user !== null) {
             $feed->setBasicAuthUser($user)
                 ->setBasicAuthPassword($password);
         }