]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Merge pull request #8629 from annando/item-insert
[friendica.git] / src / Model / Item.php
index b9aeff4c94941b7f2a817d053fbec50c01c953b8..f10537d75ab2de88a2a3eb8731636981be3d07a5 100644 (file)
@@ -32,18 +32,18 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Post\Category;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
 use Friendica\Util\Security;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
 use Text_LanguageDetect;
+use Friendica\Repository\PermissionSet as RepPermissionSet;
 
 class Item
 {
@@ -60,7 +60,7 @@ class Item
 
        // Field list that is used to display the items
        const DISPLAY_FIELDLIST = [
-               'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
+               'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
                'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
                'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
                'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
@@ -72,14 +72,14 @@ class Item
                'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
                'event-summary', 'event-desc', 'event-location', 'event-type',
                'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
-               'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed'
+               'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed', 'activity'
        ];
 
        // Field list that is used to deliver items via the protocols
-       const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
+       const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
                        'parent-guid', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
                        'private', 'title', 'body', 'location', 'coord', 'app',
-                       'attach', 'tag', 'deleted', 'extid', 'post-type',
+                       'attach', 'deleted', 'extid', 'post-type',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                        'author-id', 'author-link', 'owner-link', 'contact-uid',
                        'signed_text', 'signature', 'signer', 'network'];
@@ -93,10 +93,11 @@ class Item
        const CONTENT_FIELDLIST = ['language'];
 
        // All fields in the item table
-       const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+       const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
+                       'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
                        'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
                        'created', 'edited', 'commented', 'received', 'changed', 'verb',
-                       'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
+                       'postopts', 'plink', 'resource-id', 'event-id', 'attach', 'inform',
                        'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
                        'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
@@ -176,7 +177,7 @@ class Item
                }
 
                $pinned = [];
-               while ($useritem = self::fetch($useritems)) {
+               while ($useritem = DBA::fetch($useritems)) {
                        $pinned[] = $useritem['iid'];
                }
                DBA::close($useritems);
@@ -281,7 +282,7 @@ class Item
 
                // Fetch data from the item-content table whenever there is content there
                if (self::isLegacyMode()) {
-                       $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
+                       $legacy_fields = array_merge(Post\DeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
                        foreach ($legacy_fields as $field) {
                                if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
                                        $row[$field] = $row['internal-item-' . $field];
@@ -315,19 +316,25 @@ class Item
                }
 
                if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', Activity::POST, Activity::SHARE])) {
-                       // Build the tag string out of the term entries
-                       if (array_key_exists('tag', $row) && empty($row['tag'])) {
-                               $row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
-                       }
-
                        // Build the file string out of the term entries
                        if (array_key_exists('file', $row) && empty($row['file'])) {
-                               $row['file'] = Term::fileTextFromItemId($row['internal-iid']);
+                               $row['file'] = Category::getTextByURIId($row['internal-uri-id'], $row['internal-uid']);
                        }
                }
 
-               if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) {
-                       $row['signed_text'] = $row['interaction'];
+               if ($row['internal-psid'] == RepPermissionSet::PUBLIC) {
+                       if (array_key_exists('allow_cid', $row)) {
+                               $row['allow_cid'] = '';
+                       }
+                       if (array_key_exists('allow_gid', $row)) {
+                               $row['allow_gid'] = '';
+                       }
+                       if (array_key_exists('deny_cid', $row)) {
+                               $row['deny_cid'] = '';
+                       }
+                       if (array_key_exists('deny_gid', $row)) {
+                               $row['deny_gid'] = '';
+                       }
                }
 
                if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
@@ -337,9 +344,10 @@ class Item
                // Remove internal fields
                unset($row['internal-activity']);
                unset($row['internal-network']);
-               unset($row['internal-iid']);
+               unset($row['internal-uri-id']);
+               unset($row['internal-uid']);
+               unset($row['internal-psid']);
                unset($row['internal-iaid']);
-               unset($row['internal-icid']);
                unset($row['internal-user-ignored']);
                unset($row['interaction']);
 
@@ -656,15 +664,16 @@ class Item
        {
                $fields = [];
 
-               $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+               $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
+                       'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
                        'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
                        'created', 'edited', 'commented', 'received', 'changed', 'psid',
-                       'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
+                       'resource-id', 'event-id', 'attach', 'post-type', 'file',
                        'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
-                       'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
-                       'network' => 'internal-network', 'icid' => 'internal-icid',
-                       'iaid' => 'internal-iaid'];
+                       'id' => 'item_id', 'network', 'icid', 'iaid',
+                       'uri-id' => 'internal-uri-id', 'uid' => 'internal-uid',
+                       'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
 
                if ($usermode) {
                        $fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
@@ -674,7 +683,7 @@ class Item
 
                $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
 
-               $fields['item-delivery-data'] = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, ItemDeliveryData::FIELD_LIST);
+               $fields['post-delivery-data'] = array_merge(Post\DeliveryData::LEGACY_FIELD_LIST, Post\DeliveryData::FIELD_LIST);
 
                $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 
@@ -699,9 +708,7 @@ class Item
                        'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
                        'ignore' => 'event-ignore', 'id' => 'event-id'];
 
-               $fields['sign'] = ['signed_text', 'signature', 'signer'];
-
-               $fields['diaspora-interaction'] = ['interaction'];
+               $fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text'];
 
                return $fields;
        }
@@ -786,10 +793,6 @@ class Item
                        $joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
                }
 
-               if (strpos($sql_commands, "`sign`.") !== false) {
-                       $joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
-               }
-
                if (strpos($sql_commands, "`diaspora-interaction`.") !== false) {
                        $joins .= " LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`";
                }
@@ -802,8 +805,8 @@ class Item
                        $joins .= " LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`";
                }
 
