]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/DFRN.php
Move Temporal::convert() to DateTimeFormat::convert()
[friendica.git] / src / Protocol / DFRN.php
index 752921424c008003d78a14361671836de0f09881..2269bffcfdc49db18de53961044f2f88a9dbe701 100644 (file)
@@ -8,22 +8,34 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Protocol\OStatus;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
+use Friendica\Content\Text\BBCode;
 
 use dba;
 use DOMDocument;
 use DOMXPath;
+use HTMLPurifier;
+use HTMLPurifier_Config;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -31,7 +43,6 @@ require_once "include/enotify.php";
 require_once "include/threads.php";
 require_once "include/items.php";
 require_once "include/tags.php";
-require_once "include/files.php";
 require_once "include/event.php";
 require_once "include/text.php";
 require_once "include/html2bbcode.php";
@@ -167,7 +178,7 @@ class DFRN
 
                        $contact = $r[0];
                        include_once 'include/security.php';
-                       $groups = init_groups_visitor($contact['id']);
+                       $groups = Group::getIdsByContactId($contact['id']);
 
                        if (count($groups)) {
                                for ($x = 0; $x < count($groups); $x ++)
@@ -218,7 +229,7 @@ class DFRN
                        }
                }
 
-               $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
+               $check_date = DateTimeFormat::utc($last_update);
 
                $r = q(
                        "SELECT `item`.*, `item`.`id` AS `item_id`,
@@ -264,12 +275,12 @@ class DFRN
                $root = self::addHeader($doc, $owner, $author, $alternatelink, true);
 
                /// @TODO This hook can't work anymore
-               //      call_hooks('atom_feed', $atom);
+               //      Addon::callHooks('atom_feed', $atom);
 
                if (!DBM::is_result($items) || $onlyheader) {
                        $atom = trim($doc->saveXML());
 
-                       call_hooks('atom_feed_end', $atom);
+                       Addon::callHooks('atom_feed_end', $atom);
 
                        return $atom;
                }
@@ -298,7 +309,7 @@ class DFRN
 
                $atom = trim($doc->saveXML());
 
-               call_hooks('atom_feed_end', $atom);
+               Addon::callHooks('atom_feed_end', $atom);
 
                return $atom;
        }
@@ -410,7 +421,7 @@ class DFRN
 
                XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
                XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
-               XML::addElement($doc, $mail, "dfrn:sentdate", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00', ATOM_TIME));
+               XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
                XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
                XML::addElement($doc, $mail, "dfrn:content", $item['body']);
 
@@ -473,7 +484,7 @@ class DFRN
                                WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
                        $uid
                );
-               $photos = array();
+               $photos = [];
                $ext = Image::supportedTypes();
 
                foreach ($rp as $p) {
@@ -542,13 +553,13 @@ class DFRN
                XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
                XML::addElement($doc, $root, "title", $owner["name"]);
 
-               $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+               $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION];
                XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
 
-               $attributes = array("rel" => "license", "href" => "http://creativecommons.org/licenses/by/3.0/");
+               $attributes = ["rel" => "license", "href" => "http://creativecommons.org/licenses/by/3.0/"];
                XML::addElement($doc, $root, "link", "", $attributes);
 
-               $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $alternatelink);
+               $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $alternatelink];
                XML::addElement($doc, $root, "link", "", $attributes);
 
 
@@ -556,13 +567,13 @@ class DFRN
                        // DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
                        OStatus::hublinks($doc, $root, $owner["nick"]);
 
