prefer web favicon over feed favicon, fix #101

2 files changed, 17 insertions, 17 deletions

diff --git a/tests/unit/utility/FeedFetcherTest.php b/tests/unit/utility/FeedFetcherTest.php
index ba2e5c191..3794eb1da 100644
--- a/tests/unit/utility/FeedFetcherTest.php
+++ b/tests/unit/utility/FeedFetcherTest.php
@@ -213,7 +213,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 	}
 
 
-	private function createFeed($hasFavicon=false, $hasWebFavicon=false) {
+	private function createFeed($hasFeedFavicon=false, $hasWebFavicon=false) {
 		$this->expectCore('get_title', $this->feedTitle);
 		$this->expectCore('get_link', $this->feedLink);
 
@@ -224,14 +224,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setUrlHash(md5($this->url));
 		$feed->setAdded($this->time);
 
-		if($hasFavicon) {
-			$this->expectCore('get_image_url', $this->feedImage);
-			$feed->setFaviconLink($this->feedImage);
-		} else {
-			$feed->setFaviconLink(null);
-			$this->expectCore('get_image_url', null);
-		}
-
 		if($hasWebFavicon) {
 			$this->faviconFetcher->expects($this->once())
 				->method('fetch')
@@ -240,6 +232,15 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 			$feed->setFaviconLink($this->webFavicon);
 		}
 
+		if($hasFeedFavicon) {
+			$this->expectCore('get_image_url', $this->feedImage);
+			$feed->setFaviconLink($this->feedImage);
+		} elseif(!$hasWebFavicon) {
+			$feed->setFaviconLink(null);
+			$this->expectCore('get_image_url', null);
+		}
+
+
 		return $feed;
 	}
 
diff --git a/utility/feedfetcher.php b/utility/feedfetcher.php
index e97373836..3d4a5099c 100644
--- a/utility/feedfetcher.php
+++ b/utility/feedfetcher.php
@@ -159,15 +159,14 @@ class FeedFetcher implements IFeedFetcher {
 		$feed->setUrlHash(md5($url));
 		$feed->setAdded($this->time->getTime());
 
-		// get the favicon from the feed or the webpage
-		$favicon = $simplePieFeed->get_image_url();
-
-		if ($favicon) {
-			$feed->setFaviconLink($favicon);
-		} else {
-			$webFavicon = $this->faviconFetcher->fetch($feed->getLink());
-			$feed->setFaviconLink($webFavicon);
+		// use the favicon from the page first since most feeds use a weird image
+		$favicon = $this->faviconFetcher->fetch($feed->getLink());
+
+		if (!$favicon) {
+			$favicon = $simplePieFeed->get_image_url();
 		}
+		
+		$feed->setFaviconLink($favicon);
 
 		return $feed;
 	}