Make feed discovery work with direct feed urls.

Author: markstory

src/Service/FeedService.php

@@ -73,9 +73,25 @@ public function discoverFeeds(string $url): array
         // Fetch the URL
         $response = $this->fetchUrl($url);
 
-        $responseType = $response->getHeaderLine('Content-Type');
-        // Must claim to be HTML.
-        if (!str_contains($responseType, 'html')) {
+        /** @var array<\App\Model\Entity\Feed> $feeds */
+        $feeds = [];
+
+        $contentType = $this->getContentType($response);
+        $feedTypes = ['application/atom+xml', 'application/xml', 'text/xml', 'application/rss', 'application/rss+xml'];
+
+        // Feed URL provided
+        if (in_array($contentType, $feedTypes)) {
+            $feeds[] = new Feed([
+                'default_alias' => $url,
+                'url' => $url,
+                'favicon_url' => '',
+            ]);
+
+            return $feeds;
+        }
+
+        // If we didn't get a feed URL, or an HTML page abort.
+        if ($contentType != 'text/html') {
             throw new RuntimeException('That URL is not an HTML page. No feed could be found.');
         }
         try {
@@ -93,9 +109,6 @@ public function discoverFeeds(string $url): array
         // No user/pass support yet.
         $uri = new Uri($url);
 
-        /** @var array<\App\Model\Entity\Feed> $feeds */
-        $feeds = [];
-
         // parse the HTML page looking for link elements
         $xpath = new DOMXPath($dom);
 
@@ -172,6 +185,17 @@ protected function findFavicon(DOMXPath $xpath): ?string
         return null;
     }
 
+    protected function getContentType(Response $res): string
+    {
+        $contentType = $res->getHeaderLine('Content-Type');
+        $colonPos = strpos($contentType, ';');
+        if ($colonPos !== false) {
+            $contentType = substr($contentType, 0, $colonPos);
+        }
+
+        return $contentType;
+    }
+
     /**
      * Import new FeedItems for all the unique items in a feed's current response
      */
@@ -196,11 +220,7 @@ public function refreshFeed(Feed $feed): void
 
     protected function parseResponse(Response $res, Feed $feed): array
     {
-        $contentType = $res->getHeaderLine('Content-Type');
-        $colonPos = strpos($contentType, ';');
-        if ($colonPos !== false) {
-            $contentType = substr($contentType, 0, $colonPos);
-        }
+        $contentType = $this->getContentType($res);
         $body = (string)$res->getBody();
         // No items in an empty response.
         if (!$body) {

templates/FeedSubscriptions/discover.php

@@ -47,7 +47,7 @@
 <?php if ($this->request->getData('url')) : ?>
     <?php if (count($feeds) == 0) : ?>
         <div class="discover-feeds">
-            <p class="empty">No feeds. Provide a URL above to get started.</p>
+            <p class="empty">No feeds were found. Provide a URL above to get started.</p>
         </div>
     <?php endif; ?>
 <?php endif; ?>

tests/TestCase/Service/FeedServiceTest.php

@@ -359,4 +359,26 @@ public function testDiscoverFeedAtom(): void
         $this->assertEquals('Releases - markstory/asset_compress', $feed->default_alias);
         $this->assertEquals('https://github.com/markstory/asset_compress/releases.atom', $feed->url);
     }
+
+    public function testDiscoverFeedDirectFeedUrl(): void
+    {
+        // Feed discovery should work if a direct URL was provided.
+        $url = 'https://example.org/feed';
+        $res = $this->newClientResponse(
+            200,
+            ['Content-Type: application/rss; charset=utf-8'],
+            $this->readFeedFixture('mark-story-com.rss')
+        );
+        $this->mockClientGet($url, $res);
+        $client = new Client();
+
+        $service = new FeedService($client, $this->cleaner);
+        $feeds = $service->discoverFeeds($url);
+        $this->assertCount(1, $feeds);
+        $feed = $feeds[0];
+        $this->assertInstanceOf(Feed::class, $feed);
+        $this->assertEquals('https://example.org/feed', $feed->url);
+        $this->assertEquals($url, $feed->default_alias);
+        $this->assertEquals('', $feed->favicon_url);
+    }
 }