X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FProtocol%2FOStatus.php;h=3edd84cbb037926518e3233ca79b535b87ae16b2;hb=bd9cb4595deaa3ac20e538e7d50f832c9b710d78;hp=b96eeeb3ec2f2f5d9313ee7b02121328a3d7918d;hpb=18d93cddf60d46e1334d6dd7454a76f1d6549052;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index b96eeeb3ec..3edd84cbb0 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -5,27 +5,32 @@ namespace Friendica\Protocol; use Friendica\App; +use Friendica\Content\Text\BBCode; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; -use Friendica\Model\GlobalContact; +use Friendica\Model\GContact; +use Friendica\Model\Conversation; +use Friendica\Model\Item; use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Util\Lock; +use Friendica\Util\Network; 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/follow.php'; require_once 'include/api.php'; require_once 'mod/proxy.php'; @@ -35,7 +40,7 @@ require_once 'mod/proxy.php'; class OStatus { private static $itemlist; - private static $conv_list = array(); + private static $conv_list = []; /** * @brief Fetches author data @@ -50,7 +55,7 @@ class OStatus */ private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch) { - $author = array(); + $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; @@ -70,9 +75,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 +94,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 +109,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; @@ -118,7 +123,7 @@ class OStatus } } - $avatarlist = array(); + $avatarlist = []; $avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context); foreach ($avatars as $avatar) { $href = ""; @@ -196,7 +201,7 @@ class OStatus $contact['name-date'] = datetime_convert(); - dba::update('contact', $contact, array('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); @@ -207,17 +212,17 @@ class OStatus $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"], + $fields = ['url' => $author["author-link"], 'name' => $contact["name"], 'nurl' => normalise_link($author["author-link"]), 'nick' => $contact["nick"], 'alias' => $contact["alias"], 'about' => $contact["about"], 'location' => $contact["location"], - 'success_update' => datetime_convert(), 'last-update' => datetime_convert()); + 'success_update' => datetime_convert(), 'last-update' => datetime_convert()]; - dba::update('contact', $fields, array('id' => $cid), $old_contact); + dba::update('contact', $fields, ['id' => $cid], $old_contact); // Update the avatar Contact::updateAvatar($author["author-avatar"], 0, $cid); @@ -226,9 +231,9 @@ class OStatus $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; @@ -251,7 +256,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); @@ -279,7 +284,7 @@ class OStatus */ private static function readAttributes($element) { - $attribute = array(); + $attribute = []; foreach ($element->attributes as $attributes) { $attribute[$attributes->name] = $attributes->textContent; @@ -317,8 +322,8 @@ class OStatus private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true) { if ($initialize) { - self::$itemlist = array(); - self::$conv_list = array(); + self::$itemlist = []; + self::$conv_list = []; } logger("Import OStatus message", LOGGER_DEBUG); @@ -329,7 +334,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); @@ -350,7 +355,7 @@ class OStatus } } - $header = array(); + $header = []; $header["uid"] = $importer["uid"]; $header["network"] = NETWORK_OSTATUS; $header["type"] = "remote"; @@ -387,7 +392,7 @@ class OStatus $entry = $xpath->query('/atom:entry'); // Reverse the order of the entries - $entrylist = array(); + $entrylist = []; foreach ($entries as $entry) { $entrylist[] = $entry; @@ -419,19 +424,19 @@ class OStatus $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; // Delete a message - if (in_array($item["verb"], array('qvitter-delete-notice', ACTIVITY_DELETE, 'delete'))) { + if (in_array($item["verb"], ['qvitter-delete-notice', ACTIVITY_DELETE, 'delete'])) { self::deleteNotice($item); continue; } - if (in_array($item["verb"], array(NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE))) { + if (in_array($item["verb"], [NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE])) { // Ignore "Unfavorite" message logger("Ignore unfavorite message ".print_r($item, true), LOGGER_DEBUG); continue; } // Deletions come with the same uri, so we check for duplicates after processing deletions - if (dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item["uri"]))) { + if (dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]])) { logger('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG); continue; } else { @@ -451,12 +456,12 @@ class OStatus } if ($item["verb"] == ACTIVITY_FOLLOW) { - new_follower($importer, $contact, $item, $nickname); + Contact::newFollower($importer, $contact, $item, $nickname); continue; } if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") { - lose_follower($importer, $contact, $item, $dummy); + Contact::loseFollower($importer, $contact, $item, $dummy); continue; } @@ -470,7 +475,7 @@ class OStatus } // http://activitystrea.ms/schema/1.0/rsvp-yes - if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE))) { + if (!in_array($item["verb"], [ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE])) { logger("Unhandled verb ".$item["verb"]." ".print_r($item, true), LOGGER_DEBUG); } @@ -487,7 +492,7 @@ class OStatus if ($valid) { // Never post a thread when the only interaction by our contact was a like $valid = false; - $verbs = array(ACTIVITY_POST, ACTIVITY_SHARE); + $verbs = [ACTIVITY_POST, ACTIVITY_SHARE]; foreach (self::$itemlist as $item) { if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) { $valid = true; @@ -496,7 +501,7 @@ class OStatus } } else { // But we will only import complete threads - $valid = dba::exists('item', array('uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri'])); + $valid = dba::exists('item', ['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]); } if ($valid) { @@ -510,25 +515,25 @@ class OStatus } } foreach (self::$itemlist as $item) { - $found = dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item["uri"])); + $found = dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]]); if ($found) { logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG); } elseif ($item['contact-id'] < 0) { 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_store')) { - $ret = item_store($item); - Lock::remove('ostatus_process_item_store'); + if (Lock::set('ostatus_process_item_insert')) { + $ret = Item::insert($item); + Lock::remove('ostatus_process_item_insert'); logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret); } else { - $ret = item_store($item); + $ret = Item::insert($item); logger("We couldn't lock - but tried to store the item anyway. Return value is ".$ret); } } } } - self::$itemlist = array(); + self::$itemlist = []; } logger('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG); } @@ -541,8 +546,8 @@ class OStatus */ 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; @@ -552,9 +557,9 @@ class OStatus // The function "item_drop" doesn't work for that case dba::update( 'item', - array('deleted' => true, 'title' => '', 'body' => '', - 'edited' => datetime_convert(), 'changed' => datetime_convert()), - array('id' => $deleted["id"]) + ['deleted' => true, 'title' => '', 'body' => '', + 'edited' => datetime_convert(), 'changed' => datetime_convert()], + ['id' => $deleted["id"]] ); delete_thread($deleted["id"], $deleted["parent-uri"]); @@ -687,7 +692,7 @@ class OStatus } if (isset($item["parent-uri"]) && ($related != '')) { - if (!dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item['parent-uri']))) { + if (!dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) { self::fetchRelated($related, $item["parent-uri"], $importer); } else { logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG); @@ -700,7 +705,7 @@ class OStatus } if (($item['author-link'] != '') && !empty($item['protocol'])) { - $item = store_conversation($item); + $item = Conversation::insert($item); } self::$itemlist[] = $item; @@ -722,7 +727,7 @@ class OStatus self::$conv_list[$conversation] = true; - $conversation_data = z_fetch_url($conversation, false, $redirects, array('accept_content' => 'application/atom+xml, text/html')); + $conversation_data = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); if (!$conversation_data['success']) { return; @@ -739,7 +744,7 @@ class OStatus if (!@$doc->loadHTML($conversation_data['body'])) { return; } - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $links = $xpath->query('//link'); if ($links) { @@ -750,7 +755,7 @@ class OStatus } } if ($file != '') { - $conversation_atom = z_fetch_url($attribute['href']); + $conversation_atom = Network::curl($attribute['href']); if ($conversation_atom['success']) { $xml = $conversation_atom['body']; @@ -779,7 +784,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('ostatus', NAMESPACE_OSTATUS); @@ -792,7 +797,7 @@ class OStatus $doc2->preserveWhiteSpace = false; $doc2->formatOutput = true; - $conv_data = array(); + $conv_data = []; $conv_data['protocol'] = PROTOCOL_SPLITTED_CONV; $conv_data['network'] = NETWORK_OSTATUS; @@ -836,14 +841,14 @@ class OStatus $conv_data['source'] = $doc2->saveXML(); - $condition = array('item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED); + $condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED]; if (dba::exists('conversation', $condition)) { logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG); - dba::delete('conversation', array('item-uri' => $conv_data['uri'])); + dba::delete('conversation', ['item-uri' => $conv_data['uri']]); } logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG); - store_conversation($conv_data); + Conversation::insert($conv_data); } } @@ -860,13 +865,13 @@ class OStatus */ private static function fetchSelf($self, &$item) { - $condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON); + $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON]; if (dba::exists('conversation', $condition)) { logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG); return; } - $self_data = z_fetch_url($self); + $self_data = Network::curl($self); if (!$self_data['success']) { return; @@ -895,8 +900,8 @@ class OStatus */ 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']; @@ -906,12 +911,12 @@ class OStatus } if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) { logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG); - dba::delete('conversation', array('item-uri' => $related_uri)); + dba::delete('conversation', ['item-uri' => $related_uri]); } } $stored = false; - $related_data = z_fetch_url($related, false, $redirects, array('accept_content' => 'application/atom+xml, text/html')); + $related_data = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']); if (!$related_data['success']) { return; @@ -929,7 +934,7 @@ class OStatus if (!@$doc->loadHTML($related_data['body'])) { return; } - $xpath = new DomXPath($doc); + $xpath = new DOMXPath($doc); $atom_file = ''; @@ -942,7 +947,7 @@ class OStatus } } if ($atom_file != '') { - $related_atom = z_fetch_url($atom_file); + $related_atom = Network::curl($atom_file); if ($related_atom['success']) { logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG); @@ -954,7 +959,7 @@ class OStatus // Workaround for older GNU Social servers if (($xml == '') && strstr($related, '/notice/')) { - $related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related).'.atom'); + $related_atom = 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); @@ -965,7 +970,7 @@ class OStatus // Even more worse workaround for GNU Social ;-) if ($xml == '') { $related_guess = OStatus::convertHref($related_uri); - $related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom'); + $related_atom = 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); @@ -975,8 +980,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); @@ -1007,10 +1012,10 @@ class OStatus $activityobjects = $xpath->query('activity:object', $entry)->item(0); if (!is_object($activityobjects)) { - return array(); + return []; } - $link_data = array(); + $link_data = []; $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue; @@ -1023,8 +1028,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"]; @@ -1062,7 +1066,7 @@ class OStatus */ private static function processLinks($links, &$item) { - $link_data = array('add_body' => '', 'self' => ''); + $link_data = ['add_body' => '', 'self' => '']; foreach ($links as $link) { $attribute = self::readAttributes($link); @@ -1204,7 +1208,7 @@ class OStatus */ private static function formatPicturePost($body) { - $siteinfo = get_attached_data($body); + $siteinfo = BBCode::getAttachedData($body); if (($siteinfo["type"] == "photo")) { if (isset($siteinfo["preview"])) { @@ -1217,8 +1221,8 @@ class OStatus $preview = proxy_url($preview, false, PROXY_SIZE_SMALL); // Is it a local picture? Then make it smaller here - $preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview); - $preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview); + $preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview); + $preview = str_replace(["-1.jpg", "-1.png"], ["-2.jpg", "-2.png"], $preview); if (isset($siteinfo["url"])) { $url = $siteinfo["url"]; @@ -1235,12 +1239,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(); @@ -1256,10 +1261,16 @@ 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); + switch ($filter) { + case 'activity': $title = L10n::t('%s\'s timeline', $owner['name']); break; + case 'posts' : $title = L10n::t('%s\'s posts' , $owner['name']); break; + case 'comments': $title = L10n::t('%s\'s comments', $owner['name']); break; + } + + $attributes = ["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", sprintf("%s timeline", $owner["name"])); + 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)); @@ -1267,7 +1278,7 @@ class OStatus $author = self::addAuthor($doc, $owner); $root->appendChild($author); - $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html"); + $attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"]; XML::addElement($doc, $root, "link", "", $attributes); /// @TODO We have to find out what this is @@ -1278,17 +1289,17 @@ class OStatus self::hublinks($doc, $root, $owner["nick"]); - $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "salmon"); + $attributes = ["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"); + $attributes = ["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"); + $attributes = ["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"); + $attributes = ["href" => System::baseUrl() . "/api/statuses/user_timeline/" . $owner["nick"] . ".atom", + "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes); return $root; @@ -1305,7 +1316,7 @@ class OStatus public static function hublinks($doc, $root, $nick) { $h = System::baseUrl() . '/pubsubhubbub/'.$nick; - XML::addElement($doc, $root, "link", "", array("href" => $h, "rel" => "hub")); + XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]); } /** @@ -1319,23 +1330,23 @@ class OStatus private static function getAttachment($doc, $root, $item) { $o = ""; - $siteinfo = get_attached_data($item["body"]); + $siteinfo = BBCode::getAttachedData($item["body"]); switch ($siteinfo["type"]) { case 'photo': $imgdata = Image::getInfoFromURL($siteinfo["image"]); - $attributes = array("rel" => "enclosure", + $attributes = ["rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"], - "length" => intval($imgdata["size"])); + "length" => intval($imgdata["size"])]; XML::addElement($doc, $root, "link", "", $attributes); break; case 'video': - $attributes = array("rel" => "enclosure", + $attributes = ["rel" => "enclosure", "href" => $siteinfo["url"], "type" => "text/html; charset=UTF-8", "length" => "", - "title" => $siteinfo["title"]); + "title" => $siteinfo["title"]]; XML::addElement($doc, $root, "link", "", $attributes); break; default: @@ -1344,10 +1355,10 @@ class OStatus if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { $imgdata = Image::getInfoFromURL($siteinfo["image"]); - $attributes = array("rel" => "enclosure", + $attributes = ["rel" => "enclosure", "href" => $siteinfo["image"], "type" => $imgdata["mime"], - "length" => intval($imgdata["size"])); + "length" => intval($imgdata["size"])]; XML::addElement($doc, $root, "link", "", $attributes); } @@ -1358,9 +1369,9 @@ class OStatus $matches = false; $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); if ($cnt) { - $attributes = array("rel" => "enclosure", + $attributes = ["rel" => "enclosure", "href" => $matches[1], - "type" => $matches[3]); + "type" => $matches[3]]; if (intval($matches[2])) { $attributes["length"] = intval($matches[2]); @@ -1396,24 +1407,24 @@ class OStatus 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"]); + $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]]; XML::addElement($doc, $author, "link", "", $attributes); - $attributes = array( + $attributes = [ "rel" => "avatar", "type" => "image/jpeg", // To-Do? "media:width" => 175, "media:height" => 175, - "href" => $owner["photo"]); + "href" => $owner["photo"]]; XML::addElement($doc, $author, "link", "", $attributes); if (isset($owner["thumb"])) { - $attributes = array( + $attributes = [ "rel" => "avatar", "type" => "image/jpeg", // To-Do? "media:width" => 80, "media:height" => 80, - "href" => $owner["thumb"]); + "href" => $owner["thumb"]]; XML::addElement($doc, $author, "link", "", $attributes); } @@ -1436,8 +1447,8 @@ class OStatus } if (count($profile)) { - XML::addElement($doc, $author, "followers", "", array("url" => System::baseUrl()."/viewcontacts/".$owner["nick"])); - XML::addElement($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); + 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"]) { @@ -1477,7 +1488,7 @@ class OStatus */ private static function constructObjecttype($item) { - if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT))) + if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) return $item['object-type']; return ACTIVITY_OBJ_NOTE; } @@ -1505,7 +1516,7 @@ class OStatus if ($item["verb"] == ACTIVITY_LIKE) { return self::likeEntry($doc, $item, $owner, $toplevel); - } elseif (in_array($item["verb"], array(ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"))) { + } elseif (in_array($item["verb"], [ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"])) { return self::followEntry($doc, $item, $owner, $toplevel); } else { return self::noteEntry($doc, $item, $owner, $toplevel); @@ -1525,8 +1536,8 @@ class OStatus $source = $doc->createElement("source"); 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, "link", "", ["rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]]); + XML::addElement($doc, $source, "link", "", ["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)); @@ -1720,15 +1731,15 @@ class OStatus XML::addElement($doc, $object, "id", $contact["alias"]); XML::addElement($doc, $object, "title", $contact["nick"]); - $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]); + $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $contact["url"]]; XML::addElement($doc, $object, "link", "", $attributes); - $attributes = array( + $attributes = [ "rel" => "avatar", "type" => "image/jpeg", // To-Do? "media:width" => 175, "media:height" => 175, - "href" => $contact["photo"]); + "href" => $contact["photo"]]; XML::addElement($doc, $object, "link", "", $attributes); XML::addElement($doc, $object, "poco:preferredUsername", $contact["nick"]); @@ -1780,12 +1791,12 @@ class OStatus } if ($item['verb'] == ACTIVITY_FOLLOW) { - $message = t('%s is now following %s.'); - $title = t('following'); + $message = L10n::t('%s is now following %s.'); + $title = L10n::t('following'); $action = "subscription"; } else { - $message = t('%s stopped following %s.'); - $title = t('stopped following'); + $message = L10n::t('%s stopped following %s.'); + $title = L10n::t('stopped following'); $action = "unfollow"; } @@ -1900,14 +1911,14 @@ class OStatus $body = bbcode($body, false, false, 7); - XML::addElement($doc, $entry, "content", $body, array("type" => "html")); + XML::addElement($doc, $entry, "content", $body, ["type" => "html"]); - XML::addElement($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl()."/display/".$item["guid"]) + XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html", + "href" => System::baseUrl()."/display/".$item["guid"]] ); if ($complete && ($item["id"] > 0)) { - XML::addElement($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); + XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]); } XML::addElement($doc, $entry, "activity:verb", $verb); @@ -1928,7 +1939,7 @@ class OStatus */ private static function entryFooter($doc, $entry, $item, $owner, $complete = true) { - $mentioned = array(); + $mentioned = []; if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); @@ -1949,14 +1960,14 @@ class OStatus $parent_plink = System::baseUrl()."/display/".$parent[0]["guid"]; } - $attributes = array( + $attributes = [ "ref" => $parent_item, - "href" => $parent_plink); + "href" => $parent_plink]; XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes); - $attributes = array( + $attributes = [ "rel" => "related", - "href" => $parent_plink); + "href" => $parent_plink]; XML::addElement($doc, $entry, "link", "", $attributes); } @@ -1976,17 +1987,17 @@ class OStatus } } - XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation_href)); + XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]); - $attributes = array( + $attributes = [ "href" => $conversation_href, "local_id" => $item["parent"], - "ref" => $conversation_uri); + "ref" => $conversation_uri]; XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes); } - $tags = item_getfeedtags($item); + $tags = item::getFeedTags($item); if (count($tags)) { foreach ($tags as $t) { @@ -1997,7 +2008,7 @@ class OStatus } // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS) - $newmentions = array(); + $newmentions = []; foreach ($mentioned as $mention) { $newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention); $newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention); @@ -2012,34 +2023,34 @@ class OStatus ); if ($r[0]["forum"] || $r[0]["prv"]) { XML::addElement($doc, $entry, "link", "", - array( + [ "rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_GROUP, - "href" => $mention) + "href" => $mention] ); } else { XML::addElement($doc, $entry, "link", "", - array( + [ "rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_PERSON, - "href" => $mention) + "href" => $mention] ); } } if (!$item["private"]) { - XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:attention", - "href" => "http://activityschema.org/collection/public")); - XML::addElement($doc, $entry, "link", "", array("rel" => "mentioned", + XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention", + "href" => "http://activityschema.org/collection/public"]); + XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection", - "href" => "http://activityschema.org/collection/public")); + "href" => "http://activityschema.org/collection/public"]); XML::addElement($doc, $entry, "mastodon:scope", "public"); } if (count($tags)) { foreach ($tags as $t) { if ($t[0] != "@") { - XML::addElement($doc, $entry, "category", "", array("term" => $t[2])); + XML::addElement($doc, $entry, "category", "", ["term" => $t[2]]); } } } @@ -2052,7 +2063,7 @@ class OStatus $app = "web"; } - $attributes = array("local_id" => $item["id"], "source" => $app); + $attributes = ["local_id" => $item["id"], "source" => $app]; if (isset($parent["id"])) { $attributes["repeat_of"] = $parent["id"]; @@ -2067,42 +2078,51 @@ class OStatus } /** + * 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'; } @@ -2110,23 +2130,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')) { @@ -2142,10 +2179,10 @@ class OStatus $feeddata = trim($doc->saveXML()); - $msg = array('feed' => $feeddata, 'last_update' => $last_update); + $msg = ['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; }