-                       $attributes = array("rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
+                       $attributes = ["rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
                        XML::addElement($doc, $root, "link", "", $attributes);
 
-                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
+                       $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
                        XML::addElement($doc, $root, "link", "", $attributes);
 
-                       $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
+                       $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
                        XML::addElement($doc, $root, "link", "", $attributes);
                }
 
@@ -576,7 +587,7 @@ class DFRN
 
                /// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
 
-               XML::addElement($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+               XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
                $author = self::addAuthor($doc, $owner, $authorelement, $public);
                $root->appendChild($author);
@@ -611,22 +622,22 @@ class DFRN
 
                $author = $doc->createElement($authorelement);
 
-               $namdate = datetime_convert('UTC', 'UTC', $owner['name-date'].'+00:00', ATOM_TIME);
-               $uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
-               $picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
+               $namdate = DateTimeFormat::utc($owner['name-date'].'+00:00', DateTimeFormat::ATOM);
+               $uridate = DateTimeFormat::utc($owner['uri-date'].'+00:00', DateTimeFormat::ATOM);
+               $picdate = DateTimeFormat::utc($owner['avatar-date'].'+00:00', DateTimeFormat::ATOM);
 
-               $attributes = array();
+               $attributes = [];
 
                if (!$public || !$hidewall) {
-                       $attributes = array("dfrn:updated" => $namdate);
+                       $attributes = ["dfrn:updated" => $namdate];
                }
 
                XML::addElement($doc, $author, "name", $owner["name"], $attributes);
                XML::addElement($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
                XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
 
-               $attributes = array("rel" => "photo", "type" => "image/jpeg",
-                                       "media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
+               $attributes = ["rel" => "photo", "type" => "image/jpeg",
+                                       "media:width" => 175, "media:height" => 175, "href" => $owner['photo']];
 
                if (!$public || !$hidewall) {
                        $attributes["dfrn:updated"] = $picdate;
@@ -751,20 +762,20 @@ class DFRN
                /// @Todo
                /// - Check real image type and image size
                /// - Check which of these boths elements we should use
-               $attributes = array(
+               $attributes = [
                                "rel" => "photo",
                                "type" => "image/jpeg",
                                "media:width" => 80,
                                "media:height" => 80,
-                               "href" => $contact["photo"]);
+                               "href" => $contact["photo"]];
                XML::addElement($doc, $author, "link", "", $attributes);
 
-               $attributes = array(
+               $attributes = [
                                "rel" => "avatar",
                                "type" => "image/jpeg",
                                "media:width" => 80,
                                "media:height" => 80,
-                               "href" => $contact["photo"]);
+                               "href" => $contact["photo"]];
                XML::addElement($doc, $author, "link", "", $attributes);
 
                return $author;
@@ -785,7 +796,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = parse_xml_string($activity, false);
+                       $r = XML::parseString($activity, false);
                        if (!$r) {
                                return false;
                        }
@@ -808,10 +819,10 @@ class DFRN
                                        $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
 
                                        // XML does need a single element as root element so we add a dummy element here
-                                       $data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
+                                       $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
                                        if (is_object($data)) {
                                                foreach ($data->link as $link) {
-                                                       $attributes = array();
+                                                       $attributes = [];
                                                        foreach ($link->attributes() as $parameter => $value) {
                                                                $attributes[$parameter] = $value;
                                                        }
@@ -819,12 +830,12 @@ class DFRN
                                                }
                                        }
                                } else {
-                                       $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
+                                       $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $r->link];
                                        XML::addElement($doc, $entry, "link", "", $attributes);
                                }
                        }
                        if ($r->content) {
-                               XML::addElement($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+                               XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]);
                        }
 
                        return $entry;
@@ -851,9 +862,9 @@ class DFRN
                                $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]);
@@ -885,14 +896,14 @@ class DFRN
         */
        private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
        {
-               $mentioned = array();
+               $mentioned = [];
 
                if (!$item['parent']) {
                        return;
                }
 
                if ($item['deleted']) {
-                       $attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME));
+                       $attributes = ["ref" => $item['uri'], "when" => DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM)];
                        return XML::createElement($doc, "at:deleted-entry", "", $attributes);
                }
 
@@ -914,7 +925,7 @@ class DFRN
                }
 
                if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
-                       $body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
+                       $body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
                } else {
                        $body = $item['body'];
                }
@@ -941,9 +952,9 @@ class DFRN
                if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
                        $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
                        $parent = q("SELECT `guid`,`plink` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", dbesc($parent_item), intval($item['uid']));
-                       $attributes = array("ref" => $parent_item, "type" => "text/html",
+                       $attributes = ["ref" => $parent_item, "type" => "text/html",
                                                "href" => $parent[0]['plink'],
-                                               "dfrn:diaspora_guid" => $parent[0]['guid']);
+                                               "dfrn:diaspora_guid" => $parent[0]['guid']];
                        XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
                }
 
@@ -963,24 +974,24 @@ class DFRN
                        }
                }
 
-               $attributes = array(
+               $attributes = [
                                "href" => $conversation_href,
-                               "ref" => $conversation_uri);
+                               "ref" => $conversation_uri];
 
                XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
 
                XML::addElement($doc, $entry, "id", $item["uri"]);
                XML::addElement($doc, $entry, "title", $item["title"]);
 
-               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));
+               XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"] . "+00:00", DateTimeFormat::ATOM));
+               XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"] . "+00:00", DateTimeFormat::ATOM));
 
                // "dfrn:env" is used to read the content
                XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));
 
                // The "content" field is not read by the receiver. We could remove it when the type is "text"
                // We keep it at the moment, maybe there is some old version that doesn't read "dfrn:env"
