X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=d56bacc67512d45fd81561ed189657bc08ed8a53;hb=3bccaccede0c39b451e23bfdcdbdcadfd5368f53;hp=aebde7b8d2b109affb206fcec412d6116bf3b2a4;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index aebde7b8d2..d56bacc675 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; @@ -23,6 +24,7 @@ use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\XML; require_once 'include/dba.php'; @@ -30,7 +32,6 @@ 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 @@ -73,32 +74,42 @@ 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, - CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; + $importer["uid"], $aliaslink, Protocol::STATUSNET, + Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } - if (!DBA::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]; + Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } - if (!DBA::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]; + $importer["uid"], $addr, Protocol::STATUSNET, + Contact::SHARING, Contact::FRIEND]; $contact = DBA::selectFirst('contact', [], $condition); } - if (DBA::is_result($contact)) { + if (DBA::isResult($contact)) { if ($contact['blocked']) { $contact['id'] = -1; } @@ -135,7 +146,7 @@ class OStatus $author["owner-id"] = $author["author-id"]; // Only update the contacts if it is an OStatus contact - if (DBA::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; @@ -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,11 +356,15 @@ 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) || empty($doc->firstChild->tagName)) { + return false; + } + $first_child = $doc->firstChild->tagName; if ($first_child == "feed") { @@ -366,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; @@ -794,8 +809,8 @@ class OStatus $conv_data = []; - $conv_data['protocol'] = PROTOCOL_SPLITTED_CONV; - $conv_data['network'] = NETWORK_OSTATUS; + $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); @@ -835,7 +850,7 @@ class OStatus $conv_data['source'] = $doc2->saveXML(); - $condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED]; + $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']]); @@ -859,7 +874,7 @@ class OStatus */ private static function fetchSelf($self, array &$item) { - $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON]; + $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; @@ -878,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); @@ -894,16 +909,16 @@ class OStatus */ private static function fetchRelated($related, $related_uri, $importer) { - $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON]; + $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON]; $conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition); - if (DBA::is_result($conversation)) { + 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]); } @@ -974,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]; + $condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION]; $conversation = DBA::selectFirst('conversation', ['source'], $condition); - if (DBA::is_result($conversation)) { + if (DBA::isResult($conversation)) { $stored = true; logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG); $xml = $conversation['source']; @@ -1003,26 +1018,26 @@ class OStatus */ 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 = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobjects); + $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 = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects); - $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects); - $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects); + $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"]; @@ -1034,11 +1049,19 @@ class OStatus $item["uri"] = $orig_uri; - $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects); + $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject); - $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects); + $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject); - $inreplyto = $xpath->query('thr:in-reply-to', $activityobjects); + // 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', $activityobject); if (is_object($inreplyto->item(0))) { foreach ($inreplyto->item(0)->attributes as $attributes) { if ($attributes->name == "ref") { @@ -1214,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); @@ -1299,7 +1322,7 @@ 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); @@ -1338,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': @@ -1352,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: @@ -1407,7 +1432,7 @@ class OStatus $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); @@ -1452,7 +1477,7 @@ class OStatus } } - if (DBA::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"); @@ -1573,27 +1598,24 @@ class OStatus { $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 (DBA::is_result($r)) { + if (DBA::isResult($r)) { $contact = $r[0]; $contact["uid"] = -1; } - if (!DBA::is_result($r)) { - $r = q( - "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link($url)) - ); - if (DBA::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 (!DBA::is_result($r)) { + if (!DBA::isResult($r)) { $contact = owner; } @@ -1610,6 +1632,8 @@ class OStatus $contact["alias"] = $contact["url"]; } + $contact['account-type'] = $owner['account-type']; + return $contact; } @@ -1633,14 +1657,13 @@ 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::is_result($repeated_item)) { + if (!DBA::isResult($repeated_item)) { return false; } $contact = self::contactEntry($repeated_item['author-link'], $owner); - $contact['account-type'] = $contact['contact-type']; $title = $owner["nick"]." repeated a notice by ".$contact["nick"]; @@ -1732,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; } @@ -1787,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 (DBA::is_result($r)) { - $connect_id = $r[0]['id']; + if (DBA::isResult($user_contact)) { + $connect_id = $user_contact['id']; } else { $connect_id = 0; } @@ -1872,7 +1892,7 @@ class OStatus $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); @@ -1962,7 +1982,7 @@ class OStatus $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]); - if (DBA::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"]; @@ -1984,12 +2004,11 @@ 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]); - if (DBA::is_result($conversation)) { + if (DBA::isResult($conversation)) { if ($conversation['conversation-uri'] != '') { $conversation_uri = $conversation['conversation-uri']; } @@ -2030,8 +2049,8 @@ 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))) { + 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", @@ -2048,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", @@ -2148,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;