-               if (strpos($sql_commands, "`item-delivery-data`.") !== false) {
-                       $joins .= " LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`";
+               if (strpos($sql_commands, "`post-delivery-data`.") !== false) {
+                       $joins .= " LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`";
                }
 
                if (strpos($sql_commands, "`permissionset`.") !== false) {
@@ -829,13 +832,10 @@ class Item
         *
         * @return string The field list
         */
-       private static function constructSelectFields($fields, $selected)
+       private static function constructSelectFields(array $fields, array $selected)
        {
                if (!empty($selected)) {
-                       $selected[] = 'internal-iid';
-                       $selected[] = 'internal-iaid';
-                       $selected[] = 'internal-icid';
-                       $selected[] = 'internal-network';
+                       $selected = array_merge($selected, ['internal-uri-id', 'internal-uid', 'internal-psid', 'internal-iaid', 'internal-network']);
                }
 
                if (in_array('verb', $selected)) {
@@ -846,11 +846,7 @@ class Item
                        $selected[] = 'internal-user-ignored';
                }
 
-               if (in_array('signed_text', $selected)) {
-                       $selected[] = 'interaction';
-               }
-
-               $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
+               $legacy_fields = array_merge(Post\DeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
 
                $selection = [];
                foreach ($fields as $table => $table_fields) {
@@ -922,7 +918,7 @@ class Item
                // We cannot simply expand the condition to check for origin entries
                // The condition needn't to be a simple array but could be a complex condition.
                // And we have to execute this query before the update to ensure to fetch the same data.
-               $items = DBA::select('item', ['id', 'origin', 'uri', 'uri-id', 'iaid', 'icid', 'tag', 'file'], $condition);
+               $items = DBA::select('item', ['id', 'origin', 'uri', 'uri-id', 'iaid', 'icid', 'uid', 'file'], $condition);
 
                $content_fields = [];
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
@@ -936,7 +932,7 @@ class Item
                        }
                }
 
-               $delivery_data = ItemDeliveryData::extractFields($fields);
+               $delivery_data = Post\DeliveryData::extractFields($fields);
 
                $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'postopts', 'inform'];
                foreach ($clear_fields as $field) {
@@ -945,13 +941,6 @@ class Item
                        }
                }
 
-               if (array_key_exists('tag', $fields)) {
-                       $tags = $fields['tag'];
-                       $fields['tag'] = null;
-               } else {
-                       $tags = null;
-               }
-
                if (array_key_exists('file', $fields)) {
                        $files = $fields['file'];
                        $fields['file'] = null;
@@ -1024,21 +1013,14 @@ class Item
                                }
                        }
 
-                       if (!is_null($tags)) {
-                               Term::insertFromTagFieldByItemId($item['id'], $tags);
-                               if (!empty($item['tag'])) {
-                                       DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
-                               }
-                       }
-
                        if (!is_null($files)) {
-                               Term::insertFromFileFieldByItemId($item['id'], $files);
+                               Category::storeTextByURIId($item['uri-id'], $item['uid'], $files);
                                if (!empty($item['file'])) {
                                        DBA::update('item', ['file' => ''], ['id' => $item['id']]);
                                }
                        }
 
-                       ItemDeliveryData::update($item['id'], $delivery_data);
+                       Post\DeliveryData::update($item['uri-id'], $delivery_data);
 
                        self::updateThread($item['id']);
 
@@ -1118,7 +1100,7 @@ class Item
        {
                Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
                // locate item to be deleted
-               $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
+               $fields = ['id', 'uri', 'uri-id', 'uid', 'parent', 'parent-uri', 'origin',
                        'deleted', 'file', 'resource-id', 'event-id', 'attach',
                        'verb', 'object-type', 'object', 'target', 'contact-id',
                        'icid', 'iaid', 'psid'];
@@ -1184,9 +1166,6 @@ class Item
                        }
                }
 
-               // Delete tags that had been attached to other items
-               self::deleteTagsFromItem($item);
-
                // Delete notifications
                DBA::delete('notify', ['iid' => $item['id'], 'uid' => $item['uid']]);
 
@@ -1194,15 +1173,14 @@ class Item
                $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
                DBA::update('item', $item_fields, ['id' => $item['id']]);
 
-               Term::insertFromTagFieldByItemId($item['id'], '');
-               Term::insertFromFileFieldByItemId($item['id'], '');
+               Category::storeTextByURIId($item['uri-id'], $item['uid'], '');
                self::deleteThread($item['id'], $item['parent-uri']);
 
                if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
                        self::markForDeletion(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
                }
 
-               ItemDeliveryData::delete($item['id']);
+               Post\DeliveryData::delete($item['uri-id']);
 
                // We don't delete the item-activity here, since we need some of the data for ActivityPub
 
@@ -1243,43 +1221,6 @@ class Item
                return true;
        }
 
-       private static function deleteTagsFromItem($item)
-       {
-               if (($item["verb"] != Activity::TAG) || ($item["object-type"] != Activity\ObjectType::TAGTERM)) {
-                       return;
-               }
-
-               $xo = XML::parseString($item["object"], false);
-               $xt = XML::parseString($item["target"], false);
-
-               if ($xt->type != Activity\ObjectType::NOTE) {
-                       return;
-               }
-
-               $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
-               if (!DBA::isResult($i)) {
-                       return;
-               }
-
-               // For tags, the owner cannot remove the tag on the author's copy of the post.
-               $owner_remove = ($item["contact-id"] == $i["contact-id"]);
-               $author_copy = $item["origin"];
-
-               if (($owner_remove && $author_copy) || !$owner_remove) {
-                       return;
-               }
-
-               $tags = explode(',', $i["tag"]);
-               $newtags = [];
-               if (count($tags)) {
-                       foreach ($tags as $tag) {
-                               if (trim($tag) !== trim($xo->body)) {
-                                      $newtags[] = trim($tag);
-                               }
-                       }
-               }
-               self::update(['tag' => implode(',', $newtags)], ['id' => $i["id"]]);
-       }
 
        private static function guid($item, $notify)
        {
@@ -1390,88 +1331,80 @@ class Item
                }
        }
 
