X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeed.php;h=12cf06ca5093d6d674a3569bd76e05f1349c0de9;hb=785cfbbaefa94a63812efcb35ffcb70f04caf23c;hp=cfef6d4ad03deb12b562840dfec395a827601eb9;hpb=7a9456d5ac2e73229b2237074c700731c63661a6;p=friendica.git diff --git a/include/feed.php b/include/feed.php index cfef6d4ad0..12cf06ca50 100644 --- a/include/feed.php +++ b/include/feed.php @@ -108,6 +108,14 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($value != "") { $author["author-about"] = $value; } + $avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes; + if (is_object($avatar)) { + foreach ($avatar AS $attributes) { + if ($attributes->name == "href") { + $author["author-avatar"] = $attributes->textContent; + } + } + } } $author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue; @@ -330,12 +338,22 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { 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); + + 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]"; + } } if (!$simulate) {