-               XML::addElement($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type));
+               XML::addElement($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), ["type" => $type]);
 
                // We save this value in "plink". Maybe we should read it from there as well?
                XML::addElement(
@@ -988,14 +999,14 @@ class DFRN
                        $entry,
                        "link",
                        "",
-                       array("rel" => "alternate", "type" => "text/html",
-                                "href" => System::baseUrl() . "/display/" . $item["guid"])
+                       ["rel" => "alternate", "type" => "text/html",
+                                "href" => System::baseUrl() . "/display/" . $item["guid"]]
                );
 
                // "comment-allow" is some old fashioned stuff for old Friendica versions.
                // It is included in the rewritten code for completeness
                if ($comment) {
-                       XML::addElement($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+                       XML::addElement($doc, $entry, "dfrn:comment-allow", 1);
                }
 
                if ($item['location']) {
@@ -1019,7 +1030,7 @@ class DFRN
                }
 
                if ($item['app']) {
-                       XML::addElement($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+                       XML::addElement($doc, $entry, "statusnet:notice_info", "", ["local_id" => $item['id'], "source" => $item['app']]);
                }
 
                XML::addElement($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
@@ -1027,11 +1038,11 @@ class DFRN
                // The signed text contains the content in Markdown, the sender handle and the signatur for the content
                // It is needed for relayed comments to Diaspora.
                if ($item['signed_text']) {
-                       $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
+                       $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']]));
                        XML::addElement($doc, $entry, "dfrn:diaspora_signature", $sign);
                }
 
-               XML::addElement($doc, $entry, "activity:verb", construct_verb($item));
+               XML::addElement($doc, $entry, "activity:verb", self::constructVerb($item));
 
                if ($item['object-type'] != "") {
                        XML::addElement($doc, $entry, "activity:object-type", $item['object-type']);
@@ -1051,12 +1062,12 @@ class DFRN
                        $entry->appendChild($actarg);
                }
 
-               $tags = item_getfeedtags($item);
+               $tags = Item::getFeedTags($item);
 
                if (count($tags)) {
                        foreach ($tags as $t) {
                                if (($type != 'html') || ($t[0] != "@")) {
-                                       XML::addElement($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+                                       XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]]);
                                }
                        }
                }
@@ -1082,9 +1093,9 @@ class DFRN
                                        $entry,
                                        "link",
                                        "",
-                                       array("rel" => "mentioned",
+                                       ["rel" => "mentioned",
                                                        "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
-                                                       "href" => $mention)
+                                                       "href" => $mention]
                                );
                        } else {
                                XML::addElement(
@@ -1092,9 +1103,9 @@ class DFRN
                                        $entry,
                                        "link",
                                        "",
-                                       array("rel" => "mentioned",
+                                       ["rel" => "mentioned",
                                                        "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
-                                                       "href" => $mention)
+                                                       "href" => $mention]
                                );
                        }
                }
@@ -1179,7 +1190,7 @@ class DFRN
 
                logger('dfrn_deliver: ' . $url);
 
-               $ret = z_fetch_url($url);
+               $ret = Network::curl($url);
 
                if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                        return -2; // timed out
@@ -1204,13 +1215,13 @@ class DFRN
                        return 3;
                }
 
-               $res = parse_xml_string($xml);
+               $res = XML::parseString($xml);
 
                if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
                        return (($res->status) ? $res->status : 3);
                }
 
-               $postvars     = array();
+               $postvars     = [];
                $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
                $challenge    = hex2bin((string) $res->challenge);
                $perm         = (($res->perm) ? $res->perm : null);
