From aa284a2ae60cca7f2f80013801999ad8a6596d84 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 17 Oct 2017 09:10:19 +0000
Subject: [PATCH] Enhance feed information

---
 include/feed.php | 56 ++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/include/feed.php b/include/feed.php
index 1aab26e1df..db6f631d45 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -319,6 +319,30 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'"[/attach]';
 		}
 
+		$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
+
+		if ($body == "") {
+			$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
+		}
+		if ($body == "") {
+			$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
+		}
+		if ($body == "") {
+			$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+		}
+
+		// remove the content of the title if it is identically to the body
+		// This helps with auto generated titles e.g. from tumblr
+		if (title_is_body($item["title"], $body)) {
+			$item["title"] = "";
+		}
+		$item["body"] = html2bbcode($body, $basepath);
+
+		if (($item["body"] == '') && ($item["title"] != '')) {
+			$item["body"] = $item["title"];
+			$item["title"] = '';
+		}
+
 		if ($contact["fetch_further_information"]) {
 			$preview = "";
 
@@ -329,36 +353,16 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 				}
 			}
 
-			$item["body"] = $item["title"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
+			if (strlen($item["title"]) > strlen($item["body"])) {
+//echo "*".strlen($item["title"]).">".strlen($item["body"])."\n";
+				$item["body"] = $item["title"];
+				$item["title"] = "";
+			}
+			$item["body"] = $item["body"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
 			$item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
-			$item["title"] = "";
 			$item["object-type"] = ACTIVITY_OBJ_BOOKMARK;
 			unset($item["attach"]);
 		} else {
-			$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
-
-			if ($body == "") {
-				$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
-			}
-			if ($body == "") {
-				$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
-			}
-			if ($body == "") {
-				$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
-			}
-
-			// remove the content of the title if it is identically to the body
-			// This helps with auto generated titles e.g. from tumblr
-			if (title_is_body($item["title"], $body)) {
-				$item["title"] = "";
-			}
-			$item["body"] = html2bbcode($body, $basepath);
-
-			if (($item["body"] == '') && ($item["title"] != '')) {
-				$item["body"] = $item["title"];
-				$item["title"] = '';
-			}
-
 			if (!strstr($item["body"], '[url') && ($item['plink'] != '')) {
 				$item["body"] .= "[hr][url]".$item['plink']."[/url]";
 			}