X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=054eaf51b2812939153424fa80058c9485ee18d9;hb=95827140891f45646ab53c6a850a3ea2389ce6e9;hp=754f4df87aebe92f7e524a96dae47a46b76ca599;hpb=779612d4a8c86d0a1d47d3e5dedde3808f89a5c6;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 754f4df87a..054eaf51b2 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -10,6 +10,7 @@ use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\PConfig; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Lock; @@ -19,6 +20,7 @@ use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\GContact; +use Friendica\Model\APContact; use Friendica\Model\Item; use Friendica\Model\User; use Friendica\Network\Probe; @@ -29,10 +31,7 @@ use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; use Friendica\Util\XML; -require_once 'include/dba.php'; -require_once 'include/items.php'; require_once 'mod/share.php'; -require_once 'include/enotify.php'; require_once 'include/api.php'; /** @@ -46,13 +45,15 @@ class OStatus /** * @brief Fetches author data * - * @param object $xpath The xpath object - * @param object $context The xml context of the author details - * @param array $importer user record of the importing user - * @param array $contact Called by reference, will contain the fetched contact - * @param bool $onlyfetch Only fetch the header without updating the contact entries + * @param DOMXPath $xpath The xpath object + * @param object $context The xml context of the author details + * @param array $importer user record of the importing user + * @param array $contact Called by reference, will contain the fetched contact + * @param bool $onlyfetch Only fetch the header without updating the contact entries * * @return array Array of author related entries for the item + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch) { @@ -73,9 +74,9 @@ class OStatus } $author["author-id"] = Contact::getIdForURL($author["author-link"]); - $author["contact-id"] = $contact["id"]; + $author['contact-id'] = defaults($contact, 'id', $author['author-id']); - $contact = null; + $contact = []; /* This here would be better, but we would get problems with contacts from the statusnet addon @@ -114,6 +115,8 @@ class OStatus if (DBA::isResult($contact)) { if ($contact['blocked']) { $contact['id'] = -1; + } elseif (!empty(APContact::getByURL($contact['url'], false))) { + ActivityPub\Receiver::switchContact($contact['id'], $importer['uid'], $contact['url']); } $author["contact-id"] = $contact["id"]; } @@ -232,7 +235,7 @@ class OStatus GContact::link($gcid, $contact["uid"], $contact["id"]); } elseif ($contact["network"] != Protocol::DFRN) { - $contact = null; + $contact = []; } return $author; @@ -245,6 +248,8 @@ class OStatus * @param array $importer user record of the importing user * * @return array Array of author related entries for the item + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function salmonAuthor($xml, array $importer) { @@ -299,8 +304,10 @@ class OStatus * @param array $contact contact * @param string $hub Called by reference, returns the fetched hub data * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function import($xml, array $importer, array &$contact = null, &$hub) + public static function import($xml, array $importer, array &$contact, &$hub) { self::process($xml, $importer, $contact, $hub); } @@ -316,6 +323,8 @@ class OStatus * @param boolean $initialize Is it the leading post so that data has to be initialized? * * @return boolean Could the XML be processed? + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true) { @@ -393,8 +402,6 @@ class OStatus $authordata = $xpath->query('//author')->item(0); $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, $stored); - $entry = $xpath->query('/atom:entry'); - // Reverse the order of the entries $entrylist = []; @@ -414,13 +421,6 @@ class OStatus $author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored); } - $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry); - if ($value != "") { - $nickname = $value; - } else { - $nickname = $author["author-name"]; - } - $item = array_merge($header, $author); $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry); @@ -460,7 +460,7 @@ class OStatus } if ($item["verb"] == ACTIVITY_FOLLOW) { - Contact::addRelationship($importer, $contact, $item, $nickname); + Contact::addRelationship($importer, $contact, $item); continue; } @@ -490,10 +490,11 @@ class OStatus if ($initialize && (count(self::$itemlist) > 0)) { if (self::$itemlist[0]['uri'] == self::$itemlist[0]['parent-uri']) { // We will import it everytime, when it is started by our contacts - $valid = !empty(self::$itemlist[0]['contact-id']); + $valid = Contact::isSharingByURL(self::$itemlist[0]['author-link'], self::$itemlist[0]['uid']); + if (!$valid) { // If not, then it depends on this setting - $valid = !Config::get('system', 'ostatus_full_threads'); + $valid = ((self::$itemlist[0]['uid'] == 0) || !PConfig::get(self::$itemlist[0]['uid'], 'system', 'accept_only_sharer', false)); if ($valid) { Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG); } @@ -505,7 +506,7 @@ class OStatus $valid = false; $verbs = [ACTIVITY_POST, ACTIVITY_SHARE]; foreach (self::$itemlist as $item) { - if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) { + if (in_array($item['verb'], $verbs) && Contact::isSharingByURL($item['author-link'], $item['uid'])) { $valid = true; } } @@ -523,7 +524,6 @@ class OStatus if ($valid) { $default_contact = 0; - $key = count(self::$itemlist); for ($key = count(self::$itemlist) - 1; $key >= 0; $key--) { if (empty(self::$itemlist[$key]['contact-id'])) { self::$itemlist[$key]['contact-id'] = $default_contact; @@ -559,8 +559,10 @@ class OStatus /** * Removes notice item from database + * * @param array $item item * @return void + * @throws \Exception */ private static function deleteNotice(array $item) { @@ -578,11 +580,13 @@ class OStatus /** * @brief Processes the XML for a post * - * @param object $xpath The xpath object - * @param object $entry The xml entry that is processed - * @param array $item The item array - * @param array $importer user record of the importing user + * @param DOMXPath $xpath The xpath object + * @param object $entry The xml entry that is processed + * @param array $item The item array + * @param array $importer user record of the importing user * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer) { @@ -634,15 +638,15 @@ class OStatus if ($categories) { foreach ($categories as $category) { foreach ($category->attributes as $attributes) { - if ($attributes->name == "term") { + if ($attributes->name == 'term') { $term = $attributes->textContent; - if (!empty($item["tag"])) { - $item["tag"] .= ','; + if (!empty($item['tag'])) { + $item['tag'] .= ','; } else { - $item["tag"] = ''; + $item['tag'] = ''; } - $item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]"; + $item['tag'] .= '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]'; } } } @@ -728,6 +732,7 @@ class OStatus * @param string $conversation The link to the conversation * @param string $conversation_uri The conversation in "uri" format * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function fetchConversation($conversation, $conversation_uri) { @@ -738,7 +743,7 @@ class OStatus self::$conv_list[$conversation] = true; - $curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); + $curlResult = Network::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']); if (!$curlResult->isSuccess()) { return; @@ -790,6 +795,7 @@ class OStatus * @param string $conversation conversation * @param string $conversation_uri conversation uri * @return void + * @throws \Exception */ private static function storeConversation($xml, $conversation = '', $conversation_uri = '') { @@ -873,6 +879,7 @@ class OStatus * @param string $self The link to the self item * @param array $item The item array * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function fetchSelf($self, array &$item) { @@ -908,6 +915,8 @@ class OStatus * @param string $related_uri The related item in "uri" format * @param array $importer user record of the importing user * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function fetchRelated($related, $related_uri, $importer) { @@ -927,7 +936,7 @@ class OStatus } $stored = false; - $curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); + $curlResult = Network::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']); if (!$curlResult->isSuccess()) { return; @@ -1011,12 +1020,14 @@ class OStatus /** * @brief Processes the XML for a repeated post * - * @param object $xpath The xpath object - * @param object $entry The xml entry that is processed - * @param array $item The item array - * @param array $importer user record of the importing user + * @param DOMXPath $xpath The xpath object + * @param object $entry The xml entry that is processed + * @param array $item The item array + * @param array $importer user record of the importing user * * @return array with data from links + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer) { @@ -1175,7 +1186,6 @@ class OStatus } else { return "http://".$server[0]."/notice/".$conversation[1]; } - return $href; } /** @@ -1226,12 +1236,13 @@ class OStatus * @param string $body The body * * @return string The cleaned body + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function formatPicturePost($body) { $siteinfo = BBCode::getAttachedData($body); - if (($siteinfo["type"] == "photo")) { + if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) { if (isset($siteinfo["preview"])) { $preview = $siteinfo["preview"]; } else { @@ -1260,16 +1271,16 @@ class OStatus /** * @brief Adds the header elements to the XML document * - * @param object $doc XML document - * @param array $owner Contact data of the poster - * @param string $filter The related feed filter (activity, posts or comments) + * @param DOMDocument $doc XML document + * @param array $owner Contact data of the poster + * @param string $filter The related feed filter (activity, posts or comments) + * @param bool $feed_mode Behave like a regular feed for users if true * * @return object header root element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function addHeader(DOMDocument $doc, array $owner, $filter) + private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false) { - $a = get_app(); - $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed'); $doc->appendChild($root); @@ -1283,10 +1294,23 @@ class OStatus $root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON); $title = ''; + $selfUri = '/feed/' . $owner["nick"] . '/'; switch ($filter) { - case 'activity': $title = L10n::t('%s\'s timeline', $owner['name']); break; - case 'posts' : $title = L10n::t('%s\'s posts' , $owner['name']); break; - case 'comments': $title = L10n::t('%s\'s comments', $owner['name']); break; + case 'activity': + $title = L10n::t('%s\'s timeline', $owner['name']); + $selfUri .= $filter; + break; + case 'posts': + $title = L10n::t('%s\'s posts', $owner['name']); + break; + case 'comments': + $title = L10n::t('%s\'s comments', $owner['name']); + $selfUri .= $filter; + break; + } + + if (!$feed_mode) { + $selfUri = "/dfrn_poll/" . $owner["nick"]; } $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION]; @@ -1320,11 +1344,10 @@ class OStatus $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["href" => System::baseUrl() . "/dfrn_poll/" . $owner["nick"], - "rel" => "self", "type" => "application/atom+xml"]; + $attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes); - if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == Contact::TYPE_COMMUNITY) { $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false, 'archive' => false, 'hidden' => false, 'blocked' => false]; $members = DBA::count('contact', $condition); @@ -1337,10 +1360,11 @@ class OStatus /** * @brief Add the link to the push hubs to the XML document * - * @param object $doc XML document - * @param object $root XML root element where the hub links are added - * @param object $nick nick + * @param DOMDocument $doc XML document + * @param object $root XML root element where the hub links are added + * @param object $nick nick * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function hublinks(DOMDocument $doc, $root, $nick) { @@ -1351,14 +1375,14 @@ class OStatus /** * @brief Adds attachment data to the XML document * - * @param object $doc XML document - * @param object $root XML root element where the hub links are added - * @param array $item Data of the item that is to be posted + * @param DOMDocument $doc XML document + * @param object $root XML root element where the hub links are added + * @param array $item Data of the item that is to be posted * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function getAttachment(DOMDocument $doc, $root, $item) { - $o = ""; $siteinfo = BBCode::getAttachedData($item["body"]); switch ($siteinfo["type"]) { @@ -1423,18 +1447,19 @@ class OStatus /** * @brief Adds the author element to the XML document * - * @param object $doc XML document - * @param array $owner Contact data of the poster - * @param bool $show_profile Whether to show profile + * @param DOMDocument $doc XML document + * @param array $owner Contact data of the poster + * @param bool $show_profile Whether to show profile * - * @return object author element + * @return \DOMElement author element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true) { $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]); $author = $doc->createElement("author"); XML::addElement($doc, $author, "id", $owner["url"]); - if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP); } else { XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); @@ -1488,7 +1513,7 @@ class OStatus $author->appendChild($urls); } - XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]); + XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]); XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]); if ($profile["publish"]) { @@ -1530,21 +1555,25 @@ class OStatus */ private static function constructObjecttype(array $item) { - if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) + if (!empty($item['object-type']) && in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) { return $item['object-type']; + } + return ACTIVITY_OBJ_NOTE; } /** * @brief Adds an entry element to the XML document * - * @param object $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 - * @param bool $feed_mode Behave like a regular feed for users if true + * @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 + * @param bool $feed_mode Behave like a regular feed for users if true * - * @return object Entry element + * @return \DOMElement Entry element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false, $feed_mode = false) { @@ -1571,10 +1600,11 @@ class OStatus /** * @brief Adds a source entry to the XML document * - * @param object $doc XML document - * @param array $contact Array of the contact that is added + * @param DOMDocument $doc XML document + * @param array $contact Array of the contact that is added * - * @return object Source element + * @return \DOMElement Source element + * @throws \Exception */ private static function sourceEntry(DOMDocument $doc, array $contact) { @@ -1596,6 +1626,8 @@ class OStatus * @param array $owner Contact data of the poster * * @return array Contact array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function contactEntry($url, array $owner) { @@ -1619,7 +1651,7 @@ class OStatus } if (!DBA::isResult($r)) { - $contact = owner; + $contact = $owner; } if (!isset($contact["poll"])) { @@ -1643,13 +1675,15 @@ class OStatus /** * @brief Adds an entry element with reshared content * - * @param object $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)? + * @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 object Entry element + * @return bool Entry element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel) { @@ -1657,7 +1691,7 @@ class OStatus Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); + $entry = self::entryHeader($doc, $owner, $item, $toplevel); $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]]; @@ -1707,12 +1741,14 @@ class OStatus /** * @brief Adds an entry element with a "like" * - * @param object $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 Is it for en entry element (false) or a feed entry (true)? + * @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 Is it for en entry element (false) or a feed entry (true)? * - * @return object Entry element with "like" + * @return \DOMElement Entry element with "like" + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel) { @@ -1720,24 +1756,21 @@ class OStatus Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); + $entry = self::entryHeader($doc, $owner, $item, $toplevel); $verb = NAMESPACE_ACTIVITY_SCHEMA."favorite"; self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false); - $as_object = $doc->createElement("activity:object"); - $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); + if (DBA::isResult($parent)) { + $as_object = $doc->createElement("activity:object"); - if (!$parent) { - $parent = []; - } - - XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent)); + XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent)); - self::entryContent($doc, $as_object, $parent, $owner, "New entry"); + self::entryContent($doc, $as_object, $parent, $owner, "New entry"); - $entry->appendChild($as_object); + $entry->appendChild($as_object); + } self::entryFooter($doc, $entry, $item, $owner); @@ -1747,9 +1780,9 @@ class OStatus /** * @brief Adds the person object element to the XML document * - * @param object $doc XML document - * @param array $owner Contact data of the poster - * @param array $contact Contact data of the target + * @param DOMDocument $doc XML document + * @param array $owner Contact data of the poster + * @param array $contact Contact data of the target * * @return object author element */ @@ -1792,12 +1825,14 @@ class OStatus /** * @brief Adds a follow/unfollow entry element * - * @param object $doc XML document - * @param array $item Data of the follow/unfollow message - * @param array $owner Contact data of the poster - * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? + * @param DOMDocument $doc XML document + * @param array $item Data of the follow/unfollow message + * @param array $owner Contact data of the poster + * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? * - * @return object Entry element + * @return \DOMElement Entry element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel) { @@ -1839,7 +1874,7 @@ class OStatus $item["body"] = sprintf($message, $owner["nick"], $contact["nick"]); - self::entryHeader($doc, $entry, $owner, $item, $toplevel); + $entry = self::entryHeader($doc, $owner, $item, $toplevel); self::entryContent($doc, $entry, $item, $owner, $title); @@ -1854,13 +1889,15 @@ class OStatus /** * @brief Adds a regular entry element * - * @param object $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 Is it for en entry element (false) or a feed entry (true)? - * @param bool $feed_mode Behave like a regular feed for users if true + * @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 Is it for en entry element (false) or a feed entry (true)? + * @param bool $feed_mode Behave like a regular feed for users if true * - * @return object Entry element + * @return \DOMElement Entry element + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel, $feed_mode) { @@ -1868,13 +1905,23 @@ class OStatus Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); + if (!$toplevel) { + if (!empty($item['title'])) { + $title = BBCode::convert($item['title'], false, 7); + } else { + $title = sprintf("New note by %s", $owner["nick"]); + } + } else { + $title = sprintf("New comment by %s", $owner["nick"]); + } + + $entry = self::entryHeader($doc, $owner, $item, $toplevel); XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); self::entryContent($doc, $entry, $item, $owner, $title, '', true, $feed_mode); - self::entryFooter($doc, $entry, $item, $owner); + self::entryFooter($doc, $entry, $item, $owner, !$feed_mode, $feed_mode); return $entry; } @@ -1882,25 +1929,21 @@ class OStatus /** * @brief Adds a header element to the XML document * - * @param object $doc XML document - * @param object $entry The entry element where the elements are added - * @param array $owner Contact data of the poster - * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? + * @param DOMDocument $doc XML document + * @param array $owner Contact data of the poster + * @param array $item + * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? * - * @return string The title for the element + * @return \DOMElement The entry element where the elements are added + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel) + private static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel) { - /// @todo Check if this title stuff is really needed (I guess not) if (!$toplevel) { $entry = $doc->createElement("entry"); - if (!empty($item['title'])) { - $title = BBCode::convert($item['title'], false, 7); - } else { - $title = sprintf("New note by %s", $owner["nick"]); - } - if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { $contact = self::contactEntry($item['author-link'], $owner); $author = self::addAuthor($doc, $contact, false); $entry->appendChild($author); @@ -1919,33 +1962,33 @@ class OStatus $author = self::addAuthor($doc, $owner); $entry->appendChild($author); - - $title = sprintf("New comment by %s", $owner["nick"]); } - return $title; + + return $entry; } /** * @brief Adds elements to the XML document * - * @param object $doc XML document - * @param object $entry Entry element where the content is added - * @param array $item Data of the item that is to be posted - * @param array $owner Contact data of the poster - * @param string $title Title for the post - * @param string $verb The activity verb - * @param bool $complete Add the "status_net" element? - * @param bool $feed_mode Behave like a regular feed for users if true + * @param DOMDocument $doc XML document + * @param \DOMElement $entry Entry element where the content is added + * @param array $item Data of the item that is to be posted + * @param array $owner Contact data of the poster + * @param string $title Title for the post + * @param string $verb The activity verb + * @param bool $complete Add the "status_net" element? + * @param bool $feed_mode Behave like a regular feed for users if true * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false) + private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false) { if ($verb == "") { $verb = self::constructVerb($item); } XML::addElement($doc, $entry, "id", $item["uri"]); - XML::addElement($doc, $entry, "title", $title); + XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8')); $body = self::formatPicturePost($item['body']); @@ -1961,11 +2004,13 @@ class OStatus "href" => System::baseUrl()."/display/".$item["guid"]] ); - if ($complete && ($item["id"] > 0)) { + if (!$feed_mode && $complete && ($item["id"] > 0)) { XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]); } - XML::addElement($doc, $entry, "activity:verb", $verb); + if (!$feed_mode) { + XML::addElement($doc, $entry, "activity:verb", $verb); + } XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM)); XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM)); @@ -1974,14 +2019,16 @@ class OStatus /** * @brief Adds the elements at the foot of an entry to the XML document * - * @param object $doc XML document - * @param object $entry The entry element where the elements are added - * @param array $item Data of the item that is to be posted - * @param array $owner Contact data of the poster - * @param bool $complete default true + * @param DOMDocument $doc XML document + * @param object $entry The entry element where the elements are added + * @param array $item Data of the item that is to be posted + * @param array $owner Contact data of the poster + * @param bool $complete default true + * @param bool $feed_mode Behave like a regular feed for users if true * @return void + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true) + private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false) { $mentioned = []; @@ -2012,7 +2059,7 @@ class OStatus XML::addElement($doc, $entry, "link", "", $attributes); } - if (intval($item["parent"]) > 0) { + if (!$feed_mode && (intval($item["parent"]) > 0)) { $conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']); if (isset($parent_item)) { @@ -2058,8 +2105,8 @@ class OStatus foreach ($mentioned as $mention) { $condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)]; $contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition); - if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) || - ($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) { + if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) || + ($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) { XML::addElement($doc, $entry, "link", "", [ "rel" => "mentioned", @@ -2076,7 +2123,7 @@ class OStatus } } - if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { XML::addElement($doc, $entry, "link", "", [ "rel" => "mentioned", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group", @@ -2084,7 +2131,7 @@ class OStatus ]); } - if (!$item["private"]) { + if (!$item["private"] && !$feed_mode) { XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention", "href" => "http://activityschema.org/collection/public"]); XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned", @@ -2144,6 +2191,8 @@ class OStatus * @param boolean $feed_mode Behave like a regular feed for users if true * * @return string XML feed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false, $feed_mode = false) { @@ -2175,7 +2224,7 @@ class OStatus $check_date = DateTimeFormat::utc($last_update); $authorid = Contact::getIdForURL($owner["url"], 0, true); - $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted` + $condition = ["`uid` = ? AND `received` > ? AND NOT `deleted` AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)", $owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN]; @@ -2184,13 +2233,13 @@ class OStatus $condition[] = ACTIVITY_OBJ_COMMENT; } - if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) { $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?"; $condition[] = $owner["id"]; $condition[] = $authorid; } - $params = ['order' => ['created' => true], 'limit' => $max_items]; + $params = ['order' => ['received' => true], 'limit' => $max_items]; if ($filter === 'posts') { $ret = Item::selectThread([], $condition, $params); @@ -2203,7 +2252,7 @@ class OStatus $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; - $root = self::addHeader($doc, $owner, $filter); + $root = self::addHeader($doc, $owner, $filter, $feed_mode); foreach ($items as $item) { if (Config::get('system', 'ostatus_debug')) { @@ -2235,6 +2284,8 @@ class OStatus * @param array $owner Contact data of the poster * * @return string XML for the salmon + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function salmon(array $item, array $owner) { @@ -2251,4 +2302,19 @@ class OStatus return trim($doc->saveXML()); } + + /** + * Checks if the given contact url does support OStatus + * + * @param string $url profile url + * @param boolean $update Update the profile + * @return boolean + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function isSupportedByContactUrl($url, $update = false) + { + $probe = Probe::uri($url, Protocol::OSTATUS, 0, !$update); + return $probe['network'] == Protocol::OSTATUS; + } }