@@ -1289,31 +1300,9 @@ class DFRN
 
                        switch ($rino_remote_version) {
                                case 1:
-                                       // Deprecated rino version!
                                        $key = openssl_random_pseudo_bytes(16);
                                        $data = self::aesEncrypt($postvars['data'], $key);
                                        break;
-                               case 2:
-                                       // RINO 2 based on php-encryption
-                                       try {
-                                               $key = \Crypto::CreateNewRandomKey();
-                                       } catch (\CryptoTestFailedException $ex) {
-                                               logger('Cannot safely create a key');
-                                               return -4;
-                                       } catch (\CannotPerformOperationException $ex) {
-                                               logger('Cannot safely create a key');
-                                               return -5;
-                                       }
-                                       try {
-                                               $data = \Crypto::Encrypt($postvars['data'], $key);
-                                       } catch (\CryptoTestFailedException $ex) {
-                                               logger('Cannot safely perform encryption');
-                                               return -6;
-                                       } catch (\CannotPerformOperationException $ex) {
-                                               logger('Cannot safely perform encryption');
-                                               return -7;
-                                       }
-                                       break;
                                default:
                                        logger("rino: invalid requested version '$rino_remote_version'");
                                        return -8;
@@ -1322,9 +1311,6 @@ class DFRN
                        $postvars['rino'] = $rino_remote_version;
                        $postvars['data'] = bin2hex($data);
 
-                       //logger('rino: sent key = ' . $key, LOGGER_DEBUG);
-
-
                        if ($dfrn_version >= 2.1) {
                                if (($contact['duplex'] && strlen($contact['pubkey']))
                                        || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
@@ -1350,7 +1336,7 @@ class DFRN
 
                logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
 
-               $xml = post_url($contact['notify'], $postvars);
+               $xml = Network::post($contact['notify'], $postvars);
 
                logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
 
@@ -1374,7 +1360,7 @@ class DFRN
                        Contact::unmarkForArchival($contact);
                }
 
-               $res = parse_xml_string($xml);
+               $res = XML::parseString($xml);
 
                if (!isset($res->status)) {
                        return -11;
@@ -1402,7 +1388,7 @@ class DFRN
                        "SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
                        intval($contact["uid"]),
                        intval($contact["id"]),
-                       dbesc(datetime_convert("UTC", "UTC", $birthday)),
+                       dbesc(DateTimeFormat::utc($birthday)),
                        dbesc("birthday")
                );
 
@@ -1412,18 +1398,18 @@ class DFRN
 
                logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
 
-               $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
-               $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]");
+               $bdtext = L10n::t("%s\'s birthday", $contact["name"]);
+               $bdtext2 = L10n::t("Happy Birthday %s", " [url=".$contact["url"]."]".$contact["name"]."[/url]");
 
                $r = q(
                        "INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
                        intval($contact["uid"]),
                        intval($contact["id"]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert("UTC", "UTC", $birthday)),
-                       dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utc($birthday)),
+                       dbesc(DateTimeFormat::utc($birthday . " + 1 day ")),
                        dbesc($bdtext),
                        dbesc($bdtext2),
                        dbesc("birthday")
@@ -1445,7 +1431,7 @@ class DFRN
         */
        private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
        {
-               $author = array();
+               $author = [];
                $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
                $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
 
@@ -1473,7 +1459,7 @@ class DFRN
                }
 
                // Until now we aren't serving different sizes - but maybe later
-               $avatarlist = array();
+               $avatarlist = [];
                /// @todo check if "avatar" or "photo" would be the best field in the specification
                $avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
                foreach ($avatars as $avatar) {
@@ -1503,7 +1489,7 @@ class DFRN
                if (DBM::is_result($r) && !$onlyfetch) {
                        logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
-                       $poco = array("url" => $contact["url"]);
+                       $poco = ["url" => $contact["url"]];
 
                        // When was the last change to name or uri?
                        $name_element = $xpath->query($element . "/atom:name", $context)->item(0);
@@ -1571,7 +1557,7 @@ class DFRN
                        }
 
                        // Save the keywords into the contact table
-                       $tags = array();
+                       $tags = [];
                        $tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
                        foreach ($tagelements as $tag) {
                                $tags[$tag->nodeValue] = $tag->nodeValue;
@@ -1595,7 +1581,7 @@ class DFRN
                        // "poco:birthday" is the birthday in the format "yyyy-mm-dd"
                        $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
 
-                       if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) {
+                       if (!in_array($value, ["", "0000-00-00", "0001-01-01"])) {
                                $bdyear = date("Y");
                                $value = str_replace("0000", $bdyear, $value);
 
@@ -1614,7 +1600,7 @@ class DFRN
                        }
 
                        // Get all field names
-                       $fields = array();
+                       $fields = [];
                        foreach ($r[0] as $field => $data) {
                                $fields[$field] = $data;
                        }
@@ -1627,7 +1613,7 @@ class DFRN
                        unset($fields["uri-date"]);
 
                        // Update check for this field has to be done differently
-                       $datefields = array("name-date", "uri-date");
+                       $datefields = ["name-date", "uri-date"];
                        foreach ($datefields as $field) {
                                if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
                                        logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
@@ -1753,7 +1739,7 @@ class DFRN
                logger("Processing mails");
 
                /// @TODO Rewrite this to one statement
-               $msg = array();
+               $msg = [];
                $msg["uid"] = $importer["importer_uid"];
                $msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
                $msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue;
@@ -1771,7 +1757,7 @@ class DFRN
 
                // send notifications.
                /// @TODO Arange this mess
-               $notif_params = array(
+               $notif_params = [
                        "type" => NOTIFY_MAIL,
                        "notify_flags" => $importer["notify-flags"],
                        "language" => $importer["language"],
@@ -1784,7 +1770,7 @@ class DFRN
                        "source_photo" => $importer["thumb"],
                        "verb" => ACTIVITY_POST,
                        "otype" => "mail"
-               );
+               ];
 
                notification($notif_params);
 
@@ -1807,7 +1793,7 @@ class DFRN
                logger("Processing suggestions");
 
                /// @TODO Rewrite this to one statement
-               $suggest = array();
+               $suggest = [];
                $suggest["uid"] = $importer["importer_uid"];
                $suggest["cid"] = $importer["id"];
                $suggest["url"] = $xpath->query("dfrn:url/text()", $suggestion)->item(0)->nodeValue;
@@ -1903,12 +1889,12 @@ class DFRN
                        intval($suggest["cid"]),
                        dbesc($suggest["body"]),
                        dbesc($hash),
-                       dbesc(datetime_convert()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval(0)
                );
 
                notification(
-                       array(
+                       [
                                "type"         => NOTIFY_SUGGEST,
                                "notify_flags" => $importer["notify-flags"],
                                "language"     => $importer["language"],
@@ -1921,7 +1907,7 @@ class DFRN
                                "source_link"  => $importer["url"],
                                "source_photo" => $importer["photo"],
                                "verb"         => ACTIVITY_REQ_FRIEND,
-                               "otype"        => "intro")
+                               "otype"        => "intro"]
                );
 
                return true;
@@ -1941,7 +1927,7 @@ class DFRN
                logger("Processing relocations");
 
                /// @TODO Rewrite this to one statement
-               $relocate = array();
+               $relocate = [];
                $relocate["uid"] = $importer["importer_uid"];
                $relocate["cid"] = $importer["id"];
                $relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
@@ -2041,12 +2027,12 @@ class DFRN
 
                // update items
                /// @todo This is an extreme performance killer
-               $fields = array(
-                       'owner-link' => array($old["url"], $relocate["url"]),
-                       'author-link' => array($old["url"], $relocate["url"]),
+               $fields = [
+                       'owner-link' => [$old["url"], $relocate["url"]],
+                       'author-link' => [$old["url"], $relocate["url"]],
                        //'owner-avatar' => array($old["photo"], $relocate["photo"]),
                        //'author-avatar' => array($old["photo"], $relocate["photo"]),
-               );
+               ];
                foreach ($fields as $n => $f) {
                        $r = q(
                                "SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
@@ -2093,17 +2079,17 @@ class DFRN
        {
                $changed = false;
 
-               if (edited_timestamp_is_newer($current, $item)) {
+               if (self::isEditedTimestampNewer($current, $item)) {
                        // do not accept (ignore) an earlier edit than one we currently have.
-                       if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
+                       if (DateTimeFormat::utc($item["edited"]) < $current["edited"]) {
                                return false;
                        }
 
-                       $fields = array('title' => $item["title"], 'body' => $item["body"],
-                                       'tag' => $item["tag"], 'changed' => datetime_convert(),
-                                       'edited' => datetime_convert("UTC", "UTC", $item["edited"]));
+                       $fields = ['title' => $item["title"], 'body' => $item["body"],
+                                       'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+                                       'edited' => DateTimeFormat::utc($item["edited"])];
 
-                       $condition = array("`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]);
+                       $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
                        dba::update('item', $fields, $condition);
 
                        create_tags_from_itemuri($item["uri"], $importer["importer_uid"]);
@@ -2115,23 +2101,6 @@ class DFRN
                                Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $current["id"]);
                        }
                }
-
-               // update last-child if it changes
-               if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
-                       $r = q(
-                               "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
-                               dbesc(datetime_convert()),
-                               dbesc($item["parent-uri"]),
-                               intval($importer["importer_uid"])
-                       );
-                       $r = q(
-                               "UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
-                               intval($item["last-child"]),
-                               dbesc(datetime_convert()),
-                               dbesc($item["uri"]),
-                               intval($importer["importer_uid"])
-                       );
-               }
                return $changed;
        }
 
@@ -2192,8 +2161,6 @@ class DFRN
                         * valid community action. Also forum_mode makes it valid for sure.
                         * If neither, it's not.
                         */
-
-                       /// @TODO Maybe merge these if() blocks into one?
                        if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
                                $is_a_remote_action = false;
                                logger("not a community action");
@@ -2224,7 +2191,7 @@ class DFRN
                if (!$verb) {
                        return;
                }
-               $xo = parse_xml_string($item["object"], false);
+               $xo = XML::parseString($item["object"], false);
 
                if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
                        // somebody was poked/prodded. Was it me?
@@ -2242,7 +2209,7 @@ class DFRN
                        if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
                                // send a notification
                                notification(
-                                       array(
+                                       [
                                        "type"         => NOTIFY_POKE,
                                        "notify_flags" => $importer["notify-flags"],
                                        "language"     => $importer["language"],
@@ -2250,7 +2217,7 @@ class DFRN
                                        "to_email"     => $importer["email"],
                                        "uid"          => $importer["importer_uid"],
                                        "item"         => $item,
-                                       "link"         => System::baseUrl()."/display/".urlencode(get_item_guid($posted_id)),
+                                       "link"         => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
                                        "source_name"  => stripslashes($item["author-name"]),
                                        "source_link"  => $item["author-link"],
                                        "source_photo" => ((link_compare($item["author-link"], $importer["url"]))
@@ -2258,7 +2225,7 @@ class DFRN
                                        "verb"         => $item["verb"],
                                        "otype"        => "person",
                                        "activity"     => $verb,
-                                       "parent"       => $item["parent"])
+                                       "parent"       => $item["parent"]]
                                );
                        }
                }
@@ -2290,22 +2257,22 @@ class DFRN
                        // This function once was responsible for DFRN and OStatus.
                        if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
                                logger("New follower");
-                               new_follower($importer, $contact, $item, $nickname);
+                               Contact::addRelationship($importer, $contact, $item, $nickname);
                                return false;
                        }
                        if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
                                logger("Lost follower");
-                               lose_follower($importer, $contact, $item);
+                               Contact::removeFollower($importer, $contact, $item);
                                return false;
                        }
                        if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
                                logger("New friend request");
-                               new_follower($importer, $contact, $item, $nickname, true);
+                               Contact::addRelationship($importer, $contact, $item, $nickname, true);
                                return false;
                        }
                        if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
                                logger("Lost sharer");
-                               lose_sharer($importer, $contact, $item);
+                               Contact::removeSharer($importer, $contact, $item);
                                return false;
                        }
                } else {
@@ -2346,8 +2313,8 @@ class DFRN
                        }
 
                        if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
