X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=a9e50d532ca9cdf749b668ef1dffc24bcf75440b;hb=24ee87224f5ca8bdce7adc4d571d5ece36b72471;hp=5738c01d8a18ac4649c501ed2e9dee8260dc963f;hpb=90588ddb8ec811a50eaa843857427b1b6ac4ddd9;p=friendica.git diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index 5738c01d8a..a9e50d532c 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -26,7 +26,7 @@ use DOMXPath; use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; @@ -42,6 +42,7 @@ use Friendica\Util\ParseUrl; use Friendica\Util\Proxy; use Friendica\Util\Strings; use Friendica\Util\XML; +use GuzzleHttp\Exception\TransferException; /** * This class contain functions to import feeds (RSS/RDF/Atom) @@ -68,6 +69,8 @@ class Feed Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]); } + $xml = trim($xml); + if (empty($xml)) { Logger::info('XML is empty.'); return []; @@ -82,7 +85,7 @@ class Feed } $doc = new DOMDocument(); - @$doc->loadXML(trim($xml)); + @$doc->loadXML($xml); $xpath = new DOMXPath($doc); $xpath->registerNamespace('atom', ActivityNamespace::ATOM1); $xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/"); @@ -110,7 +113,7 @@ class Feed if ($xpath->query('/atom:feed')->length > 0) { $alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']"); if (is_object($alternate)) { - foreach ($alternate AS $attribute) { + foreach ($alternate as $attribute) { if ($attribute->name == "href") { $author["author-link"] = $attribute->textContent; } @@ -120,7 +123,7 @@ class Feed if (empty($author["author-link"])) { $self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']"); if (is_object($self)) { - foreach ($self AS $attribute) { + foreach ($self as $attribute) { if ($attribute->name == "href") { $author["author-link"] = $attribute->textContent; } @@ -174,7 +177,7 @@ class Feed $avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']"); if (is_object($avatar)) { - foreach ($avatar AS $attribute) { + foreach ($avatar as $attribute) { if ($attribute->name == "href") { $author["author-avatar"] = $attribute->textContent; } @@ -266,7 +269,7 @@ class Feed $alternate = XML::getFirstAttributes($xpath, "atom:link", $entry); } if (is_object($alternate)) { - foreach ($alternate AS $attribute) { + foreach ($alternate as $attribute) { if ($attribute->name == "href") { $item["plink"] = $attribute->textContent; } @@ -297,7 +300,11 @@ class Feed $orig_plink = $item["plink"]; - $item["plink"] = DI::httpRequest()->finalUrl($item["plink"]); + try { + $item["plink"] = DI::httpClient()->finalUrl($item["plink"]); + } catch (TransferException $exception) { + Logger::notice('Item URL couldn\'t get expanded', ['url' => $item["plink"], 'exception' => $exception]); + } $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry); @@ -378,12 +385,12 @@ class Feed $attachments = []; $enclosures = $xpath->query("enclosure|atom:link[@rel='enclosure']", $entry); - foreach ($enclosures AS $enclosure) { + foreach ($enclosures as $enclosure) { $href = ""; $length = null; $type = null; - foreach ($enclosure->attributes AS $attribute) { + foreach ($enclosure->attributes as $attribute) { if (in_array($attribute->name, ["url", "href"])) { $href = $attribute->textContent; } elseif ($attribute->name == "length") { @@ -400,7 +407,7 @@ class Feed $taglist = []; $categories = $xpath->query("category", $entry); - foreach ($categories AS $category) { + foreach ($categories as $category) { $taglist[] = $category->nodeValue; } @@ -454,7 +461,7 @@ class Feed $preview = ''; if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] < 3)) { // Handle enclosures and treat them as preview picture - foreach ($attachments AS $attachment) { + foreach ($attachments as $attachment) { if ($attachment["mimetype"] == "image/jpeg") { $preview = $attachment["url"]; } @@ -601,7 +608,9 @@ class Feed } $publish_at = date(DateTimeFormat::MYSQL, $publish_time); - Post\Delayed::add($posting['item']['uri'], $posting['item'], $posting['notify'], false, $publish_at, $posting['taglist'], $posting['attachments']); + if (Post\Delayed::add($posting['item']['uri'], $posting['item'], $posting['notify'], Post\Delayed::PREPARED, $publish_at, $posting['taglist'], $posting['attachments'])) { + DI::pConfig()->set($item['uid'], 'system', 'last_publish', $publish_time); + } } } @@ -725,7 +734,7 @@ class Feed if ($contact['rating'] != $priority) { Logger::notice('Adjusting priority', ['old' => $contact['rating'], 'new' => $priority, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]); - DBA::update('contact', ['rating' => $priority], ['id' => $contact['id']]); + Contact::update(['rating' => $priority], ['id' => $contact['id']]); } } @@ -878,8 +887,8 @@ class Feed Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA]; if ($filter === 'comments') { - $condition[0] .= " AND `object-type` = ? "; - $condition[] = Activity\ObjectType::COMMENT; + $condition[0] .= " AND `gravity` = ? "; + $condition[] = GRAVITY_COMMENT; } if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) { @@ -904,7 +913,7 @@ class Feed $root = self::addHeader($doc, $owner, $filter); foreach ($items as $item) { - $entry = self::entry($doc, $item, $owner); + $entry = self::noteEntry($doc, $item, $owner); $root->appendChild($entry); if ($last_update < $item['created']) { @@ -958,7 +967,7 @@ class Feed XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "title", $title); XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename'))); - XML::addElement($doc, $root, "logo", Contact::getAvatarUrlForId($owner['id'], Proxy::SIZE_SMALL, $owner['updated'])); + XML::addElement($doc, $root, "logo", User::getAvatarUrl($owner, Proxy::SIZE_SMALL)); XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM)); $author = self::addAuthor($doc, $owner); @@ -994,69 +1003,6 @@ class Feed return $author; } - /** - * Adds an entry element to the XML document - * - * @param DOMDocument $doc XML document - * @param array $item Data of the item that is to be posted - * @param array $owner Contact data of the poster - * @param bool $toplevel optional default false - * - * @return \DOMElement Entry element - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - * @throws \ImagickException - */ - private static function entry(DOMDocument $doc, array $item, array $owner) - { - $xml = null; - - $repeated_guid = OStatus::getResharedGuid($item); - if ($repeated_guid != "") { - $xml = self::reshareEntry($doc, $item, $owner, $repeated_guid); - } - - if ($xml) { - return $xml; - } - - return self::noteEntry($doc, $item, $owner); - } - - /** - * Adds an entry element with reshared content - * - * @param DOMDocument $doc XML document - * @param array $item Data of the item that is to be posted - * @param array $owner Contact data of the poster - * @param string $repeated_guid guid - * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? - * - * @return bool Entry element - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - * @throws \ImagickException - */ - private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid) - { - if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) { - Logger::info('Feed entry author does not match feed owner', ['owner' => $owner["url"], 'author' => $item["author-link"]]); - } - - $entry = OStatus::entryHeader($doc, $owner, $item, false); - - $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED], - 'network' => Protocol::FEDERATED]; - $repeated_item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition); - if (!DBA::isResult($repeated_item)) { - return false; - } - - self::entryContent($doc, $entry, $item, self::getTitle($repeated_item), Activity::SHARE, false); - - self::entryFooter($doc, $entry, $item, $owner); - - return $entry; - } - /** * Adds a regular entry element * @@ -1107,9 +1053,9 @@ class Feed XML::addElement($doc, $entry, "id", $item["uri"]); XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8')); - $body = OStatus::formatPicturePost($item['body']); + $body = OStatus::formatPicturePost($item['body'], $item['uri-id']); - $body = BBCode::convert($body, false, BBCode::OSTATUS); + $body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB); XML::addElement($doc, $entry, "content", $body, ["type" => "html"]); @@ -1139,27 +1085,31 @@ class Feed if ($item['gravity'] != GRAVITY_PARENT) { $parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]); - $thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $item['thr-parent']]); + $thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]); if (DBA::isResult($thrparent)) { - $mentioned[$thrparent["author-link"]] = $thrparent["author-link"]; - $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"]; - $parent_plink = $thrparent["plink"]; + $mentioned[$thrparent['author-link']] = $thrparent['author-link']; + $mentioned[$thrparent['owner-link']] = $thrparent['owner-link']; + $parent_plink = $thrparent['plink']; + } elseif (DBA::isResult($parent)) { + $mentioned[$parent['author-link']] = $parent['author-link']; + $mentioned[$parent['owner-link']] = $parent['owner-link']; + $parent_plink = DI::baseUrl() . '/display/' . $parent['guid']; } else { - $mentioned[$parent["author-link"]] = $parent["author-link"]; - $mentioned[$parent["owner-link"]] = $parent["owner-link"]; - $parent_plink = DI::baseUrl()."/display/".$parent["guid"]; + DI::logger()->notice('Missing parent and thr-parent for child item', ['item' => $item]); } - $attributes = [ - "ref" => $item['thr-parent'], - "href" => $parent_plink]; - XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); + if (isset($parent_plink)) { + $attributes = [ + 'ref' => $item['thr-parent'], + 'href' => $parent_plink]; + XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes); - $attributes = [ - "rel" => "related", - "href" => $parent_plink]; - XML::addElement($doc, $entry, "link", "", $attributes); + $attributes = [ + 'rel' => 'related', + 'href' => $parent_plink]; + XML::addElement($doc, $entry, 'link', '', $attributes); + } } // uri-id isn't present for follow entry pseudo-items @@ -1170,7 +1120,7 @@ class Feed foreach ($tags as $tag) { if ($tag['type'] == Tag::HASHTAG) { - XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]); + XML::addElement($doc, $entry, 'category', '', ['term' => $tag['name']]); } } @@ -1186,7 +1136,7 @@ class Feed private static function getTitle(array $item) { if ($item['title'] != '') { - return BBCode::convert($item['title'], false, BBCode::OSTATUS); + return BBCode::convertForUriId($item['uri-id'], $item['title'], BBCode::ACTIVITYPUB); } // Fetch information about the post