X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=2eb8c55390afd2bcb0e26ff30e719227a7c5edbf;hb=b043c7e0f2658e32d19ccd61120df6994d8e555a;hp=4538d36dfa11676844c858661493d1ddf81c0c89;hpb=1e9bff88bc05fce154edee9f047e7d8922184140;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 4538d36dfa..2eb8c55390 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -4,13 +4,17 @@ */ namespace Friendica\Protocol; +use DOMDocument; +use DOMXPath; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Lock; +use Friendica\Core\Protocol; use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\GContact; @@ -19,19 +23,15 @@ use Friendica\Model\User; use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Lock; use Friendica\Util\Network; +use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\XML; -use dba; -use DOMDocument; -use DOMXPath; 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'; -require_once 'mod/proxy.php'; /** * @brief This class contain functions for the OStatus protocol @@ -52,52 +52,64 @@ class OStatus * * @return array Array of author related entries for the item */ - private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch) + private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch) { $author = []; - $author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue; - $author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue; - $addr = $xpath->evaluate('atom:author/atom:email/text()', $context)->item(0)->nodeValue; + $author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context); + $author["author-name"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $context); + $addr = XML::getFirstNodeValue($xpath, 'atom:author/atom:email/text()', $context); $aliaslink = $author["author-link"]; - $alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes; - if (is_object($alternate)) { - foreach ($alternate as $attributes) { + $alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0); + if (is_object($alternate_item)) { + foreach ($alternate_item->attributes as $attributes) { if (($attributes->name == "href") && ($attributes->textContent != "")) { $author["author-link"] = $attributes->textContent; } } } + $author["author-id"] = Contact::getIdForURL($author["author-link"]); + $author["contact-id"] = $contact["id"]; $contact = null; + +/* + This here would be better, but we would get problems with contacts from the statusnet addon + This is kept here as a reminder for the future + + $cid = Contact::getIdForURL($author["author-link"], $importer["uid"]); + if ($cid) { + $contact = DBA::selectFirst('contact', [], ['id' => $cid]); + } +*/ if ($aliaslink != '') { $condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)", - $importer["uid"], $aliaslink, NETWORK_STATUSNET, - CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; - $contact = dba::selectFirst('contact', [], $condition); + $importer["uid"], $aliaslink, Protocol::STATUSNET, + Contact::SHARING, Contact::FRIEND]; + $contact = DBA::selectFirst('contact', [], $condition); } - if (!DBM::is_result($contact) && $author["author-link"] != '') { + if (!DBA::isResult($contact) && $author["author-link"] != '') { if ($aliaslink == "") { $aliaslink = $author["author-link"]; } $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)", $importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink), - NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; - $contact = dba::selectFirst('contact', [], $condition); + Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND]; + $contact = DBA::selectFirst('contact', [], $condition); } - if (!DBM::is_result($contact) && ($addr != '')) { + if (!DBA::isResult($contact) && ($addr != '')) { $condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)", - $importer["uid"], $addr, NETWORK_STATUSNET, - CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; - $contact = dba::selectFirst('contact', [], $condition); + $importer["uid"], $addr, Protocol::STATUSNET, + Contact::SHARING, Contact::FRIEND]; + $contact = DBA::selectFirst('contact', [], $condition); } - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { if ($contact['blocked']) { $contact['id'] = -1; } @@ -126,17 +138,15 @@ class OStatus $author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]); } - $displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue; + $displayname = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context); if ($displayname != "") { $author["author-name"] = $displayname; } - $author["owner-name"] = $author["author-name"]; - $author["owner-link"] = $author["author-link"]; - $author["owner-avatar"] = $author["author-avatar"]; + $author["owner-id"] = $author["author-id"]; // Only update the contacts if it is an OStatus contact - if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) { + if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == Protocol::OSTATUS)) { // Update contact data $current = $contact; @@ -155,34 +165,34 @@ class OStatus $contact['url'] = $author["author-link"]; $contact['nurl'] = normalise_link($contact['url']); - $value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context); if ($value != "") { $contact["alias"] = $value; } - $value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context); if ($value != "") { $contact["name"] = $value; } - $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context); if ($value != "") { $contact["nick"] = $value; } - $value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()', $context); if ($value != "") { $contact["about"] = HTML::toBBCode($value); } - $value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()', $context); if ($value != "") { $contact["location"] = $value; } $contact['name-date'] = DateTimeFormat::utcNow(); - dba::update('contact', $contact, ['id' => $contact["id"]], $current); + DBA::update('contact', $contact, ['id' => $contact["id"]], $current); if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) { logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG); @@ -194,7 +204,7 @@ class OStatus if ($cid) { $fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location']; - $old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]); + $old_contact = DBA::selectFirst('contact', $fields, ['id' => $cid]); // Update it with the current values $fields = ['url' => $author["author-link"], 'name' => $contact["name"], @@ -203,18 +213,24 @@ class OStatus 'about' => $contact["about"], 'location' => $contact["location"], 'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()]; - dba::update('contact', $fields, ['id' => $cid], $old_contact); + DBA::update('contact', $fields, ['id' => $cid], $old_contact); // Update the avatar - Contact::updateAvatar($author["author-avatar"], 0, $cid); + if (!empty($author["author-avatar"])) { + Contact::updateAvatar($author["author-avatar"], 0, $cid); + } } $contact["generation"] = 2; $contact["hide"] = false; // OStatus contacts are never hidden - $contact["photo"] = $author["author-avatar"]; + if (!empty($author["author-avatar"])) { + $contact["photo"] = $author["author-avatar"]; + } $gcid = GContact::update($contact); GContact::link($gcid, $contact["uid"], $contact["id"]); + } elseif ($contact["network"] != Protocol::DFRN) { + $contact = null; } return $author; @@ -228,7 +244,7 @@ class OStatus * * @return array Array of author related entries for the item */ - public static function salmonAuthor($xml, $importer) + public static function salmonAuthor($xml, array $importer) { if ($xml == "") { return; @@ -282,7 +298,7 @@ class OStatus * @param string $hub Called by reference, returns the fetched hub data * @return void */ - public static function import($xml, $importer, &$contact, &$hub) + public static function import($xml, array $importer, array &$contact = null, &$hub) { self::process($xml, $importer, $contact, $hub); } @@ -299,14 +315,14 @@ class OStatus * * @return boolean Could the XML be processed? */ - private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true) + private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true) { if ($initialize) { self::$itemlist = []; self::$conv_list = []; } - logger("Import OStatus message", LOGGER_DEBUG); + logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG); if ($xml == "") { return false; @@ -325,23 +341,29 @@ class OStatus $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET); $hub = ""; - $hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes; - if (is_object($hub_attributes)) { - foreach ($hub_attributes as $hub_attribute) { - if ($hub_attribute->name == "href") { - $hub = $hub_attribute->textContent; - logger("Found hub ".$hub, LOGGER_DEBUG); + $hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0); + if (is_object($hub_items)) { + $hub_attributes = $hub_items->attributes; + if (is_object($hub_attributes)) { + foreach ($hub_attributes as $hub_attribute) { + if ($hub_attribute->name == "href") { + $hub = $hub_attribute->textContent; + logger("Found hub ".$hub, LOGGER_DEBUG); + } } } } $header = []; $header["uid"] = $importer["uid"]; - $header["network"] = NETWORK_OSTATUS; - $header["type"] = "remote"; + $header["network"] = Protocol::OSTATUS; $header["wall"] = 0; $header["origin"] = 0; - $header["gravity"] = GRAVITY_PARENT; + $header["gravity"] = GRAVITY_COMMENT; + + if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) { + return false; + } $first_child = $doc->firstChild->tagName; @@ -359,7 +381,7 @@ class OStatus $doc2->formatOutput = true; $xml2 = $doc2->saveXML(); - $header["protocol"] = PROTOCOL_OSTATUS_SALMON; + $header["protocol"] = Conversation::PARCEL_SALMON; $header["source"] = $xml2; } elseif (!$initialize) { return false; @@ -390,7 +412,7 @@ class OStatus $author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored); } - $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $entry)->item(0)->nodeValue; + $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry); if ($value != "") { $nickname = $value; } else { @@ -399,9 +421,9 @@ class OStatus $item = array_merge($header, $author); - $item["uri"] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue; + $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry); - $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; + $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $entry); // Delete a message if (in_array($item["verb"], ['qvitter-delete-notice', ACTIVITY_DELETE, 'delete'])) { @@ -441,6 +463,7 @@ class OStatus } if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") { + $dummy = null; Contact::removeFollower($importer, $contact, $item, $dummy); continue; } @@ -452,6 +475,7 @@ class OStatus $item["verb"] = ACTIVITY_LIKE; $item["parent-uri"] = $orig_uri; $item["gravity"] = GRAVITY_ACTIVITY; + $item["object-type"] = ACTIVITY_OBJ_NOTE; } // http://activitystrea.ms/schema/1.0/rsvp-yes @@ -513,9 +537,9 @@ class OStatus logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG); } else { // We are having duplicated entries. Hopefully this solves it. - if (Lock::set('ostatus_process_item_insert')) { + if (Lock::acquire('ostatus_process_item_insert')) { $ret = Item::insert($item); - Lock::remove('ostatus_process_item_insert'); + Lock::release('ostatus_process_item_insert'); logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret); } else { $ret = Item::insert($item); @@ -532,10 +556,11 @@ class OStatus } /** - * @param object $item item + * Removes notice item from database + * @param array $item item * @return void */ - private static function deleteNotice($item) + private static function deleteNotice(array $item) { $condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']]; if (!Item::exists($condition)) { @@ -557,21 +582,20 @@ class OStatus * @param array $importer user record of the importing user * @return void */ - private static function processPost($xpath, $entry, &$item, $importer) + private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer) { - $item["body"] = HTML::toBBCode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue); - $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue; + $item["body"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry)); + $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry); if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { - $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; - $item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry); + $item["body"] = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry); } elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) { - $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; + $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry); } - $item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue; - $item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue; - $conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue; - $item['conversation-uri'] = $conversation; + $item["created"] = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry); + $item["edited"] = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry); + $item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry); $conv = $xpath->query('ostatus:conversation', $entry); if (is_object($conv->item(0))) { @@ -610,9 +634,12 @@ class OStatus foreach ($category->attributes as $attributes) { if ($attributes->name == "term") { $term = $attributes->textContent; - if (strlen($item["tag"])) { + if (!empty($item["tag"])) { $item["tag"] .= ','; + } else { + $item["tag"] = ''; } + $item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]"; } } @@ -659,7 +686,7 @@ class OStatus // Mastodon Content Warning if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) { - $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; + $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry); if (!empty($clear_text)) { $item['content-warning'] = HTML::toBBCode($clear_text); } @@ -681,11 +708,9 @@ class OStatus } else { logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG); } - - $item["type"] = 'remote-comment'; - $item["gravity"] = GRAVITY_COMMENT; } else { $item["parent-uri"] = $item["uri"]; + $item["gravity"] = GRAVITY_PARENT; } if (($item['author-link'] != '') && !empty($item['protocol'])) { @@ -784,9 +809,9 @@ class OStatus $conv_data = []; - $conv_data['protocol'] = PROTOCOL_SPLITTED_CONV; - $conv_data['network'] = NETWORK_OSTATUS; - $conv_data['uri'] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue; + $conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION; + $conv_data['network'] = Protocol::OSTATUS; + $conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry); $inreplyto = $xpath->query('thr:in-reply-to', $entry); if (is_object($inreplyto->item(0))) { @@ -797,8 +822,7 @@ class OStatus } } - $conv = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue; - $conv_data['conversation-uri'] = $conv; + $conv_data['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry); $conv = $xpath->query('ostatus:conversation', $entry); if (is_object($conv->item(0))) { @@ -826,10 +850,10 @@ class OStatus $conv_data['source'] = $doc2->saveXML(); - $condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED]; - if (dba::exists('conversation', $condition)) { + $condition = ['item-uri' => $conv_data['uri'],'protocol' => Conversation::PARCEL_FEED]; + if (DBA::exists('conversation', $condition)) { logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG); - dba::delete('conversation', ['item-uri' => $conv_data['uri']]); + DBA::delete('conversation', ['item-uri' => $conv_data['uri']]); } logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG); @@ -848,10 +872,10 @@ class OStatus * @param array $item The item array * @return void */ - private static function fetchSelf($self, &$item) + private static function fetchSelf($self, array &$item) { - $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON]; - if (dba::exists('conversation', $condition)) { + $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON]; + if (DBA::exists('conversation', $condition)) { logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG); return; } @@ -869,7 +893,7 @@ class OStatus $doc->formatOutput = true; $xml = $doc->saveXML(); - $item["protocol"] = PROTOCOL_OSTATUS_SALMON; + $item["protocol"] = Conversation::PARCEL_SALMON; $item["source"] = $xml; logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG); @@ -885,18 +909,18 @@ class OStatus */ private static function fetchRelated($related, $related_uri, $importer) { - $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON]; - $conversation = dba::selectFirst('conversation', ['source', 'protocol'], $condition); - if (DBM::is_result($conversation)) { + $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON]; + $conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition); + if (DBA::isResult($conversation)) { $stored = true; $xml = $conversation['source']; if (self::process($xml, $importer, $contact, $hub, $stored, false)) { logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG); return; } - if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) { + if ($conversation['protocol'] == Conversation::PARCEL_SALMON) { logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG); - dba::delete('conversation', ['item-uri' => $related_uri]); + DBA::delete('conversation', ['item-uri' => $related_uri]); } } @@ -965,9 +989,9 @@ class OStatus // Finally we take the data that we fetched from "ostatus:conversation" if ($xml == '') { - $condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV]; - $conversation = dba::selectFirst('conversation', ['source'], $condition); - if (DBM::is_result($conversation)) { + $condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION]; + $conversation = DBA::selectFirst('conversation', ['source'], $condition); + if (DBA::isResult($conversation)) { $stored = true; logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG); $xml = $conversation['source']; @@ -992,32 +1016,32 @@ class OStatus * * @return array with data from links */ - private static function processRepeatedItem($xpath, $entry, &$item, $importer) + private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer) { - $activityobjects = $xpath->query('activity:object', $entry)->item(0); + $activityobject = $xpath->query('activity:object', $entry)->item(0); - if (!is_object($activityobjects)) { + if (!is_object($activityobject)) { return []; } $link_data = []; - $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue; + $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject); - $links = $xpath->query("atom:link", $activityobjects); + $links = $xpath->query("atom:link", $activityobject); if ($links) { $link_data = self::processLinks($links, $item); } - $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue; - $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue; - $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue; + $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobject); + $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobject); + $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobject); - $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false); + $orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false); $item["author-name"] = $orig_author["author-name"]; $item["author-link"] = $orig_author["author-link"]; - $item["author-avatar"] = $orig_author["author-avatar"]; + $item["author-id"] = $orig_author["author-id"]; $item["body"] = HTML::toBBCode($orig_body); $item["created"] = $orig_created; @@ -1025,11 +1049,19 @@ class OStatus $item["uri"] = $orig_uri; - $item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue; + $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject); + + $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject); - $item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue; + // Mastodon Content Warning + if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) { + $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject); + if (!empty($clear_text)) { + $item['content-warning'] = HTML::toBBCode($clear_text); + } + } - $inreplyto = $xpath->query('thr:in-reply-to', $activityobjects); + $inreplyto = $xpath->query('thr:in-reply-to', $activityobject); if (is_object($inreplyto->item(0))) { foreach ($inreplyto->item(0)->attributes as $attributes) { if ($attributes->name == "ref") { @@ -1049,14 +1081,14 @@ class OStatus * * @return array with data from the links */ - private static function processLinks($links, &$item) + private static function processLinks($links, array &$item) { $link_data = ['add_body' => '', 'self' => '']; foreach ($links as $link) { $attribute = self::readAttributes($link); - if (($attribute['rel'] != "") && ($attribute['href'] != "")) { + if (!empty($attribute['rel']) && !empty($attribute['href'])) { switch ($attribute['rel']) { case "alternate": $item["plink"] = $attribute['href']; @@ -1078,13 +1110,15 @@ class OStatus if ($filetype == 'image') { $link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]'; } else { - if (strlen($item["attach"])) { + if (!empty($item["attach"])) { $item["attach"] .= ','; + } else { + $item["attach"] = ''; } if (!isset($attribute['length'])) { $attribute['length'] = "0"; } - $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]'; + $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]'; } break; case "related": @@ -1098,7 +1132,7 @@ class OStatus } break; case "self": - if ($item["plink"] == '') { + if (empty($item["plink"])) { $item["plink"] = $attribute['href']; } $link_data['self'] = $attribute['href']; @@ -1149,7 +1183,7 @@ class OStatus * * @return string The guid if the post is a reshare */ - private static function getResharedGuid($item) + private static function getResharedGuid(array $item) { $body = trim($item["body"]); @@ -1172,12 +1206,12 @@ class OStatus $guid = ""; preg_match("/guid='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $guid = $matches[1]; } preg_match('/guid="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $guid = $matches[1]; } @@ -1203,7 +1237,7 @@ class OStatus } // Is it a remote picture? Then make a smaller preview here - $preview = proxy_url($preview, false, PROXY_SIZE_SMALL); + $preview = ProxyUtils::proxifyUrl($preview, false, ProxyUtils::SIZE_SMALL); // Is it a local picture? Then make it smaller here $preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview); @@ -1230,7 +1264,7 @@ class OStatus * * @return object header root element */ - private static function addHeader($doc, $owner, $filter) + private static function addHeader(DOMDocument $doc, array $owner, $filter) { $a = get_app(); @@ -1257,7 +1291,7 @@ class OStatus XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "title", $title); - XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"])); + XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename'))); XML::addElement($doc, $root, "logo", $owner["photo"]); XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM)); @@ -1288,10 +1322,10 @@ class OStatus "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes); - if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false, 'archive' => false, 'hidden' => false, 'blocked' => false]; - $members = dba::count('contact', $condition); + $members = DBA::count('contact', $condition); XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]); } @@ -1306,7 +1340,7 @@ class OStatus * @param object $nick nick * @return void */ - public static function hublinks($doc, $root, $nick) + public static function hublinks(DOMDocument $doc, $root, $nick) { $h = System::baseUrl() . '/pubsubhubbub/'.$nick; XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]); @@ -1320,20 +1354,22 @@ class OStatus * @param array $item Data of the item that is to be posted * @return void */ - private static function getAttachment($doc, $root, $item) + private static function getAttachment(DOMDocument $doc, $root, $item) { $o = ""; $siteinfo = BBCode::getAttachedData($item["body"]); switch ($siteinfo["type"]) { case 'photo': - $imgdata = Image::getInfoFromURL($siteinfo["image"]); - if ($imgdata) { - $attributes = ["rel" => "enclosure", - "href" => $siteinfo["image"], - "type" => $imgdata["mime"], - "length" => intval($imgdata["size"])]; - XML::addElement($doc, $root, "link", "", $attributes); + if (!empty($siteinfo["image"])) { + $imgdata = Image::getInfoFromURL($siteinfo["image"]); + if ($imgdata) { + $attributes = ["rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])]; + XML::addElement($doc, $root, "link", "", $attributes); + } } break; case 'video': @@ -1341,7 +1377,7 @@ class OStatus "href" => $siteinfo["url"], "type" => "text/html; charset=UTF-8", "length" => "", - "title" => $siteinfo["title"]]; + "title" => defaults($siteinfo, "title", $siteinfo["url"])]; XML::addElement($doc, $root, "link", "", $attributes); break; default: @@ -1387,15 +1423,16 @@ class OStatus * * @param object $doc XML document * @param array $owner Contact data of the poster + * @param bool $show_profile Whether to show profile * * @return object author element */ - private static function addAuthor($doc, $owner, $show_profile = true) + private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true) { - $profile = dba::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => 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'] == ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP); } else { XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); @@ -1440,7 +1477,7 @@ class OStatus } } - if (DBM::is_result($profile) && !$show_profile) { + if (DBA::isResult($profile) && !$show_profile) { if (trim($profile["homepage"]) != "") { $urls = $doc->createElement("poco:urls"); XML::addElement($doc, $urls, "poco:type", "homepage"); @@ -1473,9 +1510,9 @@ class OStatus * * @return string activity */ - private static function constructVerb($item) + private static function constructVerb(array $item) { - if ($item['verb']) { + if (!empty($item['verb'])) { return $item['verb']; } @@ -1489,7 +1526,7 @@ class OStatus * * @return string Object type */ - private static function constructObjecttype($item) + private static function constructObjecttype(array $item) { if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) return $item['object-type']; @@ -1506,7 +1543,7 @@ class OStatus * * @return object Entry element */ - private static function entry($doc, $item, $owner, $toplevel = false) + private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false) { $xml = null; @@ -1536,7 +1573,7 @@ class OStatus * * @return object Source element */ - private static function sourceEntry($doc, $contact) + private static function sourceEntry(DOMDocument $doc, array $contact) { $source = $doc->createElement("source"); XML::addElement($doc, $source, "id", $contact["poll"]); @@ -1557,31 +1594,28 @@ class OStatus * * @return array Contact array */ - private static function contactEntry($url, $owner) + private static function contactEntry($url, array $owner) { $r = q( "SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1", - dbesc(normalise_link($url)), + DBA::escape(normalise_link($url)), intval($owner["uid"]) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $contact = $r[0]; $contact["uid"] = -1; } - if (!DBM::is_result($r)) { - $r = q( - "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link($url)) - ); - if (DBM::is_result($r)) { - $contact = $r[0]; + if (!DBA::isResult($r)) { + $gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]); + if (DBA::isResult($r)) { + $contact = $gcontact; $contact["uid"] = -1; $contact["success_update"] = $contact["updated"]; } } - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $contact = owner; } @@ -1598,6 +1632,8 @@ class OStatus $contact["alias"] = $contact["url"]; } + $contact['account-type'] = $owner['account-type']; + return $contact; } @@ -1612,7 +1648,7 @@ class OStatus * * @return object Entry element */ - private static function reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel) + private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel) { if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); @@ -1621,9 +1657,9 @@ class OStatus $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false, - 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]]; + 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]]; $repeated_item = Item::selectFirst([], $condition); - if (!DBM::is_result($repeated_item)) { + if (!DBA::isResult($repeated_item)) { return false; } @@ -1675,7 +1711,7 @@ class OStatus * * @return object Entry element with "like" */ - private static function likeEntry($doc, $item, $owner, $toplevel) + private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel) { if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); @@ -1690,6 +1726,10 @@ class OStatus $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); + if (!$parent) { + $parent = []; + } + XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent)); self::entryContent($doc, $as_object, $parent, $owner, "New entry"); @@ -1710,12 +1750,12 @@ class OStatus * * @return object author element */ - private static function addPersonObject($doc, $owner, $contact) + private static function addPersonObject(DOMDocument $doc, array $owner, array $contact) { $object = $doc->createElement("activity:object"); XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON); - if ($contact['network'] == NETWORK_PHANTOM) { + if ($contact['network'] == Protocol::PHANTOM) { XML::addElement($doc, $object, "id", $contact['url']); return $object; } @@ -1756,7 +1796,7 @@ class OStatus * * @return object Entry element */ - private static function followEntry($doc, $item, $owner, $toplevel) + private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel) { $item["id"] = $item["parent"] = 0; $item["created"] = $item["edited"] = date("c"); @@ -1770,14 +1810,11 @@ class OStatus $item['follow'] = $contact['alias']; } - $r = q( - "SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", - intval($owner['uid']), - dbesc(normalise_link($contact["url"])) - ); + $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])]; + $user_contact = DBA::selectFirst('contact', ['id'], $condition); - if (DBM::is_result($r)) { - $connect_id = $r[0]['id']; + if (DBA::isResult($user_contact)) { + $connect_id = $user_contact['id']; } else { $connect_id = 0; } @@ -1821,7 +1858,7 @@ class OStatus * * @return object Entry element */ - private static function noteEntry($doc, $item, $owner, $toplevel) + private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel) { if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); @@ -1848,14 +1885,14 @@ class OStatus * * @return string The title for the element */ - private static function entryHeader($doc, &$entry, $owner, $item, $toplevel) + private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel) { /// @todo Check if this title stuff is really needed (I guess not) if (!$toplevel) { $entry = $doc->createElement("entry"); $title = sprintf("New note by %s", $owner["nick"]); - if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { $contact = self::contactEntry($item['author-link'], $owner); $author = self::addAuthor($doc, $contact, false); $entry->appendChild($author); @@ -1892,7 +1929,7 @@ class OStatus * @param bool $complete Add the "status_net" element? * @return void */ - private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true) + private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true) { if ($verb == "") { $verb = self::constructVerb($item); @@ -1935,7 +1972,7 @@ class OStatus * @param bool $complete default true * @return void */ - private static function entryFooter($doc, $entry, array $item, array $owner, $complete = true) + private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true) { $mentioned = []; @@ -1945,7 +1982,7 @@ class OStatus $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]); - if (DBM::is_result($thrparent)) { + if (DBA::isResult($thrparent)) { $mentioned[$thrparent["author-link"]] = $thrparent["author-link"]; $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"]; $parent_plink = $thrparent["plink"]; @@ -1967,16 +2004,15 @@ class OStatus } if (intval($item["parent"]) > 0) { - $conversation_href = System::baseUrl()."/display/".$owner["nick"]."/".$item["parent"]; - $conversation_uri = $conversation_href; + $conversation_href = $conversation_uri = str_replace('/object/', '/context/', $item['parent-uri']); if (isset($parent_item)) { - $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]); - if (DBM::is_result($conversation)) { - if ($r['conversation-uri'] != '') { + $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]); + if (DBA::isResult($conversation)) { + if ($conversation['conversation-uri'] != '') { $conversation_uri = $conversation['conversation-uri']; } - if ($r['conversation-href'] != '') { + if ($conversation['conversation-href'] != '') { $conversation_href = $conversation['conversation-href']; } } @@ -2012,9 +2048,9 @@ class OStatus foreach ($mentioned as $mention) { $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)]; - $contact = dba::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition); - if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) || - ($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) { + $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))) { XML::addElement($doc, $entry, "link", "", [ "rel" => "mentioned", @@ -2031,7 +2067,7 @@ class OStatus } } - if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { XML::addElement($doc, $entry, "link", "", [ "rel" => "mentioned", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group", @@ -2131,14 +2167,14 @@ class OStatus $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted` AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)", - $owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN]; + $owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN]; if ($filter === 'comments') { $condition[0] .= " AND `object-type` = ? "; $condition[] = ACTIVITY_OBJ_COMMENT; } - if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) { + if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) { $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?"; $condition[] = $owner["id"]; $condition[] = $authorid; @@ -2189,7 +2225,7 @@ class OStatus * * @return string XML for the salmon */ - public static function salmon($item, $owner) + public static function salmon(array $item, array $owner) { $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true;