-                               $xo = parse_xml_string($item["object"], false);
-                               $xt = parse_xml_string($item["target"], false);
+                               $xo = XML::parseString($item["object"], false);
+                               $xt = XML::parseString($item["target"], false);
 
                                if ($xt->type == ACTIVITY_OBJ_NOTE) {
                                        $r = q(
@@ -2395,21 +2362,12 @@ class DFRN
                $title = "";
                foreach ($links as $link) {
                        foreach ($link->attributes as $attributes) {
-                               /// @TODO Rewrite these repeated (same) if () statements to a switch()
-                               if ($attributes->name == "href") {
-                                       $href = $attributes->textContent;
-                               }
-                               if ($attributes->name == "rel") {
-                                       $rel = $attributes->textContent;
-                               }
-                               if ($attributes->name == "type") {
-                                       $type = $attributes->textContent;
-                               }
-                               if ($attributes->name == "length") {
-                                       $length = $attributes->textContent;
-                               }
-                               if ($attributes->name == "title") {
-                                       $title = $attributes->textContent;
+                               switch ($attributes->name) {
+                                       case "href"  : $href   = $attributes->textContent; break;
+                                       case "rel"   : $rel    = $attributes->textContent; break;
+                                       case "type"  : $type   = $attributes->textContent; break;
+                                       case "length": $length = $attributes->textContent; break;
+                                       case "title" : $title  = $attributes->textContent; break;
                                }
                        }
                        if (($rel != "") && ($href != "")) {
@@ -2457,14 +2415,14 @@ class DFRN
                $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
 
                $current = q(
-                       "SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                       "SELECT `id`, `uid`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($item["uri"]),
                        intval($importer["importer_uid"])
                );
 
                // Is there an existing item?
-               if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item)
-                       && (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"])
+               if (DBM::is_result($current) && self::isEditedTimestampNewer($current[0], $item)
+                       && (DateTimeFormat::utc($item["edited"]) < $current[0]["edited"])
                ) {
                        logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
                        return;
@@ -2489,11 +2447,11 @@ class DFRN
                $item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
 
                $item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
-               $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''), $item["body"]);
+               $item["body"] = str_replace([' ',"\t","\r","\n"], ['','','',''], $item["body"]);
                // make sure nobody is trying to sneak some html tags by us
                $item["body"] = notags(base64url_decode($item["body"]));
 
-               $item["body"] = limit_body_size($item["body"]);
+               $item["body"] = BBCode::limitBodySize($item["body"]);
 
                /// @todo Do we really need this check for HTML elements? (It was copied from the old function)
                if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
@@ -2504,13 +2462,13 @@ class DFRN
 
                        $item['body'] = OEmbed::HTML2BBCode($item['body']);
 
-                       $config = \HTMLPurifier_Config::createDefault();
+                       $config = HTMLPurifier_Config::createDefault();
                        $config->set('Cache.DefinitionImpl', null);
 
                        // we shouldn't need a whitelist, because the bbcode converter
                        // will strip out any unsupported tags.
 
-                       $purifier = new \HTMLPurifier($config);
+                       $purifier = new HTMLPurifier($config);
                        $item['body'] = $purifier->purify($item['body']);
 
                        $item['body'] = @html2bbcode($item['body']);
@@ -2521,7 +2479,6 @@ class DFRN
                // We don't need the content element since "dfrn:env" is always present
                //$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
 
-               $item["last-child"] = $xpath->query("dfrn:comment-allow/text()", $entry)->item(0)->nodeValue;
                $item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
 
                $georsspoint = $xpath->query("georss:point", $entry);
@@ -2548,7 +2505,7 @@ class DFRN
 
                $item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
 
-               // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
+               // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
                $dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
                if ($dsprsig != "") {
                        $item["dsprsig"] = $dsprsig;
@@ -2564,7 +2521,7 @@ class DFRN
                $item["object"] = self::transformActivity($xpath, $object, "object");
 
                if (trim($item["object"]) != "") {
-                       $r = parse_xml_string($item["object"], false);
+                       $r = XML::parseString($item["object"], false);
                        if (isset($r->type)) {
                                $item["object-type"] = $r->type;
                        }
@@ -2641,7 +2598,7 @@ class DFRN
                $entrytype = self::getEntryType($importer, $item);
 
                // Now assign the rest of the values that depend on the type of the message
-               if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
+               if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
                        if (!isset($item["object-type"])) {
                                $item["object-type"] = ACTIVITY_OBJ_COMMENT;
                        }
@@ -2661,16 +2618,6 @@ class DFRN
                        if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
                                $item["network"] = $author["network"];
                        }
-
-                       /// @TODO maybe remove this old-lost code then?
-                       // This code was taken from the old DFRN code
-                       // When activated, forums don't work.
-                       // And: Why should we disallow commenting by followers?
-                       // the behaviour is now similar to the Diaspora part.
-                       //if ($importer["rel"] == CONTACT_IS_FOLLOWER) {
-                       //      logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
-                       //      return;
-                       //}
                }
 
                if ($entrytype == DFRN_REPLY_RC) {
@@ -2687,13 +2634,12 @@ class DFRN
                                $ev = bbtoevent($item["body"]);
                                if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
                                        logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
-                                       /// @TODO Mixure of "/' ahead ...
-                                       $ev["cid"] = $importer["id"];
-                                       $ev["uid"] = $importer["uid"];
-                                       $ev["uri"] = $item["uri"];
-                                       $ev["edited"] = $item["edited"];
-                                       $ev['private'] = $item['private'];
-                                       $ev["guid"] = $item["guid"];
+                                       $ev["cid"]     = $importer["id"];
+                                       $ev["uid"]     = $importer["uid"];
+                                       $ev["uri"]     = $item["uri"];
+                                       $ev["edited"]  = $item["edited"];
+                                       $ev["private"] = $item["private"];
+                                       $ev["guid"]    = $item["guid"];
 
                                        $r = q(
                                                "SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -2726,8 +2672,8 @@ class DFRN
                        return;
                }
 
-               if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
-                       $posted_id = item_store($item);
+               if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
+                       $posted_id = Item::insert($item);
                        $parent = 0;
 
                        if ($posted_id) {
@@ -2745,22 +2691,6 @@ class DFRN
                                        $parent_uri = $r[0]["parent-uri"];
                                }
 
-                               if (!$is_like) {
-                                       $r1 = q(
-                                               "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
-                                               dbesc(datetime_convert()),
-                                               intval($importer["importer_uid"]),
-                                               intval($r[0]["parent"])
-                                       );
-
-                                       $r2 = q(
-                                               "UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
-                                               dbesc(datetime_convert()),
-                                               intval($importer["importer_uid"]),
-                                               intval($posted_id)
-                                       );
-                               }
-
                                if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
                                        logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
                                        Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $posted_id);
@@ -2773,7 +2703,7 @@ class DFRN
                                /*
                                 * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
                                 * but otherwise there's a possible data mixup on the sender's system.
-                                * the tgroup delivery code called from item_store will correct it if it's a forum,
+                                * the tgroup delivery code called from Item::insert will correct it if it's a forum,
                                 * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
                                 */
                                logger('Correcting item owner.', LOGGER_DEBUG);
@@ -2782,16 +2712,16 @@ class DFRN
                                $item["owner-avatar"] = $importer["thumb"];
                        }
 
-                       if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+                       if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
                                logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
                                return;
                        }
 
                        // This is my contact on another system, but it's really me.
                        // Turn this into a wall post.
-                       $notify = item_is_remote_self($importer, $item);
+                       $notify = Item::isRemoteSelf($importer, $item);
 
-                       $posted_id = item_store($item, false, $notify);
+                       $posted_id = Item::insert($item, false, $notify);
 
                        logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
 
@@ -2823,9 +2753,9 @@ class DFRN
                        }
                }
                if ($when) {
-                       $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
+                       $when = DateTimeFormat::utc($when);
                } else {
-                       $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
+                       $when = DateTimeFormat::utcNow();
                }
 
                if (!$uri || !$importer["id"]) {
@@ -2860,8 +2790,8 @@ class DFRN
                        }
 
                        if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
