X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=f589d3827f0bbc5ad85cf699df7cdb5552fa29f5;hb=6d420dfe9eace9c5a9025983957fd2b6a9e82e08;hp=bab85515bcd99290644af5d95d2aa88717153404;hpb=c13dc549ed84b0636fb0d0384ca4f532e67eed82;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index bab85515bc..f589d3827f 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -12,6 +12,7 @@ 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\DBA; use Friendica\Model\Contact; @@ -73,9 +74,19 @@ class OStatus $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, + $importer["uid"], $aliaslink, Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } @@ -87,13 +98,13 @@ class OStatus $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)", $importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink), - NETWORK_STATUSNET, Contact::SHARING, Contact::FRIEND]; + Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } if (!DBA::isResult($contact) && ($addr != '')) { $condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)", - $importer["uid"], $addr, NETWORK_STATUSNET, + $importer["uid"], $addr, Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } @@ -135,7 +146,7 @@ class OStatus $author["owner-id"] = $author["author-id"]; // Only update the contacts if it is an OStatus contact - if (DBA::isResult($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; @@ -218,7 +229,7 @@ class OStatus $gcid = GContact::update($contact); GContact::link($gcid, $contact["uid"], $contact["id"]); - } else { + } elseif ($contact["network"] != Protocol::DFRN) { $contact = null; } @@ -311,7 +322,7 @@ class OStatus self::$conv_list = []; } - logger("Import OStatus message", LOGGER_DEBUG); + logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG); if ($xml == "") { return false; @@ -345,12 +356,12 @@ class OStatus $header = []; $header["uid"] = $importer["uid"]; - $header["network"] = NETWORK_OSTATUS; + $header["network"] = Protocol::OSTATUS; $header["wall"] = 0; $header["origin"] = 0; $header["gravity"] = GRAVITY_COMMENT; - if (!is_object($doc->firstChild)) { + if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) { return false; } @@ -725,21 +736,21 @@ class OStatus self::$conv_list[$conversation] = true; - $conversation_data = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); + $curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); - if (!$conversation_data['success']) { + if (!$curlResult->isSuccess()) { return; } $xml = ''; - if (stristr($conversation_data['header'], 'Content-Type: application/atom+xml')) { - $xml = $conversation_data['body']; + if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) { + $xml = $curlResult->getBody(); } if ($xml == '') { $doc = new DOMDocument(); - if (!@$doc->loadHTML($conversation_data['body'])) { + if (!@$doc->loadHTML($curlResult->getBody())) { return; } $xpath = new DOMXPath($doc); @@ -756,8 +767,8 @@ class OStatus if ($file != '') { $conversation_atom = Network::curl($attribute['href']); - if ($conversation_atom['success']) { - $xml = $conversation_atom['body']; + if ($conversation_atom->isSuccess()) { + $xml = $conversation_atom->getBody(); } } } @@ -799,7 +810,7 @@ class OStatus $conv_data = []; $conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION; - $conv_data['network'] = NETWORK_OSTATUS; + $conv_data['network'] = Protocol::OSTATUS; $conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry); $inreplyto = $xpath->query('thr:in-reply-to', $entry); @@ -869,15 +880,15 @@ class OStatus return; } - $self_data = Network::curl($self); + $curlResult = Network::curl($self); - if (!$self_data['success']) { + if (!$curlResult->isSuccess()) { return; } // We reformat the XML to make it better readable $doc = new DOMDocument(); - $doc->loadXML($self_data['body']); + $doc->loadXML($curlResult->getBody()); $doc->preserveWhiteSpace = false; $doc->formatOutput = true; $xml = $doc->saveXML(); @@ -914,22 +925,22 @@ class OStatus } $stored = false; - $related_data = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); + $curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); - if (!$related_data['success']) { + if (!$curlResult->isSuccess()) { return; } $xml = ''; - if (stristr($related_data['header'], 'Content-Type: application/atom+xml')) { - logger('Directly fetched XML for URI '.$related_uri, LOGGER_DEBUG); - $xml = $related_data['body']; + if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) { + logger('Directly fetched XML for URI ' . $related_uri, LOGGER_DEBUG); + $xml = $curlResult->getBody(); } if ($xml == '') { $doc = new DOMDocument(); - if (!@$doc->loadHTML($related_data['body'])) { + if (!@$doc->loadHTML($curlResult->getBody())) { return; } $xpath = new DOMXPath($doc); @@ -945,11 +956,11 @@ class OStatus } } if ($atom_file != '') { - $related_atom = Network::curl($atom_file); + $curlResult = Network::curl($atom_file); - if ($related_atom['success']) { - logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG); - $xml = $related_atom['body']; + if ($curlResult->isSuccess()) { + logger('Fetched XML for URI ' . $related_uri, LOGGER_DEBUG); + $xml = $curlResult->getBody(); } } } @@ -957,22 +968,22 @@ class OStatus // Workaround for older GNU Social servers if (($xml == '') && strstr($related, '/notice/')) { - $related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom'); + $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom'); - if ($related_atom['success']) { - logger('GNU Social workaround to fetch XML for URI '.$related_uri, LOGGER_DEBUG); - $xml = $related_atom['body']; + if ($curlResult->isSuccess()) { + logger('GNU Social workaround to fetch XML for URI ' . $related_uri, LOGGER_DEBUG); + $xml = $curlResult->getBody(); } } // Even more worse workaround for GNU Social ;-) if ($xml == '') { $related_guess = OStatus::convertHref($related_uri); - $related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom'); + $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom'); - if ($related_atom['success']) { - logger('GNU Social workaround 2 to fetch XML for URI '.$related_uri, LOGGER_DEBUG); - $xml = $related_atom['body']; + if ($curlResult->isSuccess()) { + logger('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, LOGGER_DEBUG); + $xml = $curlResult->getBody(); } } @@ -1350,13 +1361,15 @@ class OStatus 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': @@ -1594,12 +1607,9 @@ class OStatus } if (!DBA::isResult($r)) { - $r = q( - "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - DBA::escape(normalise_link($url)) - ); + $gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]); if (DBA::isResult($r)) { - $contact = $r[0]; + $contact = $gcontact; $contact["uid"] = -1; $contact["success_update"] = $contact["updated"]; } @@ -1647,7 +1657,7 @@ 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 (!DBA::isResult($repeated_item)) { return false; @@ -1745,7 +1755,7 @@ class OStatus $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; } @@ -1800,14 +1810,11 @@ class OStatus $item['follow'] = $contact['alias']; } - $r = q( - "SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", - intval($owner['uid']), - DBA::escape(normalise_link($contact["url"])) - ); + $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])]; + $user_contact = DBA::selectFirst('contact', ['id'], $condition); - if (DBA::isResult($r)) { - $connect_id = $r[0]['id']; + if (DBA::isResult($user_contact)) { + $connect_id = $user_contact['id']; } else { $connect_id = 0; } @@ -1823,7 +1830,7 @@ class OStatus } $item["uri"] = $item['parent-uri'] = $item['thr-parent'] - = 'tag:'.get_app()->get_hostname(). + = 'tag:'.get_app()->getHostName(). ','.date('Y-m-d').':'.$action.':'.$owner['uid']. ':person:'.$connect_id.':'.$item['created']; @@ -1997,8 +2004,7 @@ 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('/objects/', '/context/', $item['parent-uri']); if (isset($parent_item)) { $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]); @@ -2161,7 +2167,7 @@ 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` = ? ";