-       public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
+       /**
+        * Check if the item array is a duplicate
+        *
+        * @param array $item
+        * @return boolean is it a duplicate?
+        */
+       private static function isDuplicate(array $item)
        {
-               $orig_item = $item;
-
-               $priority = PRIORITY_HIGH;
-
-               // If it is a posting where users should get notifications, then define it as wall posting
-               if ($notify) {
-                       $item['wall'] = 1;
-                       $item['origin'] = 1;
-                       $item['network'] = Protocol::DFRN;
-                       $item['protocol'] = Conversation::PARCEL_DFRN;
-
-                       if (is_int($notify)) {
-                               $priority = $notify;
-                       }
-               } else {
-                       $item['network'] = trim(($item['network'] ?? '') ?: Protocol::PHANTOM);
-               }
-
-               $item['guid'] = self::guid($item, $notify);
-               $item['uri'] = Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid'])));
-
-               // Store URI data
-               $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
-
-               // Store conversation data
-               $item = Conversation::insert($item);
-
-               /*
-                * If a Diaspora signature structure was passed in, pull it out of the
-                * item array and set it aside for later storage.
-                */
-
-               $dsprsig = null;
-               if (isset($item['dsprsig'])) {
-                       $encoded_signature = $item['dsprsig'];
-                       $dsprsig = json_decode(base64_decode($item['dsprsig']));
-                       unset($item['dsprsig']);
+               // Checking if there is already an item with the same guid
+               $condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
+               if (self::exists($condition)) {
+                       Logger::notice('Found already existing item', [
+                               'guid' => $item['guid'],
+                               'uid' => $item['uid'],
+                               'network' => $item['network']
+                       ]);
+                       return true;
                }
 
-               $diaspora_signed_text = '';
-               if (isset($item['diaspora_signed_text'])) {
-                       $diaspora_signed_text = $item['diaspora_signed_text'];
-                       unset($item['diaspora_signed_text']);
+               $condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
+                       $item['uri'], $item['network'], Protocol::DFRN, $item['uid']];
+               if (self::exists($condition)) {
+                       Logger::notice('duplicated item with the same uri found.', $item);
+                       return true;
                }
 
-               // Converting the plink
-               /// @TODO Check if this is really still needed
-               if ($item['network'] == Protocol::OSTATUS) {
-                       if (isset($item['plink'])) {
-                               $item['plink'] = OStatus::convertHref($item['plink']);
-                       } elseif (isset($item['uri'])) {
-                               $item['plink'] = OStatus::convertHref($item['uri']);
+               // On Friendica and Diaspora the GUID is unique
+               if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
+                       $condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
+                       if (self::exists($condition)) {
+                               Logger::notice('duplicated item with the same guid found.', $item);
+                               return true;
+                       }
+               } elseif ($item['network'] == Protocol::OSTATUS) {
+                       // Check for an existing post with the same content. There seems to be a problem with OStatus.
+                       $condition = ["`body` = ? AND `network` = ? AND `created` = ? AND `contact-id` = ? AND `uid` = ?",
+                                       $item['body'], $item['network'], $item['created'], $item['contact-id'], $item['uid']];
+                       if (self::exists($condition)) {
+                               Logger::notice('duplicated item with the same body found.', $item);
+                               return true;
                        }
                }
 
-               if (!empty($item['thr-parent'])) {
-                       $item['parent-uri'] = $item['thr-parent'];
+               /*
+                * Check for already added items.
+                * There is a timing issue here that sometimes creates double postings.
+                * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
+                */
+               if (($item['uid'] == 0) && self::exists(['uri' => trim($item['uri']), 'uid' => 0])) {
+                       Logger::notice('Global item already stored.', ['uri' => $item['uri'], 'network' => $item['network']]);
+                       return true;
                }
 
-               $activity = DI::activity();
+               return false;
+       }
 
-               if (isset($item['gravity'])) {
-                       $item['gravity'] = intval($item['gravity']);
-               } elseif ($item['parent-uri'] === $item['uri']) {
-                       $item['gravity'] = GRAVITY_PARENT;
-               } elseif ($activity->match($item['verb'], Activity::POST)) {
-                       $item['gravity'] = GRAVITY_COMMENT;
-               } elseif ($activity->match($item['verb'], Activity::FOLLOW)) {
-                       $item['gravity'] = GRAVITY_ACTIVITY;
-               } else {
-                       $item['gravity'] = GRAVITY_UNKNOWN;   // Should not happen
-                       Logger::log('Unknown gravity for verb: ' . $item['verb'], Logger::DEBUG);
+       /**
+        * Check if the item array is valid
+        *
+        * @param array $item
+        * @return boolean item is valid
+        */
+       private static function isValid(array $item)
+       {
+               // When there is no content then we don't post it
+               if ($item['body'].$item['title'] == '') {
+                       Logger::notice('No body, no title.');
+                       return false;
                }
 
-               $uid = intval($item['uid']);
-
                // check for create date and expire time
                $expire_interval = DI::config()->get('system', 'dbclean-expire-days', 0);
 
-               $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['expire'], ['uid' => $item['uid']]);
                if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
                        $expire_interval = $user['expire'];
                }
@@ -1485,15 +1418,78 @@ class Item
                                        'expired' => date('c', $expire_date),
                                        '$item' => $item
                                ]);
-                               return 0;
+                               return false;
                        }
                }
 