-                               $xo = parse_xml_string($item["object"], false);
-                               $xt = parse_xml_string($item["target"], false);
+                               $xo = XML::parseString($item["object"], false);
+                               $xt = XML::parseString($item["target"], false);
 
                                if ($xt->type == ACTIVITY_OBJ_NOTE) {
                                        $i = q(
@@ -2881,7 +2811,7 @@ class DFRN
                                                }
                                                if ($author_remove || $owner_remove) {
                                                        $tags = explode(',', $i[0]["tag"]);
-                                                       $newtags = array();
+                                                       $newtags = [];
                                                        if (count($tags)) {
                                                                foreach ($tags as $tag) {
                                                                        if (trim($tag) !== trim($xo->body)) {
@@ -2906,12 +2836,12 @@ class DFRN
                                                `body` = '', `title` = ''
                                        WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
                                        dbesc($when),
-                                       dbesc(datetime_convert()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($uri),
                                        intval($importer["uid"])
                                );
                                create_tags_from_itemuri($uri, $importer["uid"]);
-                               create_files_from_itemuri($uri, $importer["uid"]);
+                               Term::createFromItemURI($uri, $importer["uid"]);
                                update_thread_uri($uri, $importer["uid"]);
                        } else {
                                $r = q(
@@ -2919,35 +2849,14 @@ class DFRN
                                                `body` = '', `title` = ''
                                        WHERE `uri` = '%s' AND `uid` IN (0, %d)",
                                        dbesc($when),
-                                       dbesc(datetime_convert()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($uri),
                                        intval($importer["uid"])
                                );
                                create_tags_from_itemuri($uri, $importer["uid"]);
-                               create_files_from_itemuri($uri, $importer["uid"]);
+                               Term::createFromItemURI($uri, $importer["uid"]);
                                update_thread_uri($uri, $importer["importer_uid"]);
-                               if ($item["last-child"]) {
-                                       // ensure that last-child is set in case the comment that had it just got wiped.
-                                       q(
-                                               "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
-                                               dbesc(datetime_convert()),
-                                               dbesc($item["parent-uri"]),
-                                               intval($item["uid"])
-                                       );
-                                       // who is the last child now?
-                                       $r = q(
-                                               "SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
-                                               ORDER BY `created` DESC LIMIT 1",
-                                               dbesc($item["parent-uri"]),
-                                               intval($importer["uid"])
-                                       );
-                                       if (DBM::is_result($r)) {
-                                               q(
-                                                       "UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
-                                                       intval($r[0]["id"])
-                                               );
-                                       }
-                               }
+
                                // if this is a relayed delete, propagate it to other recipients
 
                                if ($entrytype == DFRN_REPLY_RC) {
@@ -2988,7 +2897,7 @@ class DFRN
                $xpath->registerNamespace("ostatus", NAMESPACE_OSTATUS);
                $xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET);
 
-               $header = array();
+               $header = [];
                $header["uid"] = $importer["uid"];
                $header["network"] = NETWORK_DFRN;
                $header["type"] = "remote";
@@ -3015,7 +2924,7 @@ class DFRN
                        $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
 
                        if ($accounttype != $importer["contact-type"]) {
-                               dba::update('contact', array('contact-type' => $accounttype), array('id' => $importer["id"]));
+                               dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
                        }
                }
 
@@ -3024,8 +2933,8 @@ class DFRN
                $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
 
                if ($forum != $importer["forum"]) {
-                       $condition = array('`forum` != ? AND `id` = ?', $forum, $importer["id"]);
-                       dba::update('contact', array('forum' => $forum), $condition);
+                       $condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
+                       dba::update('contact', ['forum' => $forum], $condition);
                }
 
                // We are processing relocations even if we are ignoring a contact
@@ -3062,7 +2971,7 @@ class DFRN
                                self::processEntry($header, $xpath, $entry, $importer, $xml);
                        }
                } else {
-                       $newentries = array();
+                       $newentries = [];
                        $entries = $xpath->query("/atom:feed/atom:entry");
                        foreach ($entries as $entry) {
                                $created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
@@ -3079,4 +2988,178 @@ class DFRN
                logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
                return 200;
        }
+
+       /**
+        * @param App    $a            App
+        * @param string $contact_nick contact nickname
+        */
+       public static function autoRedir(App $a, $contact_nick)
+       {
+               // prevent looping
+               if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
+                       return;
+               }
+
+               if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) {
+                       return;
+               }
+
+               if (local_user()) {
+                       // We need to find out if $contact_nick is a user on this hub, and if so, if I
+                       // am a contact of that user. However, that user may have other contacts with the
+                       // same nickname as me on other hubs or other networks. Exclude these by requiring
+                       // that the contact have a local URL. I will be the only person with my nickname at
+                       // this URL, so if a result is found, then I am a contact of the $contact_nick user.
+                       //
+                       // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
+
+                       $baseurl = System::baseUrl();
+                       $domain_st = strpos($baseurl, "://");
+                       if ($domain_st === false) {
+                               return;
+                       }
+                       $baseurl = substr($baseurl, $domain_st + 3);
+                       $nurl = normalise_link($baseurl);
+
+                       /// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
+                       $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
+                                       AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
+                               dbesc($contact_nick),
+                               dbesc($a->user['nickname']),
+                               dbesc($baseurl),
+                               dbesc($nurl)
+                       );
+                       if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
+                               return;
+                       }
+
+                       $r = q("SELECT * FROM contact WHERE nick = '%s'
+                                       AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
+                               dbesc($contact_nick),
+                               dbesc(NETWORK_DFRN),
+                               intval(local_user()),
+                               dbesc($baseurl)
+                       );
+                       if (! DBM::is_result($r)) {
+                               return;
+                       }
+
+                       $cid = $r[0]['id'];
+
+                       $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+                       if ($r[0]['duplex'] && $r[0]['issued-id']) {
+                               $orig_id = $r[0]['issued-id'];
+                               $dfrn_id = '1:' . $orig_id;
+                       }
+                       if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
+                               $orig_id = $r[0]['dfrn-id'];
+                               $dfrn_id = '0:' . $orig_id;
+                       }
+
+                       // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
+                       // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
+
+                       if (strlen($dfrn_id) < 3) {
+                               return;
+                       }
+
+                       $sec = random_string();
+
+                       dba::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
+
+                       $url = curPageURL();
+
+                       logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+                       $dest = (($url) ? '&destination_url=' . $url : '');
+                       goaway($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+                               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
+               }
+
+               return;
+       }
+
+       /**
+        * @brief Returns the activity verb
+        *
+        * @param array $item Item array
+        *
+        * @return string activity verb
+        */
+       private static function constructVerb(array $item)
+       {
+               if ($item['verb']) {
+                       return $item['verb'];
+               }
+               return ACTIVITY_POST;
+       }
+
+       private static function tgroupCheck($uid, $item)
+       {
+               $mention = false;
+
+               // check that the message originated elsewhere and is a top-level post
+
+               if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['parent-uri'])) {
+                       return false;
+               }
+
+               $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+                       intval($uid)
+               );
+               if (!DBM::is_result($u)) {
+                       return false;
+               }
+
+               $community_page = ($u[0]['page-flags'] == PAGE_COMMUNITY);
+               $prvgroup = ($u[0]['page-flags'] == PAGE_PRVGROUP);
+
+               $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+
+               /*
+                * Diaspora uses their own hardwired link URL in @-tags
+                * instead of the one we supply with webfinger
+                */
+               $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+
+               $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
+               if ($cnt) {
+                       foreach ($matches as $mtch) {
+                               if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
+                                       $mention = true;
+                                       logger('mention found: ' . $mtch[2]);
+                               }
+                       }
+               }
+
+               if (!$mention) {
+                       return false;
+               }
+
+               return $community_page || $prvgroup;
+       }
+
+       /**
+        * This function returns true if $update has an edited timestamp newer
+        * than $existing, i.e. $update contains new data which should override
+        * what's already there.  If there is no timestamp yet, the update is
+        * assumed to be newer.  If the update has no timestamp, the existing
+        * item is assumed to be up-to-date.  If the timestamps are equal it
+        * assumes the update has been seen before and should be ignored.
+        *
+        */
+       private static function isEditedTimestampNewer($existing, $update)
+       {
+               if (!x($existing, 'edited') || !$existing['edited']) {
+                       return true;
+               }
+               if (!x($update, 'edited') || !$update['edited']) {
+                       return false;
+               }
+
+               $existing_edited = DateTimeFormat::utc($existing['edited']);
+               $update_edited = DateTimeFormat::utc($update['edited']);
+
+               return (strcmp($existing_edited, $update_edited) < 0);
+       }
 }