X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FFeed.php;h=528800c1ee45c01af214ebd34726c76e70d39fb9;hb=3b19ccc3519b929b9ac6d79aca6b8b424597c9c2;hp=8ab7066ea99e4bfc7ca56e28c9bd143527e83872;hpb=13a91e63aa5896014a010d30f4070f475306a397;p=friendica.git diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index 8ab7066ea9..528800c1ee 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -1,6 +1,6 @@ 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::httpClient()->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") { @@ -394,13 +401,22 @@ class Feed } if (!empty($href)) { - $attachments[] = ['type' => Post\Media::DOCUMENT, 'url' => $href, 'mimetype' => $type, 'size' => $length]; + $attachment = ['type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length]; + + $attachment = Post\Media::fetchAdditionalData($attachment); + + // By now we separate the visible media types (audio, video, image) from the rest + // In the future we should try to avoid the DOCUMENT type and only use the real one - but not in the RC phase. + if (!in_array($attachment['type'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO])) { + $attachment['type'] = Post\Media::DOCUMENT; + } + $attachments[] = $attachment; } } $taglist = []; $categories = $xpath->query("category", $entry); - foreach ($categories AS $category) { + foreach ($categories as $category) { $taglist[] = $category->nodeValue; } @@ -454,7 +470,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"]; } @@ -518,6 +534,29 @@ class Feed $taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : []; $item["object-type"] = Activity\ObjectType::BOOKMARK; $attachments = []; + + foreach (['audio', 'video'] as $elementname) { + if (!empty($data[$elementname])) { + foreach ($data[$elementname] as $element) { + if (!empty($element['src'])) { + $src = $element['src']; + } elseif (!empty($element['content'])) { + $src = $element['content']; + } else { + continue; + } + + $attachments[] = [ + 'type' => ($elementname == 'audio') ? Post\Media::AUDIO : Post\Media::VIDEO, + 'url' => $src, + 'preview' => $element['image'] ?? null, + 'mimetype' => $element['contenttype'] ?? null, + 'name' => $element['name'] ?? null, + 'description' => $element['description'] ?? null, + ]; + } + } + } } } else { if (!empty($summary)) { @@ -534,7 +573,7 @@ class Feed } // Add the link to the original feed entry if not present in feed - if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) { + if (($item['plink'] != '') && !strstr($item["body"], $item['plink']) && !in_array($item['plink'], array_column($attachments, 'url'))) { $item["body"] .= "[hr][url]" . $item['plink'] . "[/url]"; } } @@ -727,7 +766,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']]); } } @@ -906,7 +945,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']) { @@ -960,7 +999,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); @@ -996,69 +1035,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 * @@ -1141,27 +1117,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 @@ -1172,7 +1152,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']]); } }