-               /*
-                * Do we already have this item?
-                * We have to check several networks since Friendica posts could be repeated
-                * via OStatus (maybe Diasporsa as well)
-                */
+               if (Contact::isBlocked($item['author-id'])) {
+                       Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (!empty($item['author-link']) && Network::isUrlBlocked($item['author-link'])) {
+                       Logger::notice('Author server is blocked', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (!empty($item['uid']) && Contact::isBlockedByUser($item['author-id'], $item['uid'])) {
+                       Logger::notice('Author is blocked by user', ['author-link' => $item['author-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (Contact::isBlocked($item['owner-id'])) {
+                       Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (!empty($item['owner-link']) && Network::isUrlBlocked($item['owner-link'])) {
+                       Logger::notice('Owner server is blocked', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (!empty($item['uid']) && Contact::isBlockedByUser($item['owner-id'], $item['uid'])) {
+                       Logger::notice('Owner is blocked by user', ['owner-link' => $item['owner-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               // The causer is set during a thread completion, for example because of a reshare. It countains the responsible actor.
+               if (!empty($item['uid']) && !empty($item['causer-id']) && Contact::isBlockedByUser($item['causer-id'], $item['uid'])) {
+                       Logger::notice('Causer is blocked by user', ['causer-link' => $item['causer-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+
+               if (!empty($item['uid']) && !empty($item['causer-id']) && ($item['parent-uri'] == $item['uri']) && Contact::isIgnoredByUser($item['causer-id'], $item['uid'])) {
+                       Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'], 'uid' => $item['uid'], 'item-uri' => $item['uri']]);
+                       return false;
+               }
+               
+               if ($item['verb'] == Activity::FOLLOW) {
+                       if (!$item['origin'] && ($item['author-id'] == Contact::getPublicIdByUserId($item['uid']))) {
+                               // Our own follow request can be relayed to us. We don't store it to avoid notification chaos.
+                               Logger::info("Follow: Don't store not origin follow request", ['parent-uri' => $item['parent-uri']]);
+                               return false;
+                       }
+
+                       $condition = ['verb' => Activity::FOLLOW, 'uid' => $item['uid'],
+                               'parent-uri' => $item['parent-uri'], 'author-id' => $item['author-id']];
+                       if (self::exists($condition)) {
+                               // It happens that we receive multiple follow requests by the same author - we only store one.
+                               Logger::info('Follow: Found existing follow request from author', ['author-id' => $item['author-id'], 'parent-uri' => $item['parent-uri']]);
+                               return false;
+                       }
+               }
+
+               return true;
+       }
+
+       /**
+        * Return the id of the given item array if it has been stored before
+        *
+        * @param array $item
+        * @return integer item id
+        */
+       private static function getDuplicateID(array $item)
+       {
                if (empty($item['network']) || in_array($item['network'], Protocol::FEDERATED)) {
                        $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?, ?)",
                                trim($item['uri']), $item['uid'],
@@ -1501,10 +1497,10 @@ class Item
                        $existing = self::selectFirst(['id', 'network'], $condition);
                        if (DBA::isResult($existing)) {
                                // We only log the entries with a different user id than 0. Otherwise we would have too many false positives
-                               if ($uid != 0) {
+                               if ($item['uid'] != 0) {
                                        Logger::notice('Item already existed for user', [
                                                'uri' => $item['uri'],
-                                               'uid' => $uid,
+                                               'uid' => $item['uid'],
                                                'network' => $item['network'],
                                                'existing_id' => $existing["id"],
                                                'existing_network' => $existing["network"]
@@ -1514,6 +1510,169 @@ class Item
                                return $existing["id"];
                        }
                }
+               return 0;
+       }
+
+       /**
+        * Fetch parent data for the given item array
+        *
+        * @param array $item
+        * @return array item array with parent data
+        */
+       private static function getParentData(array $item)
+       {
+               // find the parent and snarf the item id and ACLs
+               // and anything else we need to inherit
+
+               $fields = ['uri', 'parent-uri', 'id', 'deleted',
+                       'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+                       'wall', 'private', 'forum_mode', 'origin', 'author-id'];
+               $condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
+               $params = ['order' => ['id' => false]];
+               $parent = self::selectFirst($fields, $condition, $params);
+
+               if (!DBA::isResult($parent)) {
+                       Logger::info('item parent was not found - ignoring item', ['parent-uri' => $item['parent-uri'], 'uid' => $item['uid']]);
+                       return [];
+               } else {
+                       // is the new message multi-level threaded?
+                       // even though we don't support it now, preserve the info
+                       // and re-attach to the conversation parent.
+                       if ($parent['uri'] != $parent['parent-uri']) {
+                               $item['parent-uri'] = $parent['parent-uri'];
+
+                               $condition = ['uri' => $item['parent-uri'],
+                                       'parent-uri' => $item['parent-uri'],
+                                       'uid' => $item['uid']];
+                               $params = ['order' => ['id' => false]];
+                               $toplevel_parent = self::selectFirst($fields, $condition, $params);
+
+                               if (DBA::isResult($toplevel_parent)) {
+                                       $parent = $toplevel_parent;
+                               }
+                       }
+
+                       $item["parent"]        = $parent['id'];
+                       $item["deleted"]       = $parent['deleted'];
+                       $item["allow_cid"]     = $parent['allow_cid'];
+                       $item['allow_gid']     = $parent['allow_gid'];
+                       $item['deny_cid']      = $parent['deny_cid'];
+                       $item['deny_gid']      = $parent['deny_gid'];
+                       $item['parent_origin'] = $parent['origin'];
+
+                       // Don't federate received participation messages
+                       if ($item['verb'] != Activity::FOLLOW) {
+                               $item['wall'] = $parent['wall'];
+                       } else {
+                               $item['wall'] = false;
+                       }
+
+                       /*
+                        * If the parent is private, force privacy for the entire conversation
+                        * This differs from the above settings as it subtly allows comments from
+                        * email correspondents to be private even if the overall thread is not.
+                        */
+                       if ($parent['private']) {
+                               $item['private'] = $parent['private'];
+                       }
+
+                       /*
+                        * Edge case. We host a public forum that was originally posted to privately.
+                        * The original author commented, but as this is a comment, the permissions
+                        * weren't fixed up so it will still show the comment as private unless we fix it here.
+                        */
+                       if ((intval($parent['forum_mode']) == 1) && ($parent['private'] != self::PUBLIC)) {
+                               $item['private'] = self::PUBLIC;
+                       }
+
+                       // If its a post that originated here then tag the thread as "mention"
+                       if ($item['origin'] && $item['uid']) {
+                               DBA::update('thread', ['mention' => true], ['iid' => $item["parent"]]);
+                               Logger::info('tagged thread as mention', ['parent' => $item["parent"], 'uid' => $item['uid']]);
+                       }
+
+                       // Update the contact relations
+                       if ($item['author-id'] != $parent['author-id']) {
+                               DBA::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true);
+                       }
+               }
+
+               return $item;
+       }
+
+       /**
+        * Get the gravity for the given item array
+        *
+        * @param array $item
+        * @return integer gravity
+        */
+       private static function getGravity(array $item)
+       {
+               $activity = DI::activity();
+
+               if (isset($item['gravity'])) {
+                       return intval($item['gravity']);
+               } elseif ($item['parent-uri'] === $item['uri']) {
+                       return GRAVITY_PARENT;
+               } elseif ($activity->match($item['verb'], Activity::POST)) {
+                       return GRAVITY_COMMENT;
+               } elseif ($activity->match($item['verb'], Activity::FOLLOW)) {
+                       return GRAVITY_ACTIVITY;
+               }
+               Logger::info('Unknown gravity for verb', ['verb' => $item['verb']]);
+               return GRAVITY_UNKNOWN;   // Should not happen
+       }
+
+       public static function insert($item, $notify = false, $dontcache = false)
+       {
+               $orig_item = $item;
+
+               $priority = PRIORITY_HIGH;
+
+               // If it is a posting where users should get notifications, then define it as wall posting
+               if ($notify) {
+                       $item['wall'] = 1;
+                       $item['origin'] = 1;
+                       $item['network'] = Protocol::DFRN;
+                       $item['protocol'] = Conversation::PARCEL_DFRN;
+
+                       if (is_int($notify)) {
+                               $priority = $notify;
+                       }
+               } else {
+                       $item['network'] = trim(($item['network'] ?? '') ?: Protocol::PHANTOM);
+               }
+
+               $uid = intval($item['uid']);
+
+               $item['guid'] = self::guid($item, $notify);
+               $item['uri'] = substr(Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))), 0, 255);
+
+               // Store URI data
+               $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
+
+               // Store conversation data
+               $item = Conversation::insert($item);
+
+               if (!empty($item['thr-parent'])) {
+                       $item['parent-uri'] = $item['thr-parent'];
+               }
+
+               /*
+                * Do we already have this item?
+                * We have to check several networks since Friendica posts could be repeated
+                * via OStatus (maybe Diasporsa as well)
+                */
+               $duplicate = self::getDuplicateID($item);
+               if ($duplicate) {
+                       return $duplicate;
+               }
+
+               // Additional duplicate checks
+               /// @todo Check why the first duplication check returns the item number and the second a 0
+               if (self::isDuplicate($item)) {
+                       return 0;
+               }
 
                $item['wall']          = intval($item['wall'] ?? 0);
                $item['extid']         = trim($item['extid'] ?? '');
@@ -1528,7 +1687,7 @@ class Item
                $item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
                $item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
                $item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
-               $item['title']         = trim($item['title'] ?? '');
+               $item['title']         = substr(trim($item['title'] ?? ''), 0, 255);
                $item['location']      = trim($item['location'] ?? '');
                $item['coord']         = trim($item['coord'] ?? '');
                $item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
@@ -1540,14 +1699,13 @@ class Item
                $item['object']        = trim($item['object'] ?? '');
                $item['target-type']   = trim($item['target-type'] ?? '');
                $item['target']        = trim($item['target'] ?? '');
-               $item['plink']         = trim($item['plink'] ?? '');
+               $item['plink']         = substr(trim($item['plink'] ?? ''), 0, 255);
                $item['allow_cid']     = trim($item['allow_cid'] ?? '');
                $item['allow_gid']     = trim($item['allow_gid'] ?? '');
                $item['deny_cid']      = trim($item['deny_cid'] ?? '');
                $item['deny_gid']      = trim($item['deny_gid'] ?? '');
                $item['private']       = intval($item['private'] ?? self::PUBLIC);
                $item['body']          = trim($item['body'] ?? '');
-               $item['tag']           = trim($item['tag'] ?? '');
                $item['attach']        = trim($item['attach'] ?? '');
                $item['app']           = trim($item['app'] ?? '');
                $item['origin']        = intval($item['origin'] ?? 0);
@@ -1557,14 +1715,6 @@ class Item
                $item['inform']        = trim($item['inform'] ?? '');
                $item['file']          = trim($item['file'] ?? '');
 
-               // When there is no content then we don't post it
-               if ($item['body'].$item['title'] == '') {
-                       Logger::notice('No body, no title.');
-                       return 0;
-               }
-
-               self::addLanguageToItemArray($item);
-
                // Items cannot be stored before they happen ...
                if ($item['created'] > DateTimeFormat::utcNow()) {
                        $item['created'] = DateTimeFormat::utcNow();
@@ -1577,234 +1727,59 @@ class Item
 
                $item['plink'] = ($item['plink'] ?? '') ?: DI::baseUrl() . '/display/' . urlencode($item['guid']);
 
+               $item['language'] = self::getLanguage($item);
+
+               $item['gravity'] = self::getGravity($item);
+
                $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
                        'photo' => $item['author-avatar'], 'network' => $item['network']];
-
                $item['author-id'] = ($item['author-id'] ?? 0) ?: Contact::getIdForURL($item['author-link'], 0, false, $default);
 
-               if (Contact::isBlocked($item['author-id'])) {
-                       Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
-               if (!empty($item['author-link']) && Network::isUrlBlocked($item['author-link'])) {
-                       Logger::notice('Author server is blocked', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
-               if (!empty($uid) && Contact::isBlockedByUser($item['author-id'], $uid)) {
-                       Logger::notice('Author is blocked by user', ['author-link' => $item['author-link'], 'uid' => $uid, 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
                $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
                        'photo' => $item['owner-avatar'], 'network' => $item['network']];
-
                $item['owner-id'] = ($item['owner-id'] ?? 0) ?: Contact::getIdForURL($item['owner-link'], 0, false, $default);
 
-               if (Contact::isBlocked($item['owner-id'])) {
-                       Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
-               if (!empty($item['owner-link']) && Network::isUrlBlocked($item['owner-link'])) {
-                       Logger::notice('Owner server is blocked', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
-               if (!empty($uid) && Contact::isBlockedByUser($item['owner-id'], $uid)) {
-                       Logger::notice('Owner is blocked by user', ['owner-link' => $item['owner-link'], 'uid' => $uid, 'item-uri' => $item['uri']]);
-                       return 0;
-               }
-
-               // The causer is set during a thread completion, for example because of a reshare. It countains the responsible actor.
-               if (!empty($uid) && !empty($item['causer-id']) && Contact::isBlockedByUser($item['causer-id'], $uid)) {
-                       Logger::notice('Causer is blocked by user', ['causer-link' => $item['causer-link'], 'uid' => $uid, 'item-uri' => $item['uri']]);
-                       return 0;
-               }
+               // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
+               $item["contact-id"] = self::contactId($item);
 
-               if (!empty($uid) && !empty($item['causer-id']) && ($item['parent-uri'] == $item['uri']) && Contact::isIgnoredByUser($item['causer-id'], $uid)) {
-                       Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'], 'uid' => $uid, 'item-uri' => $item['uri']]);
+               if (!self::isValid($item)) {
                        return 0;
                }
 
-               // We don't store the causer, we only have it here for the checks above
+               // We don't store the causer, we only have it here for the checks in the function above
                unset($item['causer-id']);
                unset($item['causer-link']);
 
-               // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
-               $item["contact-id"] = self::contactId($item);
-
-               if ($item['network'] == Protocol::PHANTOM) {
-                       $item['network'] = Protocol::DFRN;
-                       Logger::notice('Missing network, setting to {network}.', [
-                               'uri' => $item["uri"],
-                               'network' => $item['network'],
-                               'callstack' => System::callstack()
-                       ]);
-               }
+               // We don't store these fields anymore in the item table
+               unset($item['author-link']);
+               unset($item['author-name']);
+               unset($item['author-avatar']);
+               unset($item['author-network']);
 
-               // Checking if there is already an item with the same guid
-               $condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
-               if (self::exists($condition)) {
-                       Logger::notice('Found already existing item', [
-                               'guid' => $item['guid'],
-                               'uid' => $item['uid'],
-                               'network' => $item['network']
-                       ]);
-                       return 0;
-               }
+               unset($item['owner-link']);
+               unset($item['owner-name']);
+               unset($item['owner-avatar']);
 
-               if ($item['verb'] == Activity::FOLLOW) {
-                       if (!$item['origin'] && ($item['author-id'] == Contact::getPublicIdByUserId($uid))) {
-                               // Our own follow request can be relayed to us. We don't store it to avoid notification chaos.
-                               Logger::log("Follow: Don't store not origin follow request from us for " . $item['parent-uri'], Logger::DEBUG);
-                               return 0;
-                       }
+               $item['thr-parent'] = $item['parent-uri'];
 
-                       $condition = ['verb' => Activity::FOLLOW, 'uid' => $item['uid'],
-                               'parent-uri' => $item['parent-uri'], 'author-id' => $item['author-id']];
-                       if (self::exists($condition)) {
-                               // It happens that we receive multiple follow requests by the same author - we only store one.
-                               Logger::log('Follow: Found existing follow request from author ' . $item['author-id'] . ' for ' . $item['parent-uri'], Logger::DEBUG);
+               if ($item['parent-uri'] != $item['uri']) {
+                       $item = self::getParentData($item);
+                       if (empty($item)) {
                                return 0;
                        }
-               }
-
-               // Check for hashtags in the body and repair or add hashtag links
-               self::setHashtags($item);
-
-               $item['thr-parent'] = $item['parent-uri'];
-
-               $notify_type = Delivery::POST;
-               $allow_cid = '';
-               $allow_gid = '';
-               $deny_cid  = '';
-               $deny_gid  = '';
 
-               if ($item['parent-uri'] === $item['uri']) {
-                       $parent_id = 0;
-                       $parent_deleted = 0;
-                       $allow_cid = $item['allow_cid'];
-                       $allow_gid = $item['allow_gid'];
-                       $deny_cid  = $item['deny_cid'];
-                       $deny_gid  = $item['deny_gid'];
+                       $parent_id = $item['parent'];
+                       unset($item['parent']);
+                       $parent_origin = $item['parent_origin'];
+                       unset($item['parent_origin']);
                } else {
-                       // find the parent and snarf the item id and ACLs
-                       // and anything else we need to inherit
-
-                       $fields = ['uri', 'parent-uri', 'id', 'deleted',
-                               'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-                               'wall', 'private', 'forum_mode', 'origin', 'author-id'];
-                       $condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
-                       $params = ['order' => ['id' => false]];
-                       $parent = self::selectFirst($fields, $condition, $params);
-
-                       if (DBA::isResult($parent)) {
-                               // is the new message multi-level threaded?
-                               // even though we don't support it now, preserve the info
-                               // and re-attach to the conversation parent.
-
-                               if ($parent['uri'] != $parent['parent-uri']) {
-                                       $item['parent-uri'] = $parent['parent-uri'];
-
-                                       $condition = ['uri' => $item['parent-uri'],
-                                               'parent-uri' => $item['parent-uri'],
-                                               'uid' => $item['uid']];
-                                       $params = ['order' => ['id' => false]];
-                                       $toplevel_parent = self::selectFirst($fields, $condition, $params);
-
-                                       if (DBA::isResult($toplevel_parent)) {
-                                               $parent = $toplevel_parent;
-                                       }
-                               }
-
-                               $parent_id      = $parent['id'];
-                               $parent_deleted = $parent['deleted'];
-                               $allow_cid      = $parent['allow_cid'];
-                               $allow_gid      = $parent['allow_gid'];
-                               $deny_cid       = $parent['deny_cid'];
-                               $deny_gid       = $parent['deny_gid'];
-                               $item['wall']   = $parent['wall'];
-
-                               /*
-                                * If the parent is private, force privacy for the entire conversation
-                                * This differs from the above settings as it subtly allows comments from
-                                * email correspondents to be private even if the overall thread is not.
-                                */
-                               if ($parent['private']) {
-                                       $item['private'] = $parent['private'];
-                               }
-
-                               /*
-                                * Edge case. We host a public forum that was originally posted to privately.
-                                * The original author commented, but as this is a comment, the permissions
-                                * weren't fixed up so it will still show the comment as private unless we fix it here.
-                                */
-                               if ((intval($parent['forum_mode']) == 1) && ($parent['private'] != self::PUBLIC)) {
-                                       $item['private'] = self::PUBLIC;
-                               }
-
-                               // If its a post that originated here then tag the thread as "mention"
-                               if ($item['origin'] && $item['uid']) {
-                                       DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
-                                       Logger::log('tagged thread ' . $parent_id . ' as mention for user ' . $item['uid'], Logger::DEBUG);
-                               }
-
-                               // Update the contact relations
-                               if ($item['author-id'] != $parent['author-id']) {
-                                       dba::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true);
-                               }
-                       } else {
-                               /*
-                                * Allow one to see reply tweets from status.net even when
-                                * we don't have or can't see the original post.
-                                */
-                               if ($force_parent) {
-                                       Logger::log('$force_parent=true, reply converted to top-level post.');
-                                       $parent_id = 0;
-                                       $item['parent-uri'] = $item['uri'];
-                                       $item['gravity'] = GRAVITY_PARENT;
-                               } else {
-                                       Logger::log('item parent '.$item['parent-uri'].' for '.$item['uid'].' was not found - ignoring item');
-                                       return 0;
-                               }
-
-                               $parent_deleted = 0;
-                       }
-               }
-
-               if (stristr($item['verb'], Activity::POKE)) {
-                       $notify_type = Delivery::POKE;
+                       $parent_id = 0;
+                       $parent_origin = $item['origin'];
                }
 
                $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
                $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
 
-               $condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
-                       $item['uri'], $item['network'], Protocol::DFRN, $item['uid']];
-               if (self::exists($condition)) {
-                       Logger::log('duplicated item with the same uri found. '.print_r($item,true));
-                       return 0;
-               }
-
-               // On Friendica and Diaspora the GUID is unique
-               if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
-                       $condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
-                       if (self::exists($condition)) {
-                               Logger::log('duplicated item with the same guid found. '.print_r($item,true));
-                               return 0;
-                       }
-               } elseif ($item['network'] == Protocol::OSTATUS) {
-                       // Check for an existing post with the same content. There seems to be a problem with OStatus.
-                       $condition = ["`body` = ? AND `network` = ? AND `created` = ? AND `contact-id` = ? AND `uid` = ?",
-                                       $item['body'], $item['network'], $item['created'], $item['contact-id'], $item['uid']];
-                       if (self::exists($condition)) {
-                               Logger::log('duplicated item with the same body found. '.print_r($item,true));
-                               return 0;
-                       }
-               }
-
                // Is this item available in the global items (with uid=0)?
                if ($item["uid"] == 0) {
                        $item["global"] = true;
@@ -1816,22 +1791,10 @@ class Item
                }
 
                // ACL settings
-               if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) {
-                       $private = self::PRIVATE;
-               } else {
-                       $private = $item['private'];
+               if (!empty($item["allow_cid"] . $item["allow_gid"] . $item["deny_cid"] . $item["deny_gid"])) {
+                       $item["private"] = self::PRIVATE;
                }
 
-               $item["allow_cid"] = $allow_cid;
-               $item["allow_gid"] = $allow_gid;
-               $item["deny_cid"] = $deny_cid;
-               $item["deny_gid"] = $deny_gid;
-               $item["private"] = $private;
-               $item["deleted"] = $parent_deleted;
-
-               // Fill the cache field
-               self::putInCache($item);
-
                if ($notify) {
                        $item['edit'] = false;
                        $item['parent'] = $parent_id;
@@ -1842,41 +1805,13 @@ class Item
                        Hook::callAll('post_remote', $item);
                }
 
-               // This array field is used to trigger some automatic reactions
-               // It is mainly used in the "post_local" hook.
-               unset($item['api_source']);
-
                if (!empty($item['cancel'])) {
                        Logger::log('post cancelled by addon.');
                        return 0;
                }
 
-               /*
-                * Check for already added items.
-                * There is a timing issue here that sometimes creates double postings.
-                * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
-                */
-               if ($item["uid"] == 0) {
-                       if (self::exists(['uri' => trim($item['uri']), 'uid' => 0])) {
-                               Logger::log('Global item already stored. URI: '.$item['uri'].' on network '.$item['network'], Logger::DEBUG);
-                               return 0;
-                       }
-               }
-
-               Logger::log('' . print_r($item,true), Logger::DATA);
-
-               if (array_key_exists('tag', $item)) {
-                       $tags = $item['tag'];
-                       unset($item['tag']);
-               } else {
-                       $tags = '';
-               }
-
-               if (array_key_exists('file', $item)) {
-                       $files = $item['file'];
-                       unset($item['file']);
-               } else {
-                       $files = '';
+               if (empty($item['vid']) && !empty($item['verb'])) {
+                       $item['vid'] = Verb::getID($item['verb']);
                }
 
                // Creates or assigns the permission set
@@ -1888,34 +1823,69 @@ class Item
                        $item['deny_gid']
                );
 
-               $item['allow_cid'] = null;
-               $item['allow_gid'] = null;
-               $item['deny_cid'] = null;
-               $item['deny_gid'] = null;
+               unset($item['allow_cid']);
+               unset($item['allow_gid']);
+               unset($item['deny_cid']);
+               unset($item['deny_gid']);
+
+               // This array field is used to trigger some automatic reactions
+               // It is mainly used in the "post_local" hook.
+               unset($item['api_source']);
+
+
+               // Check for hashtags in the body and repair or add hashtag links
+               self::setHashtags($item);
+               
+               // Fill the cache field
+               self::putInCache($item);
+
+               if (stristr($item['verb'], Activity::POKE)) {
+                       $notify_type = Delivery::POKE;
+               } else {
+                       $notify_type = Delivery::POST;
+               }
 
+               $body = $item['body'];
+               
                // We are doing this outside of the transaction to avoid timing problems
                if (!self::insertActivity($item)) {
                        self::insertContent($item);
                }
 
-               $delivery_data = ItemDeliveryData::extractFields($item);
+               $like_no_comment = DI::config()->get('system', 'like_no_comment');
 
-               unset($item['postopts']);
-               unset($item['inform']);
+               DBA::transaction();
 
-               // These fields aren't stored anymore in the item table, they are fetched upon request
-               unset($item['author-link']);
-               unset($item['author-name']);
-               unset($item['author-avatar']);
-               unset($item['author-network']);
+               // Filling item related side tables
 
-               unset($item['owner-link']);
-               unset($item['owner-name']);
-               unset($item['owner-avatar']);
+               // Diaspora signature
+               if (!empty($item['diaspora_signed_text'])) {
+                       DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $item['diaspora_signed_text']], true);
+               }
 
-               $like_no_comment = DI::config()->get('system', 'like_no_comment');
+               unset($item['diaspora_signed_text']);
 
-               DBA::transaction();
+               // Attached file links
+               if (!empty($item['file'])) {
+                       Category::storeTextByURIId($item['uri-id'], $item['uid'], $item['file']);
+               }
+
+               unset($item['file']);
+
+               // Delivery relevant data
+               $delivery_data = Post\DeliveryData::extractFields($item);
+               unset($item['postopts']);
+               unset($item['inform']);
+
+               if (!empty($item['origin']) || !empty($item['wall']) || !empty($delivery_data['postopts']) || !empty($delivery_data['inform'])) {
+                       Post\DeliveryData::insert($item['uri-id'], $delivery_data);
+               }
+
+               // Store tags from the body if this hadn't been handled previously in the protocol classes
+               if (!Tag::existsForPost($item['uri-id'])) {
+                       Tag::storeFromBody($item['uri-id'], $body);
+               }
+               
                $ret = DBA::insert('item', $item);
 
                // When the item was successfully stored we fetch the ID of the item.
@@ -1945,7 +1915,7 @@ class Item
                        // There are duplicates. We delete our just created entry.
                        Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]);
 
-                       // Yes, we could do a rollback here - but we are having many users with MyISAM.
+                       // Yes, we could do a rollback here - but we possibly are still having users with MyISAM.
                        DBA::delete('item', ['id' => $current_post]);
                        DBA::commit();
                        return 0;
@@ -1976,53 +1946,13 @@ class Item
                        DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
                }
 
-               if ($dsprsig) {
-                       /*
-                        * Friendica servers lower than 3.4.3-2 had double encoded the signature ...
-                        * We can check for this condition when we decode and encode the stuff again.
-                        */
-                       if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) {
-                               $dsprsig->signature = base64_decode($dsprsig->signature);
-                               Logger::log("Repaired double encoded signature from handle ".$dsprsig->signer, Logger::DEBUG);
-                       }
-
-                       if (!empty($dsprsig->signed_text) && empty($dsprsig->signature) && empty($dsprsig->signer)) {
-                               DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $dsprsig->signed_text], true);
-                       } else {
-                               // The other fields are used by very old Friendica servers, so we currently store them differently
-                               DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
-                                       'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
-                       }
-               }
-
-               if (!empty($diaspora_signed_text)) {
-                       DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $diaspora_signed_text], true);
-               }
-
                if ($item['parent-uri'] === $item['uri']) {
                        self::addThread($current_post);
                } else {
                        self::updateThread($parent_id);
                }
-
-               if (!empty($item['origin']) || !empty($item['wall']) || !empty($delivery_data['postopts']) || !empty($delivery_data['inform'])) {
-                       ItemDeliveryData::insert($current_post, $delivery_data);
-               }
-
                DBA::commit();
 
-               /*
-                * Due to deadlock issues with the "term" table we are doing these steps after the commit.
-                * This is not perfect - but a workable solution until we found the reason for the problem.
-                */
-               if (!empty($tags)) {
-                       Term::insertFromTagFieldByItemId($current_post, $tags);
-               }
-
-               if (!empty($files)) {
-                       Term::insertFromFileFieldByItemId($current_post, $files);
-               }
-
                // In that function we check if this is a forum post. Additionally we delete the item under certain circumstances
                if (self::tagDeliver($item['uid'], $current_post)) {
                        // Get the user information for the logging
@@ -2057,7 +1987,19 @@ class Item
 
                check_user_notification($current_post);
 
-               if ($notify || ($item['visible'] && ((!empty($parent) && $parent['origin']) || $item['origin']))) {
+               $transmit = $notify || ($item['visible'] && ($parent_origin || $item['origin']));
+
+               if ($transmit) {
+                       $transmit_item = Item::selectFirst(['verb', 'origin'], ['id' => $item['id']]);
+                       // Don't relay participation messages
+                       if (($transmit_item['verb'] == Activity::FOLLOW) && 
+                               (!$transmit_item['origin'] || ($item['author-id'] != Contact::getPublicIdByUserId($uid)))) {
+                               Logger::info('Participation messages will not be relayed', ['item' => $item['id'], 'uri' => $item['uri'], 'verb' => $transmit_item['verb']]);
+                               $transmit = false;
+                       }
+               }
+
+               if ($transmit) {
                        Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, $current_post);
                }
 
@@ -2341,7 +2283,7 @@ class Item
                        }
                }
 
-               $distributed = self::insert($item, false, $notify, true);
+               $distributed = self::insert($item, $notify, true);
 
                if (!$distributed) {
                        Logger::log("Distributed public item " . $itemid . " for user " . $uid . " wasn't stored", Logger::DEBUG);
@@ -2408,7 +2350,7 @@ class Item
                                $item['contact-id'] = $item['author-id'];
                        }
 
-                       $public_shadow = self::insert($item, false, false, true);
+                       $public_shadow = self::insert($item, false, true);
 
                        Logger::log("Stored public shadow for thread ".$itemid." under id ".$public_shadow, Logger::DEBUG);
                }
@@ -2466,7 +2408,7 @@ class Item
                unset($item['inform']);
                $item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
-               $public_shadow = self::insert($item, false, false, true);
+               $public_shadow = self::insert($item, false, true);
 
                Logger::log("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, Logger::DEBUG);
 
@@ -2481,20 +2423,22 @@ class Item
         * Adds a language specification in a "language" element of given $arr.
         * Expects "body" element to exist in $arr.
         *
-        * @param $item
+        * @param array $item
+        * @return string detected language
         * @throws \Text_LanguageDetect_Exception
         */
-       private static function addLanguageToItemArray(&$item)
+       private static function getLanguage(array $item)
        {
                $naked_body = BBCode::toPlaintext($item['body'], false);
 
                $ld = new Text_LanguageDetect();
                $ld->setNameMode(2);
                $languages = $ld->detect($naked_body, 3);
-
                if (is_array($languages)) {
-                       $item['language'] = json_encode($languages);
+                       return json_encode($languages);
                }
+
+               return '';
        }
 
        /**
@@ -2567,7 +2511,8 @@ class Item
                        Contact::unmarkForArchival($contact);
                }
 
-               $update = (($arr['private'] != self::PRIVATE) && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"])));
+               /// @todo On private posts we could obfuscate the date
+               $update = ($arr['private'] != self::PRIVATE);
 
                // Is it a forum? Then we don't care about the rules from above
                if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) {
@@ -2577,8 +2522,15 @@ class Item
                }
 
                if ($update) {
-                       DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
-                               ['id' => $arr['contact-id']]);
+                       // The "self" contact id is used (for example in the connectors) when the contact is unknown
+                       // So we have to ensure to only update the last item when it had been our own post,
+                       // or it had been done by a "regular" contact.
+                       if (!empty($arr['wall'])) {
+                               $condition = ['id' => $arr['contact-id']];
+                       } else { 
+                               $condition = ['id' => $arr['contact-id'], 'self' => false];
+                       }
+                       DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
                }
                // Now do the same for the system wide contacts with uid=0
                if ($arr['private'] != self::PRIVATE) {
@@ -2614,7 +2566,10 @@ class Item
 
                // This sorting is important when there are hashtags that are part of other hashtags
                // Otherwise there could be problems with hashtags like #test and #test2
-               rsort($tags);
+               // Because of this we are sorting from the longest to the shortest tag.
+               usort($tags, function($a, $b) {
+                       return strlen($b) <=> strlen($a);
+               });
 
                $URLSearchString = "^\[\]";
 
@@ -2622,9 +2577,6 @@ class Item
                if (DI::config()->get('system', 'local_tags')) {
                        $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
                                        "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
-
-                       $item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-                                       "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
                }
 
                // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
@@ -2656,13 +2608,6 @@ class Item
                        $newtag = '#[url=' . DI::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 
                        $item["body"] = str_replace($tag, $newtag, $item["body"]);
-
-                       if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
-                               if (strlen($item["tag"])) {
-                                       $item["tag"] = ',' . $item["tag"];
-                               }
-                               $item["tag"] = $newtag . $item["tag"];
-                       }
                }
 
                // Convert back the masked hashtags
@@ -2851,7 +2796,7 @@ class Item
 
                if ($contact['network'] != Protocol::FEED) {
                        // Store the original post
-                       $result = self::insert($datarray2, false, false);
+                       $result = self::insert($datarray2);
                        Logger::log('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), Logger::DEBUG);
                } else {
                        $datarray["app"] = "Feed";
@@ -3020,30 +2965,6 @@ class Item
                return $recipients;
        }
 
-       public static function getFeedTags($item)
-       {
-               $ret = [];
-               $matches = false;
-               $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches);
-               if ($cnt) {
-                       for ($x = 0; $x < $cnt; $x ++) {
-                               if ($matches[1][$x]) {
-                                       $ret[$matches[2][$x]] = ['#', $matches[1][$x], $matches[2][$x]];
-                               }
-                       }
-               }
-               $matches = false;
-               $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches);
-               if ($cnt) {
-                       for ($x = 0; $x < $cnt; $x ++) {
-                               if ($matches[1][$x]) {
-                                       $ret[] = ['@', $matches[1][$x], $matches[2][$x]];
-                               }
-                       }
-               }
-               return $ret;
-       }
-
        public static function expire($uid, $days, $network = "", $force = false)
        {
                if (!$uid || ($days < 1)) {
@@ -3551,7 +3472,7 @@ class Item
                        return $ev;
                }
 
-               $tags = Term::populateTagsFromItem($item);
+               $tags = Tag::populateFromItem($item);
 
                $item['tags'] = $tags['tags'];
                $item['hashtags'] = $tags['hashtags'];