]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/DFRN.php
Bugfix for check that the DFRN entry already exists
[friendica.git] / src / Protocol / DFRN.php
index 76e8d5856411bccf8a62a30a061d047d5bfb0b9a..ca881484611302634828fb397b3fce0625e260ff 100644 (file)
@@ -10,21 +10,26 @@ namespace Friendica\Protocol;
 
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\Text\BBCode;
+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 as FriendicaCrypto;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
-
 use dba;
 use DOMDocument;
 use DOMXPath;
@@ -34,9 +39,7 @@ use HTMLPurifier_Config;
 require_once 'boot.php';
 require_once 'include/dba.php';
 require_once "include/enotify.php";
-require_once "include/threads.php";
 require_once "include/items.php";
-require_once "include/tags.php";
 require_once "include/event.php";
 require_once "include/text.php";
 require_once "include/html2bbcode.php";
@@ -223,7 +226,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`,
@@ -269,12 +272,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;
                }
@@ -303,7 +306,7 @@ class DFRN
 
                $atom = trim($doc->saveXML());
 
-               call_hooks('atom_feed_end', $atom);
+               Addon::callHooks('atom_feed_end', $atom);
 
                return $atom;
        }
@@ -415,7 +418,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']);
 
@@ -468,7 +471,7 @@ class DFRN
                /* get site pubkey. this could be a new installation with no site keys*/
                $pubkey = Config::get('system', 'site_pubkey');
                if (! $pubkey) {
-                       $res = FriendicaCrypto::newKeypair(2048);
+                       $res = Crypto::newKeypair(1024);
                        Config::set('system', 'site_prvkey', $res['prvkey']);
                        Config::set('system', 'site_pubkey', $res['pubkey']);
                }
@@ -581,7 +584,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);
@@ -616,9 +619,9 @@ 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 = [];
 
@@ -790,7 +793,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = parse_xml_string($activity, false);
+                       $r = XML::parseString($activity, false);
                        if (!$r) {
                                return false;
                        }
@@ -813,7 +816,7 @@ 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 = [];
@@ -897,7 +900,7 @@ class DFRN
                }
 
                if ($item['deleted']) {
-                       $attributes = ["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);
                }
 
@@ -919,13 +922,13 @@ 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'];
                }
 
                // Remove the abstract element. It is only locally important.
-               $body = remove_abstract($body);
+               $body = BBCode::stripAbstract($body);
 
                if ($type == 'html') {
                        $htmlbody = $body;
@@ -977,8 +980,8 @@ class DFRN
                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));
@@ -1036,7 +1039,7 @@ class DFRN
                        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']);
@@ -1056,7 +1059,7 @@ class DFRN
                        $entry->appendChild($actarg);
                }
 
-               $tags = item_getfeedtags($item);
+               $tags = Item::getFeedTags($item);
 
                if (count($tags)) {
                        foreach ($tags as $t) {
@@ -1184,7 +1187,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
@@ -1209,7 +1212,7 @@ 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);
@@ -1294,10 +1297,6 @@ class DFRN
 
                        switch ($rino_remote_version) {
                                case 1:
-                               case 2:
-                                       $rino = 1;
-                                       $rino_remote_version = 1;
-                                       // Deprecated rino version!
                                        $key = openssl_random_pseudo_bytes(16);
                                        $data = self::aesEncrypt($postvars['data'], $key);
                                        break;
@@ -1309,8 +1308,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']))
@@ -1336,7 +1333,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);
 
@@ -1360,7 +1357,7 @@ class DFRN
                        Contact::unmarkForArchival($contact);
                }
 
-               $res = parse_xml_string($xml);
+               $res = XML::parseString($xml);
 
                if (!isset($res->status)) {
                        return -11;
@@ -1388,7 +1385,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")
                );
 
@@ -1398,18 +1395,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")
@@ -1889,7 +1886,7 @@ class DFRN
                        intval($suggest["cid"]),
                        dbesc($suggest["body"]),
                        dbesc($hash),
-                       dbesc(datetime_convert()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval(0)
                );
 
@@ -2079,21 +2076,18 @@ 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 = ['title' => $item["title"], 'body' => $item["body"],
-                                       'tag' => $item["tag"], 'changed' => datetime_convert(),
-                                       'edited' => datetime_convert("UTC", "UTC", $item["edited"])];
+                                       'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+                                       'edited' => DateTimeFormat::utc($item["edited"])];
 
                        $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"]);
-                       update_thread_uri($item["uri"], $importer["importer_uid"]);
+                       Item::update($fields, $condition);
 
                        $changed = true;
 
@@ -2161,8 +2155,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");
@@ -2193,7 +2185,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?
@@ -2219,7 +2211,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"]))
@@ -2259,22 +2251,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 {
@@ -2315,8 +2307,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(
@@ -2332,13 +2324,9 @@ class DFRN
 
                                        // extract tag, if not duplicate, add to parent item
                                        if ($xo->content) {
-                                               if (!(stristr($r[0]["tag"], trim($xo->content)))) {
-                                                       q(
-                                                               "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
-                                                               dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
-                                                               intval($r[0]["id"])
-                                                       );
-                                                       create_tags_from_item($r[0]["id"]);
+                                               if (!stristr($r[0]["tag"], trim($xo->content))) {
+                                                       $tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+                                                       Item::update(['tag' => $tag], ['id' => $r[0]["id"]]);
                                                }
                                        }
                                }
@@ -2364,21 +2352,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 != "")) {
@@ -2432,10 +2411,8 @@ class DFRN
                );
 
                // 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"])
-               ) {
-                       logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+               if (DBM::is_result($current) && !self::isEditedTimestampNewer($current[0], $item)) {
+                       logger("Item ".$item["uri"]." already existed in this version.", LOGGER_DEBUG);
                        return;
                }
 
@@ -2462,7 +2439,7 @@ class DFRN
                // 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)) {
@@ -2516,7 +2493,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;
@@ -2532,7 +2509,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;
                        }
@@ -2629,16 +2606,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) {
@@ -2655,13 +2622,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",
@@ -2695,7 +2661,7 @@ class DFRN
                }
 
                if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
-                       $posted_id = item_store($item);
+                       $posted_id = Item::insert($item);
                        $parent = 0;
 
                        if ($posted_id) {
@@ -2725,7 +2691,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);
@@ -2734,16 +2700,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);
 
@@ -2770,121 +2736,35 @@ class DFRN
                        if ($attributes->name == "ref") {
                                $uri = $attributes->textContent;
                        }
-                       if ($attributes->name == "when") {
-                               $when = $attributes->textContent;
-                       }
-               }
-               if ($when) {
-                       $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
-               } else {
-                       $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
                }
 
                if (!$uri || !$importer["id"]) {
                        return false;
                }
 
-               /// @todo Only select the used fields
-               $r = q(
-                       "SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
-                       WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
-                       dbesc($uri),
-                       intval($importer["uid"]),
-                       intval($importer["id"])
-               );
-               if (!DBM::is_result($r)) {
+               $condition = ["`uri` = ? AND `uid` = ? AND `contact-id` = ? AND NOT `file` LIKE '%[%'",
+                               $uri, $importer["uid"], $importer["id"]];
+               $item = dba::selectFirst('item', ['id'], $condition);
+               if (!DBM::is_result($item)) {
                        logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
                        return;
-               } else {
-                       $item = $r[0];
-
-                       $entrytype = self::getEntryType($importer, $item);
-
-                       if (!$item["deleted"]) {
-                               logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
-                       } else {
-                               return;
-                       }
-
-                       if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
-                               logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
-                               event_delete($item["event-id"]);
-                       }
-
-                       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);
-
-                               if ($xt->type == ACTIVITY_OBJ_NOTE) {
-                                       $i = q(
-                                               "SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($xt->id),
-                                               intval($importer["importer_uid"])
-                                       );
-                                       if (DBM::is_result($i)) {
-                                               // For tags, the owner cannot remove the tag on the author's copy of the post.
-
-                                               $owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
-                                               $author_remove = (($item["origin"] && $item["self"]) ? true : false);
-                                               $author_copy = (($item["origin"]) ? true : false);
+               }
 
-                                               if ($owner_remove && $author_copy) {
-                                                       return;
-                                               }
-                                               if ($author_remove || $owner_remove) {
-                                                       $tags = explode(',', $i[0]["tag"]);
-                                                       $newtags = [];
-                                                       if (count($tags)) {
-                                                               foreach ($tags as $tag) {
-                                                                       if (trim($tag) !== trim($xo->body)) {
-                                                                               $newtags[] = trim($tag);
-                                                                       }
-                                                               }
-                                                       }
-                                                       q(
-                                                               "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
-                                                               dbesc(implode(',', $newtags)),
-                                                               intval($i[0]["id"])
-                                                       );
-                                                       create_tags_from_item($i[0]["id"]);
-                                               }
-                                       }
-                               }
-                       }
+               $entrytype = self::getEntryType($importer, $item);
 
-                       if ($entrytype == DFRN_TOP_LEVEL) {
-                               $r = q(
-                                       "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-                                               `body` = '', `title` = ''
-                                       WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
-                                       dbesc($when),
-                                       dbesc(datetime_convert()),
-                                       dbesc($uri),
-                                       intval($importer["uid"])
-                               );
-                               create_tags_from_itemuri($uri, $importer["uid"]);
-                               Term::createFromItemURI($uri, $importer["uid"]);
-                               update_thread_uri($uri, $importer["uid"]);
-                       } else {
-                               $r = q(
-                                       "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-                                               `body` = '', `title` = ''
-                                       WHERE `uri` = '%s' AND `uid` IN (0, %d)",
-                                       dbesc($when),
-                                       dbesc(datetime_convert()),
-                                       dbesc($uri),
-                                       intval($importer["uid"])
-                               );
-                               create_tags_from_itemuri($uri, $importer["uid"]);
-                               Term::createFromItemURI($uri, $importer["uid"]);
-                               update_thread_uri($uri, $importer["importer_uid"]);
+               if (!$item["deleted"]) {
+                       logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
+               } else {
+                       return;
+               }
 
-                               // if this is a relayed delete, propagate it to other recipients
+               Item::deleteById($item["id"]);
 
-                               if ($entrytype == DFRN_REPLY_RC) {
-                                       logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
-                                       Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
-                               }
+               if ($entrytype != DFRN_TOP_LEVEL) {
+                       // if this is a relayed delete, propagate it to other recipients
+                       if ($entrytype == DFRN_REPLY_RC) {
+                               logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
+                               Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
                        }
                }
        }
@@ -3100,4 +2980,88 @@ class DFRN
 
                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);
+       }
 }