]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/OStatus.php
Use short form array syntax everywhere
[friendica.git] / src / Protocol / OStatus.php
index dfdc75498d6899877cd8f706cb9c7f70ab2408dd..6a87d476149455d6972f740f7f66cbeb9b4d3bac 100644 (file)
@@ -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';
 
@@ -35,7 +35,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 +50,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 +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;
@@ -118,7 +118,7 @@ class OStatus
                        }
                }
 
-               $avatarlist = array();
+               $avatarlist = [];
                $avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
                foreach ($avatars as $avatar) {
                        $href = "";
@@ -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']);
 
@@ -199,39 +196,39 @@ 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);
-                               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"],
+                               $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
-                               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);
@@ -282,7 +279,7 @@ class OStatus
         */
        private static function readAttributes($element)
        {
-               $attribute = array();
+               $attribute = [];
 
                foreach ($element->attributes as $attributes) {
                        $attribute[$attributes->name] = $attributes->textContent;
@@ -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?
@@ -319,8 +317,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);
@@ -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);
@@ -352,7 +350,7 @@ class OStatus
                        }
                }
 
-               $header = array();
+               $header = [];
                $header["uid"] = $importer["uid"];
                $header["network"] = NETWORK_OSTATUS;
                $header["type"] = "remote";
@@ -389,7 +387,7 @@ class OStatus
                $entry = $xpath->query('/atom:entry');
 
                // Reverse the order of the entries
-               $entrylist = array();
+               $entrylist = [];
 
                foreach ($entries as $entry) {
                        $entrylist[] = $entry;
@@ -421,19 +419,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 {
@@ -472,7 +470,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);
                        }
 
@@ -489,7 +487,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;
@@ -498,7 +496,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) {
@@ -512,7 +510,7 @@ 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) {
@@ -530,17 +528,21 @@ class OStatus
                                                }
                                        }
                                }
-                               self::$itemlist = array();
+                               self::$itemlist = [];
                        }
                        logger('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
                }
                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;
@@ -550,9 +552,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"]);
@@ -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)
        {
@@ -684,7 +687,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);
@@ -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)
        {
@@ -718,7 +722,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 = z_fetch_url($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$conversation_data['success']) {
                        return;
@@ -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);
@@ -787,7 +792,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;
@@ -831,10 +836,10 @@ 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);
@@ -844,17 +849,18 @@ 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)
        {
-               $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;
@@ -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'];
@@ -899,12 +906,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 = z_fetch_url($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$related_data['success']) {
                        return;
@@ -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);
@@ -1000,10 +1007,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;
 
@@ -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"];
@@ -1055,7 +1061,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);
@@ -1210,8 +1216,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"];
@@ -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 = ["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);
+               $attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
+               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 = ["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 = ["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 = ["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 = ["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", "", ["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,33 +1329,33 @@ class OStatus
 
                switch ($siteinfo["type"]) {
                        case 'photo':
-                               $imgdata = get_photo_info($siteinfo["image"]);
-                               $attributes = array("rel" => "enclosure",
+                               $imgdata = Image::getInfoFromURL($siteinfo["image"]);
+                               $attributes = ["rel" => "enclosure",
                                                "href" => $siteinfo["image"],
                                                "type" => $imgdata["mime"],
-                                               "length" => intval($imgdata["size"]));
-                               XML::add_element($doc, $root, "link", "", $attributes);
+                                               "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"]);
-                               XML::add_element($doc, $root, "link", "", $attributes);
+                                               "title" => $siteinfo["title"]];
+                               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"]);
-                       $attributes = array("rel" => "enclosure",
+                       $imgdata = Image::getInfoFromURL($siteinfo["image"]);
+                       $attributes = ["rel" => "enclosure",
                                        "href" => $siteinfo["image"],
                                        "type" => $imgdata["mime"],
-                                       "length" => intval($imgdata["size"]));
+                                       "length" => intval($imgdata["size"])];
 
-                       XML::add_element($doc, $root, "link", "", $attributes);
+                       XML::addElement($doc, $root, "link", "", $attributes);
                }
 
                $arr = explode('[/attach],', $item['attach']);
@@ -1349,9 +1364,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]);
@@ -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,59 +1395,59 @@ 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);
+               $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"]);
-               XML::add_element($doc, $author, "link", "", $attributes);
+                               "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"]);
-                       XML::add_element($doc, $author, "link", "", $attributes);
+                                       "href" => $owner["thumb"]];
+                       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", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]);
+                       XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
                }
 
                if ($profile["publish"]) {
-                       XML::add_element($doc, $author, "mastodon:scope", "public");
+                       XML::addElement($doc, $author, "mastodon:scope", "public");
                }
                return $author;
        }
@@ -1468,7 +1483,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;
        }
@@ -1496,7 +1511,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);
@@ -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", "", ["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));
 
                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,33 +1716,33 @@ 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);
+               $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"]);
-               XML::add_element($doc, $object, "link", "", $attributes);
+                               "href" => $contact["photo"]];
+               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, ["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", "", ["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", "", ["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,10 +1930,11 @@ 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)
        {
-               $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"]));
@@ -1938,15 +1955,15 @@ class OStatus
                                $parent_plink = System::baseUrl()."/display/".$parent[0]["guid"];
                        }
 
-                       $attributes = array(
+                       $attributes = [
                                        "ref" => $parent_item,
-                                       "href" => $parent_plink);
-                       XML::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+                                       "href" => $parent_plink];
+                       XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
 
-                       $attributes = array(
+                       $attributes = [
                                        "rel" => "related",
-                                       "href" => $parent_plink);
-                       XML::add_element($doc, $entry, "link", "", $attributes);
+                                       "href" => $parent_plink];
+                       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", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]);
 
-                       $attributes = array(
+                       $attributes = [
                                        "href" => $conversation_href,
                                        "local_id" => $item["parent"],
-                                       "ref" => $conversation_uri);
+                                       "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);
@@ -1986,7 +2003,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);
@@ -2000,35 +2017,35 @@ class OStatus
                                dbesc(normalise_link($mention))
                        );
                        if ($r[0]["forum"] || $r[0]["prv"]) {
-                               XML::add_element($doc, $entry, "link", "",
-                                       array(
+                               XML::addElement($doc, $entry, "link", "",
+                                       [
                                                "rel" => "mentioned",
                                                "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
-                                               "href" => $mention)
+                                               "href" => $mention]
                                );
                        } else {
-                               XML::add_element($doc, $entry, "link", "",
-                                       array(
+                               XML::addElement($doc, $entry, "link", "",
+                                       [
                                                "rel" => "mentioned",
                                                "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
-                                               "href" => $mention)
+                                               "href" => $mention]
                                );
                        }
                }
 
                if (!$item["private"]) {
-                       XML::add_element($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", "", ["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"));
-                       XML::add_element($doc, $entry, "mastodon:scope", "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::add_element($doc, $entry, "category", "", array("term" => $t[2]));
+                                       XML::addElement($doc, $entry, "category", "", ["term" => $t[2]]);
                                }
                        }
                }
@@ -2041,57 +2058,66 @@ 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"];
                        }
 
                        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')) {
@@ -2131,10 +2174,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;
        }