X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FProtocol%2FOStatus.php;h=242af46045ec983525035e32f50727f41c2897fe;hb=44a2ec439eac3b5b271ddeb02dbd5e905fca3486;hp=dfdc75498d6899877cd8f706cb9c7f70ab2408dd;hpb=5ee728972e5e8d16c482fe82a0dd5ecde6ba26b2;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index dfdc75498d..242af46045 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -9,23 +9,23 @@ use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Model\GlobalContact; +use Friendica\Model\Contact; +use Friendica\Model\GContact; use Friendica\Network\Probe; -use Friendica\Object\Contact; +use Friendica\Object\Image; use Friendica\Util\Lock; use Friendica\Util\XML; use dba; use DOMDocument; -use DomXPath; +use DOMXPath; +require_once 'include/dba.php'; require_once 'include/threads.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'; -require_once 'include/Photo.php'; -require_once 'include/follow.php'; require_once 'include/api.php'; require_once 'mod/proxy.php'; @@ -70,9 +70,9 @@ class OStatus $found = false; if ($aliaslink != '') { - $condition = array("`uid` = ? AND `alias` = ? AND `network` != ?", - $importer["uid"], $aliaslink, NETWORK_STATUSNET); - $r = dba::select('contact', array(), $condition, array('limit' => 1)); + $condition = ["`uid` = ? AND `alias` = ? AND `network` != ?", + $importer["uid"], $aliaslink, NETWORK_STATUSNET]; + $r = dba::selectFirst('contact', [], $condition); if (DBM::is_result($r)) { $found = true; @@ -89,9 +89,9 @@ class OStatus $aliaslink = $author["author-link"]; } - $condition = array("`uid` = ? AND `nurl` IN (?, ?) AND `network` != ?", $importer["uid"], - normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET); - $r = dba::select('contact', array(), $condition, array('limit' => 1)); + $condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ?", $importer["uid"], + normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET]; + $r = dba::selectFirst('contact', [], $condition); if (DBM::is_result($r)) { $found = true; @@ -104,9 +104,9 @@ class OStatus } if (!$found && ($addr != "")) { - $condition = array("`uid` = ? AND `addr` = ? AND `network` != ?", - $importer["uid"], $addr, NETWORK_STATUSNET); - $r = dba::select('contact', array(), $condition, array('limit' => 1)); + $condition = ["`uid` = ? AND `addr` = ? AND `network` != ?", + $importer["uid"], $addr, NETWORK_STATUSNET]; + $r = dba::selectFirst('contact', [], $condition); if (DBM::is_result($r)) { $found = true; @@ -151,11 +151,8 @@ class OStatus // Only update the contacts if it is an OStatus contact if ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) { - // This contact is vital, so we awake it from the dead - Contact::unmarkForArchival($contact); // Update contact data - $current = $contact; unset($current['name-date']); @@ -203,15 +200,15 @@ class OStatus if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) { logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG); - update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]); + Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]); } // Ensure that we are having this contact (with uid=0) $cid = Contact::getIdForURL($aliaslink, 0); if ($cid) { - $fields = array('url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'); - $old_contact = dba::select('contact', $fields, array('id' => $cid), array('limit' => 1)); + $fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location']; + $old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]); // Update it with the current values $fields = array('url' => $author["author-link"], 'name' => $contact["name"], @@ -223,15 +220,15 @@ class OStatus dba::update('contact', $fields, array('id' => $cid), $old_contact); // Update the avatar - update_contact_avatar($author["author-avatar"], 0, $cid); + Contact::updateAvatar($author["author-avatar"], 0, $cid); } $contact["generation"] = 2; $contact["hide"] = false; // OStatus contacts are never hidden $contact["photo"] = $author["author-avatar"]; - $gcid = GlobalContact::update($contact); + $gcid = GContact::update($contact); - GlobalContact::link($gcid, $contact["uid"], $contact["id"]); + GContact::link($gcid, $contact["uid"], $contact["id"]); } return $author; @@ -254,7 +251,7 @@ class OStatus $doc = new DOMDocument(); @$doc->loadXML($xml); - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $xpath->registerNamespace('atom', NAMESPACE_ATOM1); $xpath->registerNamespace('thr', NAMESPACE_THREAD); $xpath->registerNamespace('georss', NAMESPACE_GEORSS); @@ -298,6 +295,7 @@ class OStatus * @param array $importer user record of the importing user * @param array $contact contact * @param string $hub Called by reference, returns the fetched hub data + * @return void */ public static function import($xml, $importer, &$contact, &$hub) { @@ -309,7 +307,7 @@ class OStatus * * @param string $xml The XML * @param array $importer user record of the importing user - * @param array $contact + * @param array $contact contact * @param string $hub Called by reference, returns the fetched hub data * @param boolean $stored Is the post fresh imported or from the database? * @param boolean $initialize Is it the leading post so that data has to be initialized? @@ -331,7 +329,7 @@ class OStatus $doc = new DOMDocument(); @$doc->loadXML($xml); - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $xpath->registerNamespace('atom', NAMESPACE_ATOM1); $xpath->registerNamespace('thr', NAMESPACE_THREAD); $xpath->registerNamespace('georss', NAMESPACE_GEORSS); @@ -537,10 +535,14 @@ class OStatus return true; } + /** + * @param object $item item + * @return void + */ private static function deleteNotice($item) { - $condition = array('uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']); - $deleted = dba::select('item', array('id', 'parent-uri'), $condition, array('limit' => 1)); + $condition = ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']]; + $deleted = dba::selectFirst('item', ['id', 'parent-uri'], $condition); if (!DBM::is_result($deleted)) { logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it. "); return; @@ -567,6 +569,7 @@ class OStatus * @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 */ private static function processPost($xpath, $entry, &$item, $importer) { @@ -708,6 +711,7 @@ class OStatus * * @param string $conversation The link to the conversation * @param string $conversation_uri The conversation in "uri" format + * @return void */ private static function fetchConversation($conversation, $conversation_uri) { @@ -735,7 +739,7 @@ class OStatus if (!@$doc->loadHTML($conversation_data['body'])) { return; } - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $links = $xpath->query('//link'); if ($links) { @@ -768,13 +772,14 @@ class OStatus * @param string $xml The feed * @param string $conversation conversation * @param string $conversation_uri conversation uri + * @return void */ private static function storeConversation($xml, $conversation = '', $conversation_uri = '') { $doc = new DOMDocument(); @$doc->loadXML($xml); - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $xpath->registerNamespace('atom', NAMESPACE_ATOM1); $xpath->registerNamespace('thr', NAMESPACE_THREAD); $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS); @@ -844,13 +849,14 @@ class OStatus /** * @brief Fetch the own post so that it can be stored later - * @param array $item The item array * * We want to store the original data for later processing. * This function is meant for cases where we process a feed with multiple entries. * In that case we need to fetch the single posts here. * * @param string $self The link to the self item + * @param array $item The item array + * @return void */ private static function fetchSelf($self, &$item) { @@ -885,11 +891,12 @@ class OStatus * @param string $related The link to the related item * @param string $related_uri The related item in "uri" format * @param array $importer user record of the importing user + * @return void */ private static function fetchRelated($related, $related_uri, $importer) { - $condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON); - $conversation = dba::select('conversation', array('source', 'protocol'), $condition, array('limit' => 1)); + $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)) { $stored = true; $xml = $conversation['source']; @@ -922,7 +929,7 @@ class OStatus if (!@$doc->loadHTML($related_data['body'])) { return; } - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $atom_file = ''; @@ -968,8 +975,8 @@ class OStatus // Finally we take the data that we fetched from "ostatus:conversation" if ($xml == '') { - $condition = array('item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV); - $conversation = dba::select('conversation', array('source'), $condition, array('limit' => 1)); + $condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV]; + $conversation = dba::selectFirst('conversation', ['source'], $condition); if (DBM::is_result($conversation)) { $stored = true; logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG); @@ -1016,8 +1023,7 @@ class OStatus $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue; $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue; - $orig_contact = $contact; - $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $orig_contact, false); + $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false); $item["author-name"] = $orig_author["author-name"]; $item["author-link"] = $orig_author["author-link"]; @@ -1228,12 +1234,13 @@ 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 object $doc XML document + * @param array $owner Contact data of the poster + * @param string $filter The related feed filter (activity, posts or comments) * * @return object header root element */ - private static function addHeader($doc, $owner) + private static function addHeader($doc, $owner, $filter) { $a = get_app(); @@ -1249,40 +1256,46 @@ class OStatus $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); $root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON); - $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION); - XML::add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); - XML::add_element($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]); - XML::add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"])); - XML::add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"])); - XML::add_element($doc, $root, "logo", $owner["photo"]); - XML::add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME)); + switch ($filter) { + case 'activity': $title = t('%s\'s timeline', $owner['name']); break; + case 'posts' : $title = t('%s\'s posts' , $owner['name']); break; + case 'comments': $title = t('%s\'s comments', $owner['name']); break; + } + + $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION); + 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, "logo", $owner["photo"]); + XML::addElement($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME)); $author = self::addAuthor($doc, $owner); $root->appendChild($author); $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html"); - XML::add_element($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); /// @TODO We have to find out what this is /// $attributes = array("href" => System::baseUrl()."/sup", /// "rel" => "http://api.friendfeed.com/2008/03#sup", /// "type" => "application/json"); - /// XML::add_element($doc, $root, "link", "", $attributes); + /// XML::addElement($doc, $root, "link", "", $attributes); self::hublinks($doc, $root, $owner["nick"]); - $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "salmon"); - XML::add_element($doc, $root, "link", "", $attributes); + $attributes = array("href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"); + XML::addElement($doc, $root, "link", "", $attributes); - $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"); - XML::add_element($doc, $root, "link", "", $attributes); + $attributes = array("href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"); + XML::addElement($doc, $root, "link", "", $attributes); - $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"); - XML::add_element($doc, $root, "link", "", $attributes); + $attributes = array("href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"); + XML::addElement($doc, $root, "link", "", $attributes); - $attributes = array("href" => System::baseUrl()."/api/statuses/user_timeline/".$owner["nick"].".atom", - "rel" => "self", "type" => "application/atom+xml"); - XML::add_element($doc, $root, "link", "", $attributes); + $attributes = array("href" => System::baseUrl() . "/api/statuses/user_timeline/" . $owner["nick"] . ".atom", + "rel" => "self", "type" => "application/atom+xml"); + XML::addElement($doc, $root, "link", "", $attributes); return $root; } @@ -1293,11 +1306,12 @@ class OStatus * @param object $doc XML document * @param object $root XML root element where the hub links are added * @param object $nick nick + * @return void */ public static function hublinks($doc, $root, $nick) { $h = System::baseUrl() . '/pubsubhubbub/'.$nick; - XML::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub")); + XML::addElement($doc, $root, "link", "", array("href" => $h, "rel" => "hub")); } /** @@ -1306,6 +1320,7 @@ class OStatus * @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 + * @return void */ private static function getAttachment($doc, $root, $item) { @@ -1314,12 +1329,12 @@ class OStatus switch ($siteinfo["type"]) { case 'photo': - $imgdata = get_photo_info($siteinfo["image"]); + $imgdata = Image::getInfoFromURL($siteinfo["image"]); $attributes = array("rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"], "length" => intval($imgdata["size"])); - XML::add_element($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); break; case 'video': $attributes = array("rel" => "enclosure", @@ -1327,20 +1342,20 @@ class OStatus "type" => "text/html; charset=UTF-8", "length" => "", "title" => $siteinfo["title"]); - XML::add_element($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); break; default: break; } if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { - $imgdata = get_photo_info($siteinfo["image"]); + $imgdata = Image::getInfoFromURL($siteinfo["image"]); $attributes = array("rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"], "length" => intval($imgdata["size"])); - XML::add_element($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); } $arr = explode('[/attach],', $item['attach']); @@ -1359,7 +1374,7 @@ class OStatus if (trim($matches[4]) != "") { $attributes["title"] = trim($matches[4]); } - XML::add_element($doc, $root, "link", "", $attributes); + XML::addElement($doc, $root, "link", "", $attributes); } } } @@ -1380,15 +1395,15 @@ class OStatus $profile = $r[0]; } $author = $doc->createElement("author"); - XML::add_element($doc, $author, "id", $owner["url"]); - XML::add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); - XML::add_element($doc, $author, "uri", $owner["url"]); - XML::add_element($doc, $author, "name", $owner["nick"]); - XML::add_element($doc, $author, "email", $owner["addr"]); - XML::add_element($doc, $author, "summary", bbcode($owner["about"], false, false, 7)); + XML::addElement($doc, $author, "id", $owner["url"]); + 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)); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]); - XML::add_element($doc, $author, "link", "", $attributes); + XML::addElement($doc, $author, "link", "", $attributes); $attributes = array( "rel" => "avatar", @@ -1396,7 +1411,7 @@ class OStatus "media:width" => 175, "media:height" => 175, "href" => $owner["photo"]); - XML::add_element($doc, $author, "link", "", $attributes); + XML::addElement($doc, $author, "link", "", $attributes); if (isset($owner["thumb"])) { $attributes = array( @@ -1405,34 +1420,34 @@ class OStatus "media:width" => 80, "media:height" => 80, "href" => $owner["thumb"]); - XML::add_element($doc, $author, "link", "", $attributes); + XML::addElement($doc, $author, "link", "", $attributes); } - XML::add_element($doc, $author, "poco:preferredUsername", $owner["nick"]); - XML::add_element($doc, $author, "poco:displayName", $owner["name"]); - XML::add_element($doc, $author, "poco:note", bbcode($owner["about"], false, false, 7)); + 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 (trim($owner["location"]) != "") { $element = $doc->createElement("poco:address"); - XML::add_element($doc, $element, "poco:formatted", $owner["location"]); + XML::addElement($doc, $element, "poco:formatted", $owner["location"]); $author->appendChild($element); } if (trim($profile["homepage"]) != "") { $urls = $doc->createElement("poco:urls"); - XML::add_element($doc, $urls, "poco:type", "homepage"); - XML::add_element($doc, $urls, "poco:value", $profile["homepage"]); - XML::add_element($doc, $urls, "poco:primary", "true"); + XML::addElement($doc, $urls, "poco:type", "homepage"); + XML::addElement($doc, $urls, "poco:value", $profile["homepage"]); + XML::addElement($doc, $urls, "poco:primary", "true"); $author->appendChild($urls); } if (count($profile)) { - XML::add_element($doc, $author, "followers", "", array("url" => System::baseUrl()."/viewcontacts/".$owner["nick"])); - XML::add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); + XML::addElement($doc, $author, "followers", "", array("url" => System::baseUrl()."/viewcontacts/".$owner["nick"])); + XML::addElement($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); } if ($profile["publish"]) { - XML::add_element($doc, $author, "mastodon:scope", "public"); + XML::addElement($doc, $author, "mastodon:scope", "public"); } return $author; } @@ -1514,12 +1529,12 @@ class OStatus private static function sourceEntry($doc, $contact) { $source = $doc->createElement("source"); - XML::add_element($doc, $source, "id", $contact["poll"]); - XML::add_element($doc, $source, "title", $contact["name"]); - XML::add_element($doc, $source, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => $contact["alias"])); - XML::add_element($doc, $source, "link", "", array("rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"])); - XML::add_element($doc, $source, "icon", $contact["photo"]); - XML::add_element($doc, $source, "updated", datetime_convert("UTC", "UTC", $contact["success_update"]."+00:00", ATOM_TIME)); + XML::addElement($doc, $source, "id", $contact["poll"]); + XML::addElement($doc, $source, "title", $contact["name"]); + XML::addElement($doc, $source, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => $contact["alias"])); + XML::addElement($doc, $source, "link", "", array("rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"])); + XML::addElement($doc, $source, "icon", $contact["photo"]); + XML::addElement($doc, $source, "updated", datetime_convert("UTC", "UTC", $contact["success_update"]."+00:00", ATOM_TIME)); return $source; } @@ -1582,7 +1597,7 @@ class OStatus * @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 $repeated_guid + * @param string $repeated_guid guid * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? * * @return object Entry element @@ -1618,7 +1633,7 @@ class OStatus $as_object = $doc->createElement("activity:object"); - XML::add_element($doc, $as_object, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA."activity"); + XML::addElement($doc, $as_object, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA."activity"); self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false); @@ -1627,7 +1642,7 @@ class OStatus $as_object2 = $doc->createElement("activity:object"); - XML::add_element($doc, $as_object2, "activity:object-type", self::constructObjecttype($repeated_item)); + XML::addElement($doc, $as_object2, "activity:object-type", self::constructObjecttype($repeated_item)); $title = sprintf("New comment by %s", $contact["nick"]); @@ -1678,7 +1693,7 @@ class OStatus ); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); - XML::add_element($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0])); + XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0])); self::entryContent($doc, $as_object, $parent[0], $owner, "New entry"); @@ -1701,18 +1716,18 @@ class OStatus private static function addPersonObject($doc, $owner, $contact) { $object = $doc->createElement("activity:object"); - XML::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON); + XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON); if ($contact['network'] == NETWORK_PHANTOM) { - XML::add_element($doc, $object, "id", $contact['url']); + XML::addElement($doc, $object, "id", $contact['url']); return $object; } - XML::add_element($doc, $object, "id", $contact["alias"]); - XML::add_element($doc, $object, "title", $contact["nick"]); + XML::addElement($doc, $object, "id", $contact["alias"]); + XML::addElement($doc, $object, "title", $contact["nick"]); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]); - XML::add_element($doc, $object, "link", "", $attributes); + XML::addElement($doc, $object, "link", "", $attributes); $attributes = array( "rel" => "avatar", @@ -1720,14 +1735,14 @@ class OStatus "media:width" => 175, "media:height" => 175, "href" => $contact["photo"]); - XML::add_element($doc, $object, "link", "", $attributes); + XML::addElement($doc, $object, "link", "", $attributes); - XML::add_element($doc, $object, "poco:preferredUsername", $contact["nick"]); - XML::add_element($doc, $object, "poco:displayName", $contact["name"]); + XML::addElement($doc, $object, "poco:preferredUsername", $contact["nick"]); + XML::addElement($doc, $object, "poco:displayName", $contact["name"]); if (trim($contact["location"]) != "") { $element = $doc->createElement("poco:address"); - XML::add_element($doc, $element, "poco:formatted", $contact["location"]); + XML::addElement($doc, $element, "poco:formatted", $contact["location"]); $object->appendChild($element); } @@ -1817,7 +1832,7 @@ class OStatus $title = self::entryHeader($doc, $entry, $owner, $toplevel); - XML::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); + XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); self::entryContent($doc, $entry, $item, $owner, $title); @@ -1872,6 +1887,7 @@ class OStatus * @param string $title Title for the post * @param string $verb The activity verb * @param bool $complete Add the "status_net" element? + * @return void */ private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true) { @@ -1879,8 +1895,8 @@ class OStatus $verb = self::constructVerb($item); } - XML::add_element($doc, $entry, "id", $item["uri"]); - XML::add_element($doc, $entry, "title", $title); + XML::addElement($doc, $entry, "id", $item["uri"]); + XML::addElement($doc, $entry, "title", $title); $body = self::formatPicturePost($item['body']); @@ -1890,20 +1906,20 @@ class OStatus $body = bbcode($body, false, false, 7); - XML::add_element($doc, $entry, "content", $body, array("type" => "html")); + XML::addElement($doc, $entry, "content", $body, array("type" => "html")); - XML::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl()."/display/".$item["guid"]) + XML::addElement($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", + "href" => System::baseUrl()."/display/".$item["guid"]) ); if ($complete && ($item["id"] > 0)) { - XML::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); + XML::addElement($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); } - XML::add_element($doc, $entry, "activity:verb", $verb); + XML::addElement($doc, $entry, "activity:verb", $verb); - XML::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"]."+00:00", ATOM_TIME)); - XML::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"]."+00:00", ATOM_TIME)); + XML::addElement($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"]."+00:00", ATOM_TIME)); + XML::addElement($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"]."+00:00", ATOM_TIME)); } /** @@ -1914,6 +1930,7 @@ class OStatus * @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 + * @return void */ private static function entryFooter($doc, $entry, $item, $owner, $complete = true) { @@ -1941,12 +1958,12 @@ class OStatus $attributes = array( "ref" => $parent_item, "href" => $parent_plink); - XML::add_element($doc, $entry, "thr:in-reply-to", "", $attributes); + XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); $attributes = array( "rel" => "related", "href" => $parent_plink); - XML::add_element($doc, $entry, "link", "", $attributes); + XML::addElement($doc, $entry, "link", "", $attributes); } if (intval($item["parent"]) > 0) { @@ -1965,14 +1982,14 @@ class OStatus } } - XML::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation_href)); + XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation_href)); $attributes = array( "href" => $conversation_href, "local_id" => $item["parent"], "ref" => $conversation_uri); - XML::add_element($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes); + XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes); } $tags = item_getfeedtags($item); @@ -2000,14 +2017,14 @@ class OStatus dbesc(normalise_link($mention)) ); if ($r[0]["forum"] || $r[0]["prv"]) { - XML::add_element($doc, $entry, "link", "", + XML::addElement($doc, $entry, "link", "", array( "rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_GROUP, "href" => $mention) ); } else { - XML::add_element($doc, $entry, "link", "", + XML::addElement($doc, $entry, "link", "", array( "rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_PERSON, @@ -2017,18 +2034,18 @@ class OStatus } if (!$item["private"]) { - XML::add_element($doc, $entry, "link", "", array("rel" => "ostatus:attention", + XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:attention", "href" => "http://activityschema.org/collection/public")); - XML::add_element($doc, $entry, "link", "", array("rel" => "mentioned", + XML::addElement($doc, $entry, "link", "", array("rel" => "mentioned", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection", "href" => "http://activityschema.org/collection/public")); - XML::add_element($doc, $entry, "mastodon:scope", "public"); + XML::addElement($doc, $entry, "mastodon:scope", "public"); } if (count($tags)) { foreach ($tags as $t) { if ($t[0] != "@") { - XML::add_element($doc, $entry, "category", "", array("term" => $t[2])); + XML::addElement($doc, $entry, "category", "", array("term" => $t[2])); } } } @@ -2048,50 +2065,59 @@ class OStatus } if ($item["coord"] != "") { - XML::add_element($doc, $entry, "georss:point", $item["coord"]); + XML::addElement($doc, $entry, "georss:point", $item["coord"]); } - XML::add_element($doc, $entry, "statusnet:notice_info", "", $attributes); + XML::addElement($doc, $entry, "statusnet:notice_info", "", $attributes); } } /** + * Creates the XML feed for a given nickname + * + * Supported filters: + * - activity (default): all the public posts + * - posts: all the public top-level posts + * - comments: all the public replies + * + * Updates the provided last_update parameter if the result comes from the + * cache or it is empty + * * @brief Creates the XML feed for a given nickname * - * @param object $a The application class * @param string $owner_nick Nickname of the feed owner * @param string $last_update Date of the last update * @param integer $max_items Number of maximum items to fetch + * @param string $filter Feed items filter (activity, posts or comments) + * @param boolean $nocache Wether to bypass caching * * @return string XML feed */ - public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300) + public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false) { $stamp = microtime(true); - $cachekey = "ostatus:feed:".$owner_nick.":".$last_update; + $cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update; $previous_created = $last_update; $result = Cache::get($cachekey); - if (!is_null($result)) { - logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created.' (cached)', LOGGER_DEBUG); + if (!$nocache && !is_null($result)) { + logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG); $last_update = $result['last_update']; return $result['feed']; } - $r = q( + $owner = dba::fetch_first( "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1", - dbesc($owner_nick) + WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1", + $owner_nick ); - if (!DBM::is_result($r)) { + if (!DBM::is_result($owner)) { return; } - $owner = $r[0]; - if (!strlen($last_update)) { $last_update = 'now -30 days'; } @@ -2099,23 +2125,40 @@ class OStatus $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s'); $authorid = Contact::getIdForURL($owner["url"], 0); + $sql_extra = ''; + if ($filter === 'posts') { + $sql_extra .= ' AND `item`.`id` = `item`.`parent` '; + } + + if ($filter === 'comments') { + $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); + } + $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 - `thread`.`network` IN ('%s', '%s') + 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 `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), intval($max_items) + intval($owner["uid"]), + intval($owner["id"]), + intval($authorid), + dbesc($check_date), + dbesc(NETWORK_OSTATUS), + dbesc(NETWORK_DFRN), + intval($max_items) ); $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; - $root = self::addHeader($doc, $owner); + $root = self::addHeader($doc, $owner, $filter); foreach ($items as $item) { if (Config::get('system', 'ostatus_debug')) { @@ -2134,7 +2177,7 @@ class OStatus $msg = array('feed' => $feeddata, 'last_update' => $last_update); Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR); - logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created, LOGGER_DEBUG); + logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG); return $feeddata; }