X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=8b6939214496aa61ff92b5598cc120ed397f4e0c;hb=d372014d2eb51a53dd1f695d6eb9770a7365e7dc;hp=7ad6f50f1f05e6eab582a5939d6716ddd14eeee2;hpb=79696a19e505ecded7b257f511ad1691ccb311f4;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 7ad6f50f1f..8b69392144 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -5,6 +5,7 @@ namespace Friendica\Protocol; use Friendica\Content\Text\BBCode; +use Friendica\Content\Text\HTML; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\L10n; @@ -25,8 +26,6 @@ use DOMDocument; use DOMXPath; require_once 'include/dba.php'; -require_once 'include/html2bbcode.php'; -require_once 'include/bbcode.php'; require_once 'include/items.php'; require_once 'mod/share.php'; require_once 'include/enotify.php'; @@ -73,8 +72,9 @@ class OStatus $contact = null; if ($aliaslink != '') { - $condition = ["`uid` = ? AND `alias` = ? AND `network` != ?", - $importer["uid"], $aliaslink, NETWORK_STATUSNET]; + $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); } @@ -83,14 +83,16 @@ class OStatus $aliaslink = $author["author-link"]; } - $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ?", $importer["uid"], - normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET]; + $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); } if (!DBM::is_result($contact) && ($addr != '')) { - $condition = ["`uid` = ? AND `addr` = ? AND `network` != ?", - $importer["uid"], $addr, NETWORK_STATUSNET]; + $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); } @@ -169,7 +171,7 @@ class OStatus $value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue; if ($value != "") { - $contact["about"] = html2bbcode($value); + $contact["about"] = HTML::toBBCode($value); } $value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue; @@ -187,7 +189,7 @@ class OStatus } // Ensure that we are having this contact (with uid=0) - $cid = Contact::getIdForURL($aliaslink, 0); + $cid = Contact::getIdForURL($aliaslink, 0, true); if ($cid) { $fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location']; @@ -244,13 +246,12 @@ class OStatus $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS); $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET); - $entries = $xpath->query('/atom:entry'); + $contact = ["id" => 0]; - foreach ($entries as $entry) { - // fetch the author - $author = self::fetchAuthor($xpath, $entry, $importer, $contact, true); - return $author; - } + // Fetch the first author + $authordata = $xpath->query('//author')->item(0); + $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, true); + return $author; } /** @@ -466,6 +467,11 @@ class OStatus if (!$valid) { // If not, then it depends on this setting $valid = !Config::get('system', 'ostatus_full_threads'); + if ($valid) { + logger("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", LOGGER_DEBUG); + } + } else { + logger("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", LOGGER_DEBUG); } if ($valid) { // Never post a thread when the only interaction by our contact was a like @@ -476,10 +482,16 @@ class OStatus $valid = true; } } + if ($valid) { + logger("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", LOGGER_DEBUG); + } } } else { // But we will only import complete threads $valid = dba::exists('item', ['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]); + if ($valid) { + logger("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", LOGGER_DEBUG); + } } if ($valid) { @@ -547,7 +559,7 @@ class OStatus */ private static function processPost($xpath, $entry, &$item, $importer) { - $item["body"] = html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue); + $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; if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; @@ -648,8 +660,9 @@ 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; - - $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; + if (!empty($clear_text)) { + $item['content-warning'] = HTML::toBBCode($clear_text); + } } if (($self != '') && empty($item['protocol'])) { @@ -660,9 +673,11 @@ class OStatus self::fetchConversation($item['conversation-href'], $item['conversation-uri']); } - if (isset($item["parent-uri"]) && ($related != '')) { + if (isset($item["parent-uri"])) { if (!dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) { - self::fetchRelated($related, $item["parent-uri"], $importer); + if ($related != '') { + self::fetchRelated($related, $item["parent-uri"], $importer); + } } else { logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG); } @@ -1004,7 +1019,7 @@ class OStatus $item["author-link"] = $orig_author["author-link"]; $item["author-avatar"] = $orig_author["author-avatar"]; - $item["body"] = html2bbcode($orig_body); + $item["body"] = HTML::toBBCode($orig_body); $item["created"] = $orig_created; $item["edited"] = $orig_edited; @@ -1273,6 +1288,13 @@ class OStatus "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes); + if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false, + 'archive' => false, 'hidden' => false, 'blocked' => false]; + $members = dba::count('contact', $condition); + XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]); + } + return $root; } @@ -1291,7 +1313,7 @@ class OStatus } /** - * @brief Adds attachement data to the XML document + * @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 @@ -1306,11 +1328,13 @@ class OStatus switch ($siteinfo["type"]) { case 'photo': $imgdata = Image::getInfoFromURL($siteinfo["image"]); - $attributes = ["rel" => "enclosure", - "href" => $siteinfo["image"], - "type" => $imgdata["mime"], - "length" => intval($imgdata["size"])]; - XML::addElement($doc, $root, "link", "", $attributes); + if ($imgdata) { + $attributes = ["rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])]; + XML::addElement($doc, $root, "link", "", $attributes); + } break; case 'video': $attributes = ["rel" => "enclosure", @@ -1326,12 +1350,14 @@ class OStatus if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { $imgdata = Image::getInfoFromURL($siteinfo["image"]); - $attributes = ["rel" => "enclosure", - "href" => $siteinfo["image"], - "type" => $imgdata["mime"], - "length" => intval($imgdata["size"])]; + if ($imgdata) { + $attributes = ["rel" => "enclosure", + "href" => $siteinfo["image"], + "type" => $imgdata["mime"], + "length" => intval($imgdata["size"])]; - XML::addElement($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); + } } $arr = explode('[/attach],', $item['attach']); @@ -1364,16 +1390,22 @@ class OStatus * * @return object author element */ - private static function addAuthor($doc, $owner) + private static function addAuthor($doc, $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"]); - XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); + if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP); + } else { + XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); + } XML::addElement($doc, $author, "uri", $owner["url"]); XML::addElement($doc, $author, "name", $owner["nick"]); XML::addElement($doc, $author, "email", $owner["addr"]); - XML::addElement($doc, $author, "summary", bbcode($owner["about"], false, false, 7)); + if ($show_profile) { + XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, 7)); + } $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]]; XML::addElement($doc, $author, "link", "", $attributes); @@ -1398,15 +1430,17 @@ class OStatus XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]); XML::addElement($doc, $author, "poco:displayName", $owner["name"]); - XML::addElement($doc, $author, "poco:note", bbcode($owner["about"], false, false, 7)); + if ($show_profile) { + XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, 7)); - if (trim($owner["location"]) != "") { - $element = $doc->createElement("poco:address"); - XML::addElement($doc, $element, "poco:formatted", $owner["location"]); - $author->appendChild($element); + if (trim($owner["location"]) != "") { + $element = $doc->createElement("poco:address"); + XML::addElement($doc, $element, "poco:formatted", $owner["location"]); + $author->appendChild($element); + } } - if (DBM::is_result($profile)) { + if (DBM::is_result($profile) && !$show_profile) { if (trim($profile["homepage"]) != "") { $urls = $doc->createElement("poco:urls"); XML::addElement($doc, $urls, "poco:type", "homepage"); @@ -1417,11 +1451,12 @@ class OStatus XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]); XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]); - } - if ($profile["publish"]) { - XML::addElement($doc, $author, "mastodon:scope", "public"); + if ($profile["publish"]) { + XML::addElement($doc, $author, "mastodon:scope", "public"); + } } + return $author; } @@ -1583,7 +1618,7 @@ class OStatus logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $toplevel); + $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); $r = q( "SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1", @@ -1612,7 +1647,7 @@ class OStatus self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false); - $author = self::addAuthor($doc, $contact); + $author = self::addAuthor($doc, $contact, false); $as_object->appendChild($author); $as_object2 = $doc->createElement("activity:object"); @@ -1654,7 +1689,7 @@ class OStatus logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $toplevel); + $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); $verb = NAMESPACE_ACTIVITY_SCHEMA."favorite"; self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false); @@ -1777,7 +1812,7 @@ class OStatus $item["body"] = sprintf($message, $owner["nick"], $contact["nick"]); - self::entryHeader($doc, $entry, $owner, $toplevel); + self::entryHeader($doc, $entry, $owner, $item, $toplevel); self::entryContent($doc, $entry, $item, $owner, $title); @@ -1805,7 +1840,7 @@ class OStatus logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } - $title = self::entryHeader($doc, $entry, $owner, $toplevel); + $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); @@ -1826,12 +1861,18 @@ class OStatus * * @return string The title for the element */ - private static function entryHeader($doc, &$entry, $owner, $toplevel) + private static function entryHeader($doc, &$entry, $owner, $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) { + $contact = self::contactEntry($item['author-link'], $owner); + $author = self::addAuthor($doc, $contact, false); + $entry->appendChild($author); + } } else { $entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry"); @@ -1879,7 +1920,7 @@ class OStatus $body = "[b]".$item['title']."[/b]\n\n".$body; } - $body = bbcode($body, false, false, 7); + $body = BBCode::convert($body, false, 7); XML::addElement($doc, $entry, "content", $body, ["type" => "html"]); @@ -1986,12 +2027,10 @@ class OStatus $mentioned = $newmentions; foreach ($mentioned as $mention) { - $r = q( - "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", - intval($owner["uid"]), - dbesc(normalise_link($mention)) - ); - if ($r[0]["forum"] || $r[0]["prv"]) { + $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))) { XML::addElement($doc, $entry, "link", "", [ "rel" => "mentioned", @@ -2008,6 +2047,12 @@ class OStatus } } + if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) { + XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned", + "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group", + "href" => $owner['url']]); + } + if (!$item["private"]) { XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention", "href" => "http://activityschema.org/collection/public"]); @@ -2084,7 +2129,7 @@ class OStatus } $owner = dba::fetch_first( - "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags` + "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1", $owner_nick @@ -2098,7 +2143,7 @@ class OStatus } $check_date = DateTimeFormat::utc($last_update); - $authorid = Contact::getIdForURL($owner["url"], 0); + $authorid = Contact::getIdForURL($owner["url"], 0, true); $sql_extra = ''; if ($filter === 'posts') { @@ -2109,21 +2154,23 @@ class OStatus $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); } + if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) { + $sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid)); + } + $items = q( "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` WHERE `item`.`uid` = %d - AND `item`.`contact-id` = %d - AND `item`.`author-id` = %d AND `item`.`created` > '%s' AND NOT `item`.`deleted` AND NOT `item`.`private` + AND `item`.`visible` + AND `item`.`wall` AND `thread`.`network` IN ('%s', '%s') $sql_extra ORDER BY `item`.`created` DESC LIMIT %d", intval($owner["uid"]), - intval($owner["id"]), - intval($authorid), dbesc($check_date), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),