]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Fixes/tye-hints
[friendica.git] / src / Model / Item.php
index 2cc9041bf98a497df8e09b6c281529b773bb5560..5db1b0bb45d7c2f7c96d69422c40cdfc9e426b25 100644 (file)
@@ -7,25 +7,20 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use Friendica\Content\Text;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Lock;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
-use Friendica\Model\Group;
-use Friendica\Model\Term;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
-use Friendica\Util\Lock;
-use dba;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
@@ -34,14 +29,25 @@ require_once 'include/text.php';
 
 class Item extends BaseObject
 {
+       // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
+       const PT_ARTICLE = 0;
+       const PT_NOTE = 1;
+       const PT_PAGE = 2;
+       const PT_IMAGE = 16;
+       const PT_AUDIO = 17;
+       const PT_VIDEO = 18;
+       const PT_DOCUMENT = 19;
+       const PT_EVENT = 32;
+       const PT_PERSONAL_NOTE = 128;
+
        // Field list that is used to display the items
        const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
                        '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',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
-                       'author-id', 'author-link', 'author-name', 'author-avatar',
-                       'owner-id', 'owner-link', 'owner-name', 'owner-avatar',
+                       'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
+                       'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
                        'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
                        'writable', 'self', 'cid', 'alias',
                        'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
@@ -52,10 +58,10 @@ class Item extends BaseObject
        const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
                        'created', 'edited', 'verb', 'object-type', 'object', 'target',
                        'private', 'title', 'body', 'location', 'coord', 'app',
-                       'attach', 'tag', 'bookmark', 'deleted', 'extid',
+                       'attach', 'tag', 'deleted', 'extid', 'post-type',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                        'author-id', 'author-link', 'owner-link', 'contact-uid',
-                       'signed_text', 'signature', 'signer'];
+                       'signed_text', 'signature', 'signer', 'network'];
 
        // Field list for "item-content" table that is mixed with the item table
        const MIXED_CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
@@ -65,12 +71,15 @@ class Item extends BaseObject
        // Field list for "item-content" table that is not present in the "item" table
        const CONTENT_FIELDLIST = ['language'];
 
+       // Field list for additional delivery data
+       const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
+
        // All fields in the item table
        const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
-                       'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid',
+                       'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
                        'created', 'edited', 'commented', 'received', 'changed', 'verb',
                        'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
-                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+                       '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',
                        'title', 'content-warning', 'body', 'location', 'coord', 'app',
@@ -78,6 +87,53 @@ class Item extends BaseObject
                        'author-id', 'author-link', 'author-name', 'author-avatar',
                        'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
 
+       // Never reorder or remove entries from this list. Just add new ones at the end, if needed.
+       // The item-activity table only stores the index and needs this array to know the matching activity.
+       const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+       private static $legacy_mode = null;
+
+       public static function isLegacyMode()
+       {
+               if (is_null(self::$legacy_mode)) {
+                       self::$legacy_mode = (Config::get("system", "post_update_version") < 1279);
+               }
+
+               return self::$legacy_mode;
+       }
+
+       /**
+        * @brief returns an activity index from an activity string
+        *
+        * @param string $activity activity string
+        * @return integer Activity index
+        */
+       private static function activityToIndex($activity)
+       {
+               $index = array_search($activity, self::ACTIVITIES);
+
+               if (is_bool($index)) {
+                       $index = -1;
+               }
+
+               return $index;
+       }
+
+       /**
+        * @brief returns an activity string from an activity index
+        *
+        * @param integer $index activity index
+        * @return string Activity string
+        */
+       private static function indexToActivity($index)
+       {
+               if (is_null($index) || !array_key_exists($index, self::ACTIVITIES)) {
+                       return '';
+               }
+
+               return self::ACTIVITIES[$index];
+       }
+
        /**
         * @brief Fetch a single item row
         *
@@ -86,16 +142,14 @@ class Item extends BaseObject
         */
        public static function fetch($stmt)
        {
-               $row = dba::fetch($stmt);
+               $row = DBA::fetch($stmt);
 
-               // Fetch data from the item-content table whenever there is content there
-               foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
-                       if (empty($row[$field]) && !empty($row['item-' . $field])) {
-                               $row[$field] = $row['item-' . $field];
-                       }
-                       unset($row['item-' . $field]);
+               if (is_bool($row)) {
+                       return $row;
                }
 
+               // ---------------------- Transform item structure data ----------------------
+
                // We prefer the data from the user's contact over the public one
                if (!empty($row['author-link']) && !empty($row['contact-link']) &&
                        ($row['author-link'] == $row['contact-link'])) {
@@ -117,17 +171,70 @@ class Item extends BaseObject
                        }
                }
 
-               // Build the tag string out of the term entries
-               if (isset($row['id']) && array_key_exists('tag', $row)) {
-                       $row['tag'] = Term::tagTextFromItemId($row['id']);
-               }
-
                // We can always comment on posts from these networks
-               if (isset($row['writable']) && !empty($row['network']) &&
-                       in_array($row['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+               if (array_key_exists('writable', $row) &&
+                       in_array($row['internal-network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
                        $row['writable'] = true;
                }
 
+               // ---------------------- Transform item content data ----------------------
+
+               // Fetch data from the item-content table whenever there is content there
+               if (self::isLegacyMode()) {
+                       $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+                       foreach ($legacy_fields as $field) {
+                               if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
+                                       $row[$field] = $row['internal-item-' . $field];
+                               }
+                               unset($row['internal-item-' . $field]);
+                       }
+               }
+
+               if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
+                       $row['verb'] = self::indexToActivity($row['internal-activity']);
+                       if (array_key_exists('title', $row)) {
+                               $row['title'] = '';
+                       }
+                       if (array_key_exists('body', $row)) {
+                               $row['body'] = $row['verb'];
+                       }
+                       if (array_key_exists('object', $row)) {
+                               $row['object'] = '';
+                       }
+                       if (array_key_exists('object-type', $row)) {
+                               $row['object-type'] = ACTIVITY_OBJ_NOTE;
+                       }
+               } elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
+                       // Posts don't have an object or target - but having tags or files.
+                       // We safe some performance by building tag and file strings only here.
+                       // We remove object and target since they aren't used for this type.
+                       if (array_key_exists('object', $row)) {
+                               $row['object'] = '';
+                       }
+                       if (array_key_exists('target', $row)) {
+                               $row['target'] = '';
+                       }
+               }
+
+               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']);
+                       }
+               }
+
+               // Remove internal fields
+               unset($row['internal-activity']);
+               unset($row['internal-network']);
+               unset($row['internal-iid']);
+               unset($row['internal-iaid']);
+               unset($row['internal-icid']);
+
                return $row;
        }
 
@@ -147,7 +254,7 @@ class Item extends BaseObject
                        $data[] = $row;
                }
                if ($do_close) {
-                       dba::close($stmt);
+                       DBA::close($stmt);
                }
                return $data;
        }
@@ -165,10 +272,10 @@ class Item extends BaseObject
                if (is_bool($stmt)) {
                        $retval = $stmt;
                } else {
-                       $retval = (dba::num_rows($stmt) > 0);
+                       $retval = (DBA::num_rows($stmt) > 0);
                }
 
-               dba::close($stmt);
+               DBA::close($stmt);
 
                return $retval;
        }
@@ -182,7 +289,7 @@ class Item extends BaseObject
         * @param array  $condition
         * @param array  $params
         * @return bool|array
-        * @see dba::select
+        * @see DBA::select
         */
        public static function selectFirstForUser($uid, array $selected = [], array $condition = [], $params = [])
        {
@@ -224,7 +331,7 @@ class Item extends BaseObject
         * @param array  $condition
         * @param array  $params
         * @return bool|array
-        * @see dba::select
+        * @see DBA::select
         */
        public static function selectFirst(array $fields = [], array $condition = [], $params = [])
        {
@@ -236,7 +343,7 @@ class Item extends BaseObject
                        return $result;
                } else {
                        $row = self::fetch($result);
-                       dba::close($result);
+                       DBA::close($result);
                        return $row;
                }
        }
@@ -264,7 +371,7 @@ class Item extends BaseObject
 
                $select_fields = self::constructSelectFields($fields, $selected);
 
-               $condition_string = dba::buildCondition($condition);
+               $condition_string = DBA::buildCondition($condition);
 
                $condition_string = self::addTablesToFields($condition_string, $fields);
 
@@ -272,13 +379,13 @@ class Item extends BaseObject
                        $condition_string = $condition_string . ' AND ' . self::condition(false);
                }
 
-               $param_string = self::addTablesToFields(dba::buildParameter($params), $fields);
+               $param_string = self::addTablesToFields(DBA::buildParameter($params), $fields);
 
-               $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false);
+               $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode);
 
                $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
 
-               return dba::p($sql, $condition);
+               return DBA::p($sql, $condition);
        }
 
        /**
@@ -311,7 +418,7 @@ class Item extends BaseObject
         * @param array  $condition
         * @param array  $params
         * @return bool|array
-        * @see dba::select
+        * @see DBA::select
         */
        public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
        {
@@ -332,7 +439,7 @@ class Item extends BaseObject
         * @param array  $condition
         * @param array  $params
         * @return bool|array
-        * @see dba::select
+        * @see DBA::select
         */
        public static function selectFirstThread(array $fields = [], array $condition = [], $params = [])
        {
@@ -343,7 +450,7 @@ class Item extends BaseObject
                        return $result;
                } else {
                        $row = self::fetch($result);
-                       dba::close($result);
+                       DBA::close($result);
                        return $row;
                }
        }
@@ -371,12 +478,12 @@ class Item extends BaseObject
 
                $threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id',
                        'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private',
-                       'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'bookmark',
+                       'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'post-type',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'network']];
 
                $select_fields = self::constructSelectFields($fields, $selected);
 
-               $condition_string = dba::buildCondition($condition);
+               $condition_string = DBA::buildCondition($condition);
 
                $condition_string = self::addTablesToFields($condition_string, $threadfields);
                $condition_string = self::addTablesToFields($condition_string, $fields);
@@ -385,15 +492,15 @@ class Item extends BaseObject
                        $condition_string = $condition_string . ' AND ' . self::condition(true);
                }
 
-               $param_string = dba::buildParameter($params);
+               $param_string = DBA::buildParameter($params);
                $param_string = self::addTablesToFields($param_string, $threadfields);
                $param_string = self::addTablesToFields($param_string, $fields);
 
-               $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true);
+               $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true, $usermode);
 
                $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
 
-               return dba::p($sql, $condition);
+               return DBA::p($sql, $condition);
        }
 
        /**
@@ -407,20 +514,26 @@ class Item extends BaseObject
 
                $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
                        'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
-                       'created', 'edited', 'commented', 'received', 'changed', 'postopts',
-                       'resource-id', 'event-id', 'tag', 'attach', 'inform',
-                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+                       'created', 'edited', 'commented', 'received', 'changed',
+                       'resource-id', 'event-id', 'tag', 'attach', 'post-type',
+                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid',
                        'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
-                       'id' => 'item_id', 'network', 'icid'];
+                       'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
+                       'network' => 'internal-network', 'icid' => 'internal-icid',
+                       'iaid' => 'internal-iaid'];
+
+               $fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
 
                $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
 
+               $fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
+
                $fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
-                       'thumb' => 'author-avatar', 'nick' => 'author-nick'];
+                       'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
 
                $fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name',
-                       'thumb' => 'owner-avatar', 'nick' => 'owner-nick'];
+                       'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network'];
 
                $fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
                        'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid',
@@ -468,7 +581,7 @@ class Item extends BaseObject
         *
         * @return string The SQL joins for the "select" functions
         */
-       private static function constructJoins($uid, $sql_commands, $thread_mode)
+       private static function constructJoins($uid, $sql_commands, $thread_mode, $user_mode)
        {
                if ($thread_mode) {
                        $master_table = "`thread`";
@@ -480,14 +593,26 @@ class Item extends BaseObject
                        $joins = '';
                }
 
-               $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
-                       AND NOT `contact`.`blocked`
-                       AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
-                       OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0)
-                       STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
-                       STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
-                       LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d",
-                       CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid));
+               if ($user_mode) {
+                       $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
+                               AND NOT `contact`.`blocked`
+                               AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
+                               OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0)
+                               STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
+                               STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
+                               LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d",
+                               CONTACT_IS_SHARING, CONTACT_IS_FRIEND, GRAVITY_PARENT, intval($uid));
+               } else {
+                       if (strpos($sql_commands, "`contact`.") !== false) {
+                               $joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
+                       }
+                       if (strpos($sql_commands, "`author`.") !== false) {
+                               $joins .= " LEFT JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
+                       }
+                       if (strpos($sql_commands, "`owner`.") !== false) {
+                               $joins .= " LEFT JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
+                       }
+               }
 
                if (strpos($sql_commands, "`group_member`.") !== false) {
                        $joins .= " STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = $master_table.`contact-id`";
@@ -505,10 +630,18 @@ class Item extends BaseObject
                        $joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
                }
 
+               if (strpos($sql_commands, "`item-activity`.") !== false) {
+                       $joins .= " LEFT JOIN `item-activity` ON `item-activity`.`id` = `item`.`iaid`";
+               }
+
                if (strpos($sql_commands, "`item-content`.") !== false) {
                        $joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
                }
 
+               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, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
                        $joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
                }
@@ -530,17 +663,24 @@ class Item extends BaseObject
         */
        private static function constructSelectFields($fields, $selected)
        {
-               // To be able to fetch the tags we need the item id
-               if (in_array('tag', $selected) && !in_array('id', $selected)) {
-                       $selected[] = 'id';
+               if (!empty($selected)) {
+                       $selected[] = 'internal-iid';
+                       $selected[] = 'internal-iaid';
+                       $selected[] = 'internal-icid';
+                       $selected[] = 'internal-network';
+               }
+
+               if (in_array('verb', $selected)) {
+                       $selected[] = 'internal-activity';
                }
 
                $selection = [];
                foreach ($fields as $table => $table_fields) {
                        foreach ($table_fields as $field => $select) {
                                if (empty($selected) || in_array($select, $selected)) {
-                                       if (in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
-                                               $selection[] = "`item`.`".$select."` AS `item-" . $select . "`";
+                                       $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+                                       if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
+                                               $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
                                        }
                                        if (is_int($field)) {
                                                $selection[] = "`" . $table . "`.`" . $select . "`";
@@ -579,6 +719,19 @@ class Item extends BaseObject
                return $query;
        }
 
+       /**
+        * @brief Generate a server unique item hash for linking between the item tables
+        *
+        * @param string $uri     Item URI
+        * @param date   $created Item creation date
+        *
+        * @return string the item hash
+        */
+       private static function itemHash($uri, $created)
+       {
+               return round(strtotime($created) / 100) . hash('ripemd128', $uri);
+       }
+
        /**
         * @brief Update existing item entries
         *
@@ -599,55 +752,159 @@ class Item extends BaseObject
                }
 
                // To ensure the data integrity we do it in an transaction
-               dba::transaction();
+               DBA::transaction();
 
                // 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', 'plink'], $condition);
+               $items = DBA::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition);
 
                $content_fields = [];
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
                        if (isset($fields[$field])) {
                                $content_fields[$field] = $fields[$field];
-                               unset($fields[$field]);
+                               if (in_array($field, self::CONTENT_FIELDLIST) || !self::isLegacyMode()) {
+                                       unset($fields[$field]);
+                               } else {
+                                       $fields[$field] = null;
+                               }
+                       }
+               }
+
+               $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+               foreach ($clear_fields as $field) {
+                       if (array_key_exists($field, $fields)) {
+                               $fields[$field] = null;
                        }
                }
 
                if (array_key_exists('tag', $fields)) {
                        $tags = $fields['tag'];
-                       unset($fields['tag']);
+                       $fields['tag'] = null;
                } else {
                        $tags = '';
                }
 
+               if (array_key_exists('file', $fields)) {
+                       $files = $fields['file'];
+                       $fields['file'] = null;
+               } else {
+                       $files = '';
+               }
+
+               $delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
+                       'inform' => defaults($fields, 'inform', '')];
+
+               $fields['postopts'] = null;
+               $fields['inform'] = null;
+
                if (!empty($fields)) {
-                       $success = dba::update('item', $fields, $condition);
+                       $success = DBA::update('item', $fields, $condition);
 
                        if (!$success) {
-                               dba::close($items);
-                               dba::rollback();
+                               DBA::close($items);
+                               DBA::rollback();
                                return false;
                        }
                }
 
                // When there is no content for the "old" item table, this will count the fetched items
-               $rows = dba::affected_rows();
+               $rows = DBA::affected_rows();
+
+               while ($item = DBA::fetch($items)) {
+
+                       // This part here can safely be removed when the legacy fields in the item had been removed
+                       if (empty($item['uri-hash']) && !empty($item['uri']) && !empty($item['created'])) {
+
+                               // Fetch the uri-hash from an existing item entry if there is one
+                               $item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']];
+                               $existing = DBA::selectfirst('item', ['uri-hash'], $item_condition);
+                               if (DBM::is_result($existing)) {
+                                       $item['uri-hash'] = $existing['uri-hash'];
+                               } else {
+                                       $item['uri-hash'] = self::itemHash($item['uri'], $item['created']);
+                               }
+
+                               DBA::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]);
+                               DBA::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]);
+                               DBA::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]);
+                       }
 
-               while ($item = dba::fetch($items)) {
-                       if (!empty($item['plink'])) {
-                               $content_fields['plink'] =  $item['plink'];
+                       if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) {
+                               if (!empty($item['iaid'])) {
+                                       $update_condition = ['id' => $item['iaid']];
+                               } else {
+                                       $update_condition = ['uri-hash' => $item['uri-hash']];
+                               }
+                               self::updateActivity($content_fields, $update_condition);
+
+                               if (empty($item['iaid'])) {
+                                       $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+                                       if (DBM::is_result($item_activity)) {
+                                               $item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
+                                               foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+                                                       if (self::isLegacyMode()) {
+                                                               $item_fields[$field] = null;
+                                                       } else {
+                                                               unset($item_fields[$field]);
+                                                       }
+                                               }
+                                               DBA::update('item', $item_fields, ['id' => $item['id']]);
+
+                                               if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid']])) {
+                                                       DBA::delete('item-content', ['id' => $item['icid']]);
+                                               }
+                                       }
+                               } elseif (!empty($item['icid'])) {
+                                       DBA::update('item', ['icid' => null], ['id' => $item['id']]);
+
+                                       if (!DBA::exists('item', ['icid' => $item['icid']])) {
+                                               DBA::delete('item-content', ['id' => $item['icid']]);
+                                       }
+                               }
+                       } else {
+                               if (!empty($item['icid'])) {
+                                       $update_condition = ['id' => $item['icid']];
+                               } else {
+                                       $update_condition = ['uri-plink-hash' => $item['uri-hash']];
+                               }
+                               self::updateContent($content_fields, $update_condition);
+
+                               if (empty($item['icid'])) {
+                                       $item_content = DBA::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]);
+                                       if (DBM::is_result($item_content)) {
+                                               $item_fields = ['icid' => $item_content['id']];
+                                               // Clear all fields in the item table that have a content in the item-content table
+                                               foreach ($item_content as $field => $content) {
+                                                       if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) {
+                                                               if (self::isLegacyMode()) {
+                                                                       $item_fields[$field] = null;
+                                                               } else {
+                                                                       unset($item_fields[$field]);
+                                                               }
+                                                       }
+                                               }
+                                               DBA::update('item', $item_fields, ['id' => $item['id']]);
+                                       }
+                               }
                        }
-                       self::updateContent($content_fields, ['uri' => $item['uri']]);
 
                        if (!empty($tags)) {
                                Term::insertFromTagFieldByItemId($item['id'], $tags);
+                               if (!empty($item['tag'])) {
+                                       DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
+                               }
                        }
 
-                       if (array_key_exists('file', $fields)) {
-                               Term::insertFromFileFieldByItemId($item['id']);
+                       if (!empty($files)) {
+                               Term::insertFromFileFieldByItemId($item['id'], $files);
+                               if (!empty($item['file'])) {
+                                       DBA::update('item', ['file' => ''], ['id' => $item['id']]);
+                               }
                        }
 
+                       self::updateDeliveryData($item['id'], $delivery_data);
+
                        self::updateThread($item['id']);
 
                        // We only need to notfiy others when it is an original entry from us.
@@ -657,8 +914,8 @@ class Item extends BaseObject
                        }
                }
 
-               dba::close($items);
-               dba::commit();
+               DBA::close($items);
+               DBA::commit();
                return $rows;
        }
 
@@ -670,11 +927,11 @@ class Item extends BaseObject
         */
        public static function delete($condition, $priority = PRIORITY_HIGH)
        {
-               $items = dba::select('item', ['id'], $condition);
-               while ($item = dba::fetch($items)) {
+               $items = DBA::select('item', ['id'], $condition);
+               while ($item = DBA::fetch($items)) {
                        self::deleteById($item['id'], $priority);
                }
-               dba::close($items);
+               DBA::close($items);
        }
 
        /**
@@ -689,18 +946,18 @@ class Item extends BaseObject
                        return;
                }
 
-               $items = dba::select('item', ['id', 'uid'], $condition);
-               while ($item = dba::fetch($items)) {
+               $items = DBA::select('item', ['id', 'uid'], $condition);
+               while ($item = DBA::fetch($items)) {
                        // "Deleting" global items just means hiding them
                        if ($item['uid'] == 0) {
-                               dba::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
+                               DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
                        } elseif ($item['uid'] == $uid) {
                                self::deleteById($item['id'], PRIORITY_HIGH);
                        } else {
                                logger('Wrong ownership. Not deleting item ' . $item['id']);
                        }
                }
-               dba::close($items);
+               DBA::close($items);
        }
 
        /**
@@ -717,7 +974,7 @@ class Item extends BaseObject
                $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
                        'deleted', 'file', 'resource-id', 'event-id', 'attach',
                        'verb', 'object-type', 'object', 'target', 'contact-id'];
-               $item = dba::selectFirst('item', $fields, ['id' => $item_id]);
+               $item = self::selectFirst($fields, ['id' => $item_id]);
                if (!DBM::is_result($item)) {
                        logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG);
                        return false;
@@ -728,7 +985,7 @@ class Item extends BaseObject
                        return false;
                }
 
-               $parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
+               $parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
                if (!DBM::is_result($parent)) {
                        $parent = ['origin' => false];
                }
@@ -759,7 +1016,7 @@ class Item extends BaseObject
                 * generate a resource-id and therefore aren't intimately linked to the item.
                 */
                if (strlen($item['resource-id'])) {
-                       dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
+                       DBA::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
                }
 
                // If item is a link to an event, delete the event.
@@ -770,7 +1027,9 @@ class Item extends BaseObject
                // If item has attachments, drop them
                foreach (explode(", ", $item['attach']) as $attach) {
                        preg_match("|attach/(\d+)|", $attach, $matches);
-                       dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+                       if (is_array($matches) && count($matches) > 1) {
+                               DBA::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+                       }
                }
 
                // Delete tags that had been attached to other items
@@ -782,16 +1041,18 @@ class Item extends BaseObject
                $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(),
                        'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '',
                        'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => ''];
-               dba::update('item', $item_fields, ['id' => $item['id']]);
+               DBA::update('item', $item_fields, ['id' => $item['id']]);
 
                Term::insertFromTagFieldByItemId($item['id'], '');
-               Term::insertFromFileFieldByItemId($item['id']);
+               Term::insertFromFileFieldByItemId($item['id'], '');
                self::deleteThread($item['id'], $item['parent-uri']);
 
                if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
                        self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
                }
 
+               DBA::delete('item-delivery-data', ['iid' => $item['id']]);
+
                // If it's the parent of a comment thread, kill all the kids
                if ($item['id'] == $item['parent']) {
                        self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
@@ -808,9 +1069,9 @@ class Item extends BaseObject
                } elseif ($item['uid'] != 0) {
 
                        // When we delete just our local user copy of an item, we have to set a marker to hide it
-                       $global_item = dba::selectFirst('item', ['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
+                       $global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
                        if (DBM::is_result($global_item)) {
-                               dba::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
+                               DBA::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
                        }
                }
 
@@ -832,7 +1093,7 @@ class Item extends BaseObject
                        return;
                }
 
-               $i = dba::selectFirst('item', ['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
+               $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
                if (!DBM::is_result($i)) {
                        return;
                }
@@ -859,10 +1120,8 @@ class Item extends BaseObject
 
        private static function guid($item, $notify)
        {
-               $guid = notags(trim($item['guid']));
-
-               if (!empty($guid)) {
-                       return $guid;
+               if (!empty($item['guid'])) {
+                       return notags(trim($item['guid']));
                }
 
                if ($notify) {
@@ -906,7 +1165,7 @@ class Item extends BaseObject
                } elseif (!empty($item['uri'])) {
                        $guid = self::guidFromUri($item['uri'], $prefix_host);
                } else {
-                       $guid = get_guid(32, hash('crc32', $prefix_host));
+                       $guid = System::createGUID(32, hash('crc32', $prefix_host));
                }
 
                return $guid;
@@ -935,7 +1194,7 @@ class Item extends BaseObject
 
                // Still missing? Then use the "self" contact of the current user
                if ($contact_id == 0) {
-                       $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
+                       $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
                        if (DBM::is_result($self)) {
                                $contact_id = $self["id"];
                        }
@@ -945,6 +1204,17 @@ class Item extends BaseObject
                return $contact_id;
        }
 
+       // This function will finally cover most of the preparation functionality in mod/item.php
+       public static function prepare(&$item)
+       {
+               $data = BBCode::getAttachmentData($item['body']);
+               if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $item['body'], $match, PREG_SET_ORDER) || isset($data["type"]))
+                       && ($posttype != Item::PT_PERSONAL_NOTE)) {
+                       $posttype = Item::PT_PAGE;
+                       $objecttype = ACTIVITY_OBJ_BOOKMARK;
+               }
+       }
+
        public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
        {
                $a = get_app();
@@ -952,7 +1222,6 @@ class Item extends BaseObject
                // If it is a posting where users should get notifications, then define it as wall posting
                if ($notify) {
                        $item['wall'] = 1;
-                       $item['type'] = 'wall';
                        $item['origin'] = 1;
                        $item['network'] = NETWORK_DFRN;
                        $item['protocol'] = PROTOCOL_DFRN;
@@ -1005,19 +1274,15 @@ class Item extends BaseObject
                        $item['parent-uri'] = $item['thr-parent'];
                }
 
-               $item['type'] = defaults($item, 'type', 'remote');
-
                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 ($item['type'] == 'activity') {
-                       $item['gravity'] = GRAVITY_ACTIVITY;
                } else {
                        $item['gravity'] = GRAVITY_UNKNOWN;   // Should not happen
-                       logger('Unknown gravity for verb: ' . $item['verb'] . ' - type: ' . $item['type'], LOGGER_DEBUG);
+                       logger('Unknown gravity for verb: ' . $item['verb'], LOGGER_DEBUG);
                }
 
                $uid = intval($item['uid']);
@@ -1025,7 +1290,7 @@ class Item extends BaseObject
                // check for create date and expire time
                $expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
-               $user = dba::selectFirst('user', ['expire'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
                if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
                        $expire_interval = $user['expire'];
                }
@@ -1048,7 +1313,7 @@ class Item extends BaseObject
                        $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
                                trim($item['uri']), $item['uid'],
                                NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS];
-                       $existing = dba::selectFirst('item', ['id', 'network'], $condition);
+                       $existing = self::selectFirst(['id', 'network'], $condition);
                        if (DBM::is_result($existing)) {
                                // We only log the entries with a different user id than 0. Otherwise we would have too many false positives
                                if ($uid != 0) {
@@ -1059,6 +1324,13 @@ class Item extends BaseObject
                        }
                }
 
+               // Ensure to always have the same creation date.
+               $existing = DBA::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]);
+               if (DBM::is_result($existing)) {
+                       $item['created'] = $existing['created'];
+                       $item['uri-hash'] = $existing['uri-hash'];
+               }
+
                self::addLanguageToItemArray($item);
 
                $item['wall']          = intval(defaults($item, 'wall', 0));
@@ -1080,6 +1352,7 @@ class Item extends BaseObject
                $item['visible']       = ((x($item, 'visible') !== false) ? intval($item['visible'])         : 1);
                $item['deleted']       = 0;
                $item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
+               $item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
                $item['verb']          = trim(defaults($item, 'verb', ''));
                $item['object-type']   = trim(defaults($item, 'object-type', ''));
                $item['object']        = trim(defaults($item, 'object', ''));
@@ -1091,7 +1364,6 @@ class Item extends BaseObject
                $item['deny_cid']      = trim(defaults($item, 'deny_cid', ''));
                $item['deny_gid']      = trim(defaults($item, 'deny_gid', ''));
                $item['private']       = intval(defaults($item, 'private', 0));
-               $item['bookmark']      = intval(defaults($item, 'bookmark', 0));
                $item['body']          = trim(defaults($item, 'body', ''));
                $item['tag']           = trim(defaults($item, 'tag', ''));
                $item['attach']        = trim(defaults($item, 'attach', ''));
@@ -1103,6 +1375,9 @@ class Item extends BaseObject
                $item['inform']        = trim(defaults($item, 'inform', ''));
                $item['file']          = trim(defaults($item, 'file', ''));
 
+               // Unique identifier to be linked against item-activities and item-content
+               $item['uri-hash']      = defaults($item, 'uri-hash', self::itemHash($item['uri'], $item['created']));
+
                // When there is no content then we don't post it
                if ($item['body'].$item['title'] == '') {
                        logger('No body, no title.');
@@ -1119,10 +1394,6 @@ class Item extends BaseObject
                        $item['edited'] = DateTimeFormat::utcNow();
                }
 
-               if (($item['author-link'] == "") && ($item['owner-link'] == "")) {
-                       logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
-               }
-
                $item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
 
                // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
@@ -1160,12 +1431,7 @@ class Item extends BaseObject
                if ($item['network'] == NETWORK_PHANTOM) {
                        logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
 
-                       $contact = Contact::getDetailsByURL($item['author-link'], $item['uid']);
-                       if (!empty($contact['network'])) {
-                               $item['network'] = $contact["network"];
-                       } else {
-                               $item['network'] = NETWORK_DFRN;
-                       }
+                       $item['network'] = NETWORK_DFRN;
                        logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG);
                }
 
@@ -1205,7 +1471,7 @@ class Item extends BaseObject
                                'wall', 'private', 'forum_mode', 'origin'];
                        $condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
                        $params = ['order' => ['id' => false]];
-                       $parent = dba::selectFirst('item', $fields, $condition, $params);
+                       $parent = self::selectFirst($fields, $condition, $params);
 
                        if (DBM::is_result($parent)) {
                                // is the new message multi-level threaded?
@@ -1219,7 +1485,7 @@ class Item extends BaseObject
                                                'parent-uri' => $item['parent-uri'],
                                                'uid' => $item['uid']];
                                        $params = ['order' => ['id' => false]];
-                                       $toplevel_parent = dba::selectFirst('item', $fields, $condition, $params);
+                                       $toplevel_parent = self::selectFirst($fields, $condition, $params);
 
                                        if (DBM::is_result($toplevel_parent)) {
                                                $parent = $toplevel_parent;
@@ -1255,13 +1521,13 @@ class Item extends BaseObject
 
                                // If its a post from myself then tag the thread as "mention"
                                logger("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], LOGGER_DEBUG);
-                               $user = dba::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
+                               $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
                                if (DBM::is_result($user)) {
                                        $self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
                                        $self_id = Contact::getIdForURL($self, 0, true);
                                        logger("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], LOGGER_DEBUG);
                                        if (($item['author-id'] == $self_id) || ($item['owner-id'] == $self_id)) {
-                                               dba::update('thread', ['mention' => true], ['iid' => $parent_id]);
+                                               DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
                                                logger("tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
                                        }
                                }
@@ -1313,7 +1579,7 @@ class Item extends BaseObject
                        $item["global"] = true;
 
                        // Set the global flag on all items if this was a global item entry
-                       dba::update('item', ['global' => true], ['uri' => $item["uri"]]);
+                       DBA::update('item', ['global' => true], ['uri' => $item["uri"]]);
                } else {
                        $item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]);
                }
@@ -1336,7 +1602,11 @@ class Item extends BaseObject
                put_item_in_cache($item);
 
                if ($notify) {
+                       $item['edit'] = false;
+                       $item['parent'] = $parent_id;
                        Addon::callHooks('post_local', $item);
+                       unset($item['edit']);
+                       unset($item['parent']);
                } else {
                        Addon::callHooks('post_remote', $item);
                }
@@ -1371,18 +1641,37 @@ class Item extends BaseObject
                        $tags = '';
                }
 
+               if (array_key_exists('file', $item)) {
+                       $files = $item['file'];
+                       unset($item['file']);
+               } else {
+                       $files = '';
+               }
+
+               // Creates the permission set
+               // Currently we only store the data but don't using it
+               $item['psid'] = PermissionSet::fetchIDForPost($item);
+
                // We are doing this outside of the transaction to avoid timing problems
-               self::insertContent($item);
+               if (!self::insertActivity($item)) {
+                       self::insertContent($item);
+               }
+
+               $delivery_data = ['postopts' => defaults($item, 'postopts', ''),
+                       'inform' => defaults($item, 'inform', '')];
 
-               dba::transaction();
-               $ret = dba::insert('item', $item);
+               unset($item['postopts']);
+               unset($item['inform']);
+
+               DBA::transaction();
+               $ret = DBA::insert('item', $item);
 
                // When the item was successfully stored we fetch the ID of the item.
                if (DBM::is_result($ret)) {
-                       $current_post = dba::lastInsertId();
+                       $current_post = DBA::lastInsertId();
                } else {
                        // This can happen - for example - if there are locking timeouts.
-                       dba::rollback();
+                       DBA::rollback();
 
                        // Store the data into a spool file so that we can try again later.
 
@@ -1398,6 +1687,10 @@ class Item extends BaseObject
                        $spoolpath = get_spoolpath();
                        if ($spoolpath != "") {
                                $spool = $spoolpath.'/'.$file;
+
+                               // Ensure to have the removed data from above again in the item array
+                               $item = array_merge($item, $delivery_data);
+
                                file_put_contents($spool, json_encode($item));
                                logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
                        }
@@ -1407,26 +1700,26 @@ class Item extends BaseObject
                if ($current_post == 0) {
                        // This is one of these error messages that never should occur.
                        logger("couldn't find created item - we better quit now.");
-                       dba::rollback();
+                       DBA::rollback();
                        return 0;
                }
 
                // How much entries have we created?
                // We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
-               $entries = dba::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
+               $entries = DBA::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
 
                if ($entries > 1) {
                        // There are duplicates. We delete our just created entry.
                        logger('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']);
 
                        // Yes, we could do a rollback here - but we are having many users with MyISAM.
-                       dba::delete('item', ['id' => $current_post]);
-                       dba::commit();
+                       DBA::delete('item', ['id' => $current_post]);
+                       DBA::commit();
                        return 0;
                } elseif ($entries == 0) {
                        // This really should never happen since we quit earlier if there were problems.
                        logger("Something is terribly wrong. We haven't found our created entry.");
-                       dba::rollback();
+                       DBA::rollback();
                        return 0;
                }
 
@@ -1438,7 +1731,7 @@ class Item extends BaseObject
                }
 
                // Set parent id
-               dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
+               DBA::update('item', ['parent' => $parent_id], ['id' => $current_post]);
 
                $item['id'] = $current_post;
                $item['parent'] = $parent_id;
@@ -1446,9 +1739,9 @@ class Item extends BaseObject
                // update the commented timestamp on the parent
                // Only update "commented" if it is really a comment
                if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) {
-                       dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+                       DBA::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
                } else {
-                       dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+                       DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
                }
 
                if ($dsprsig) {
@@ -1461,14 +1754,14 @@ class Item extends BaseObject
                                logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
                        }
 
-                       dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
+                       DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
                                                'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
                }
 
                if (!empty($diaspora_signed_text)) {
                        // Formerly we stored the signed text, the signature and the author in different fields.
                        // We now store the raw data so that we are more flexible.
-                       dba::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
+                       DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
                }
 
                $deleted = self::tagDeliver($item['uid'], $current_post);
@@ -1478,7 +1771,7 @@ class Item extends BaseObject
                 * in it.
                 */
                if (!$deleted && !$dontcache) {
-                       $posted_item = dba::selectFirst('item', [], ['id' => $current_post]);
+                       $posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]);
                        if (DBM::is_result($posted_item)) {
                                if ($notify) {
                                        Addon::callHooks('post_local_end', $posted_item);
@@ -1496,7 +1789,11 @@ class Item extends BaseObject
                        self::updateThread($parent_id);
                }
 
-               dba::commit();
+               $delivery_data['iid'] = $current_post;
+
+               self::insertDeliveryData($delivery_data);
+
+               DBA::commit();
 
                /*
                 * Due to deadlock issues with the "term" table we are doing these steps after the commit.
@@ -1506,8 +1803,8 @@ class Item extends BaseObject
                        Term::insertFromTagFieldByItemId($current_post, $tags);
                }
 
-               if (array_key_exists('file', $item)) {
-                       Term::insertFromFileFieldByItemId($current_post);
+               if (!empty($files)) {
+                       Term::insertFromFileFieldByItemId($current_post, $files);
                }
 
                if ($item['parent-uri'] === $item['uri']) {
@@ -1527,6 +1824,81 @@ class Item extends BaseObject
                return $current_post;
        }
 
+       /**
+        * @brief Insert a new item delivery data entry
+        *
+        * @param array $item The item fields that are to be inserted
+        */
+       private static function insertDeliveryData($delivery_data)
+       {
+               if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+                       return;
+               }
+
+               DBA::insert('item-delivery-data', $delivery_data);
+       }
+
+       /**
+        * @brief Update an existing item delivery data entry
+        *
+        * @param integer $id The item id that is to be updated
+        * @param array $item The item fields that are to be inserted
+        */
+       private static function updateDeliveryData($id, $delivery_data)
+       {
+               if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+                       return;
+               }
+
+               DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
+       }
+
+       /**
+        * @brief Insert a new item content entry
+        *
+        * @param array $item The item fields that are to be inserted
+        */
+       private static function insertActivity(&$item)
+       {
+               $activity_index = self::activityToIndex($item['verb']);
+
+               if ($activity_index < 0) {
+                       return false;
+               }
+
+               $fields = ['uri' => $item['uri'], 'activity' => $activity_index,
+                       'uri-hash' => $item['uri-hash']];
+
+               // We just remove everything that is content
+               foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+                       unset($item[$field]);
+               }
+
+               // To avoid timing problems, we are using locks.
+               $locked = Lock::acquire('item_insert_activity');
+               if (!$locked) {
+                       logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
+               }
+
+               // Do we already have this content?
+               $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+               if (DBM::is_result($item_activity)) {
+                       $item['iaid'] = $item_activity['id'];
+                       logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+               } elseif (DBA::insert('item-activity', $fields)) {
+                       $item['iaid'] = DBA::lastInsertId();
+                       logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+               } else {
+                       // This shouldn't happen.
+                       logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
+                       return false;
+               }
+               if ($locked) {
+                       Lock::release('item_insert_activity');
+               }
+               return true;
+       }
+
        /**
         * @brief Insert a new item content entry
         *
@@ -1534,8 +1906,7 @@ class Item extends BaseObject
         */
        private static function insertContent(&$item)
        {
-               $fields = ['uri' => $item['uri'], 'plink' => $item['plink'],
-                       'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])];
+               $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash']];
 
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
                        if (isset($item[$field])) {
@@ -1545,44 +1916,52 @@ class Item extends BaseObject
                }
 
                // To avoid timing problems, we are using locks.
-               $locked = Lock::set('item_insert_content');
+               $locked = Lock::acquire('item_insert_content');
                if (!$locked) {
                        logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
                }
 
                // Do we already have this content?
-               $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $item['uri']]);
+               $item_content = DBA::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
                if (DBM::is_result($item_content)) {
                        $item['icid'] = $item_content['id'];
                        logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
-               } elseif (dba::insert('item-content', $fields)) {
-                       $item['icid'] = dba::lastInsertId();
+               } elseif (DBA::insert('item-content', $fields)) {
+                       $item['icid'] = DBA::lastInsertId();
                        logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
                } else {
-                       // By setting the ICID value through the worker we should avoid timing problems.
-                       // When the locking works, this shouldn't be needed. But better be prepared.
-                       Worker::add(PRIORITY_HIGH, 'SetItemContentID', $item['uri']);
-                       logger('Could not insert content for URI ' . $item['uri'] . ' - trying asynchronously');
+                       // This shouldn't happen.
+                       logger('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
                }
                if ($locked) {
-                       Lock::remove('item_insert_content');
+                       Lock::release('item_insert_content');
                }
        }
 
        /**
-        * @brief Set the item content id for a given URI
+        * @brief Update existing item content entries
         *
-        * @param string $uri The item URI
+        * @param array $item The item fields that are to be changed
+        * @param array $condition The condition for finding the item content entries
         */
-       public static function setICIDforURI($uri)
+       private static function updateActivity($item, $condition)
        {
-               $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $uri]);
-               if (DBM::is_result($item_content)) {
-                       dba::update('item', ['icid' => $item_content['id']], ['icid' => 0, 'uri' => $uri]);
-                       logger('Asynchronously set item content id for URI ' . $uri . ' (' . $item_content['id'] . ') - Affected: '. (int)dba::affected_rows());
-               } else {
-                       logger('No item-content found for URI ' . $uri);
+               if (empty($item['verb'])) {
+                       return false;
+               }
+               $activity_index = self::activityToIndex($item['verb']);
+
+               if ($activity_index < 0) {
+                       return false;
                }
+
+               $fields = ['activity' => $activity_index];
+
+               logger('Update activity for ' . json_encode($condition));
+
+               DBA::update('item-activity', $fields, $condition, true);
+
+               return true;
        }
 
        /**
@@ -1602,19 +1981,14 @@ class Item extends BaseObject
                }
 
                if (empty($fields)) {
-                       return;
+                       // when there are no fields at all, just use the condition
+                       // This is to ensure that we always store content.
+                       $fields = $condition;
                }
 
-               if (!empty($item['plink'])) {
-                       $fields['uri-plink-hash'] = hash('sha1', $item['plink']) . hash('sha1', $condition['uri']);
-               } else {
-                       // Ensure that we don't delete the plink
-                       unset($fields['plink']);
-               }
+               logger('Update content for ' . json_encode($condition));
 
-               logger('Update content for URI ' . $condition['uri']);
-
-               dba::update('item-content', $fields, $condition, true);
+               DBA::update('item-content', $fields, $condition, true);
        }
 
        /**
@@ -1626,7 +2000,7 @@ class Item extends BaseObject
        public static function distribute($itemid, $signed_text = '')
        {
                $condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid];
-               $parent = dba::selectFirst('item', ['owner-id'], $condition);
+               $parent = self::selectFirst(['owner-id'], $condition);
                if (!DBM::is_result($parent)) {
                        return;
                }
@@ -1640,6 +2014,8 @@ class Item extends BaseObject
                        return;
                }
 
+               $origin = $item['origin'];
+
                unset($item['id']);
                unset($item['parent']);
                unset($item['mention']);
@@ -1651,18 +2027,18 @@ class Item extends BaseObject
 
                $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
                        $parent['owner-id'], CONTACT_IS_SHARING,  CONTACT_IS_FRIEND];
-               $contacts = dba::select('contact', ['uid'], $condition);
-               while ($contact = dba::fetch($contacts)) {
+               $contacts = DBA::select('contact', ['uid'], $condition);
+               while ($contact = DBA::fetch($contacts)) {
                        $users[$contact['uid']] = $contact['uid'];
                }
 
                $origin_uid = 0;
 
                if ($item['uri'] != $item['parent-uri']) {
-                       $parents = dba::select('item', ['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
-                       while ($parent = dba::fetch($parents)) {
+                       $parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
+                       while ($parent = DBA::fetch($parents)) {
                                $users[$parent['uid']] = $parent['uid'];
-                               if ($parent['origin'] && !$item['origin']) {
+                               if ($parent['origin'] && !$origin) {
                                        $origin_uid = $parent['uid'];
                                }
                        }
@@ -1695,24 +2071,18 @@ class Item extends BaseObject
                }
 
                if (empty($item['contact-id'])) {
-                       $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
+                       $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
                        if (!DBM::is_result($self)) {
                                return;
                        }
                        $item['contact-id'] = $self['id'];
                }
 
-               if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-                       $item['type'] = 'remote-comment';
-               } elseif ($item['type'] == 'wall') {
-                       $item['type'] = 'remote';
-               }
-
                /// @todo Handling of "event-id"
 
                $notify = false;
                if ($item['uri'] == $item['parent-uri']) {
-                       $contact = dba::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
+                       $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
                        if (DBM::is_result($contact)) {
                                $notify = self::isRemoteSelf($contact, $item);
                        }
@@ -1738,9 +2108,9 @@ class Item extends BaseObject
         */
        public static function addShadow($itemid)
        {
-               $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network'];
+               $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri'];
                $condition = ['id' => $itemid, 'parent' => [0, $itemid]];
-               $item = dba::selectFirst('item', $fields, $condition);
+               $item = self::selectFirst($fields, $condition);
 
                if (!DBM::is_result($item)) {
                        return;
@@ -1761,36 +2131,32 @@ class Item extends BaseObject
                        return;
                }
 
-               $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
+               if (self::exists(['uri' => $item['uri'], 'uid' => 0])) {
+                       return;
+               }
 
-               if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') &&
-                       ($item["deny_cid"] == '') && ($item["deny_gid"] == '')) {
-
-                       if (!self::exists(['uri' => $item['uri'], 'uid' => 0])) {
-                               // Preparing public shadow (removing user specific data)
-                               $item['uid'] = 0;
-                               unset($item['id']);
-                               unset($item['parent']);
-                               unset($item['wall']);
-                               unset($item['mention']);
-                               unset($item['origin']);
-                               unset($item['starred']);
-                               if ($item['uri'] == $item['parent-uri']) {
-                                       $item['contact-id'] = $item['owner-id'];
-                               } else {
-                                       $item['contact-id'] = $item['author-id'];
-                               }
+               $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
 
-                               if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-                                       $item['type'] = 'remote-comment';
-                               } elseif ($item['type'] == 'wall') {
-                                       $item['type'] = 'remote';
-                               }
+               if (DBM::is_result($item)) {
+                       // Preparing public shadow (removing user specific data)
+                       $item['uid'] = 0;
+                       unset($item['id']);
+                       unset($item['parent']);
+                       unset($item['wall']);
+                       unset($item['mention']);
+                       unset($item['origin']);
+                       unset($item['starred']);
+                       unset($item['postopts']);
+                       unset($item['inform']);
+                       if ($item['uri'] == $item['parent-uri']) {
+                               $item['contact-id'] = $item['owner-id'];
+                       } else {
+                               $item['contact-id'] = $item['author-id'];
+                       }
 
-                               $public_shadow = self::insert($item, false, false, true);
+                       $public_shadow = self::insert($item, false, false, true);
 
-                               logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
-                       }
+                       logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
                }
        }
 
@@ -1841,14 +2207,10 @@ class Item extends BaseObject
                unset($item['mention']);
                unset($item['origin']);
                unset($item['starred']);
+               unset($item['postopts']);
+               unset($item['inform']);
                $item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
-               if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-                       $item['type'] = 'remote-comment';
-               } elseif ($item['type'] == 'wall') {
-                       $item['type'] = 'remote';
-               }
-
                $public_shadow = self::insert($item, false, false, true);
 
                logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
@@ -1866,7 +2228,7 @@ class Item extends BaseObject
         */
        private static function addLanguageToItemArray(&$item)
        {
-               $naked_body = Text\BBCode::toPlaintext($item['body'], false);
+               $naked_body = BBCode::toPlaintext($item['body'], false);
 
                $ld = new Text_LanguageDetect();
                $ld->setNameMode(2);
@@ -1916,12 +2278,12 @@ class Item extends BaseObject
        public static function newURI($uid, $guid = "")
        {
                if ($guid == "") {
-                       $guid = get_guid(32);
+                       $guid = System::createGUID(32);
                }
 
                $hostname = self::getApp()->get_hostname();
 
-               $user = dba::selectFirst('user', ['nickname'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
 
                $uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
 
@@ -1940,37 +2302,37 @@ class Item extends BaseObject
        private static function updateContact($arr)
        {
                // Unarchive the author
-               $contact = dba::selectFirst('contact', [], ['id' => $arr["author-id"]]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]);
                if (DBM::is_result($contact)) {
                        Contact::unmarkForArchival($contact);
                }
 
                // Unarchive the contact if it's not our own contact
-               $contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
                if (DBM::is_result($contact)) {
                        Contact::unmarkForArchival($contact);
                }
 
-               $update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
+               $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
 
                // Is it a forum? Then we don't care about the rules from above
                if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
-                       if (dba::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
+                       if (DBA::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
                                $update = true;
                        }
                }
 
                if ($update) {
-                       dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+                       DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
                                ['id' => $arr['contact-id']]);
                }
                // Now do the same for the system wide contacts with uid=0
                if (!$arr['private']) {
-                       dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+                       DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
                                ['id' => $arr['owner-id']]);
 
                        if ($arr['owner-id'] != $arr['author-id']) {
-                               dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+                               DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
                                        ['id' => $arr['author-id']]);
                        }
                }
@@ -2046,7 +2408,7 @@ class Item extends BaseObject
 
        public static function getGuidById($id)
        {
-               $item = dba::selectFirst('item', ['guid'], ['id' => $id]);
+               $item = self::selectFirst(['guid'], ['id' => $id]);
                if (DBM::is_result($item)) {
                        return $item['guid'];
                } else {
@@ -2065,7 +2427,7 @@ class Item extends BaseObject
 
                // Does the given user have this item?
                if ($uid) {
-                       $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
+                       $item = DBA::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
                                INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                        AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
@@ -2077,11 +2439,9 @@ class Item extends BaseObject
 
                // Or is it anywhere on the server?
                if ($nick == "") {
-                       $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
+                       $item = DBA::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
                                INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-                                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
                                        AND NOT `item`.`private` AND `item`.`wall`
                                        AND `item`.`guid` = ?", $guid);
                        if (DBM::is_result($item)) {
@@ -2102,7 +2462,7 @@ class Item extends BaseObject
        {
                $mention = false;
 
-               $user = dba::selectFirst('user', [], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', [], ['uid' => $uid]);
                if (!DBM::is_result($user)) {
                        return;
                }
@@ -2110,7 +2470,7 @@ class Item extends BaseObject
                $community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false);
                $prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
-               $item = dba::selectFirst('item', [], ['id' => $item_id]);
+               $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
                if (!DBM::is_result($item)) {
                        return;
                }
@@ -2139,7 +2499,7 @@ class Item extends BaseObject
                                // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
                                // delete it!
                                logger("no-mention top-level post to community or private group. delete.");
-                               dba::delete('item', ['id' => $item_id]);
+                               DBA::delete('item', ['id' => $item_id]);
                                return true;
                        }
                        return;
@@ -2163,7 +2523,7 @@ class Item extends BaseObject
                }
 
                // now change this copy of the post to a forum head message and deliver to all the tgroup members
-               $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
+               $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
                if (!DBM::is_result($self)) {
                        return;
                }
@@ -2179,7 +2539,7 @@ class Item extends BaseObject
                $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
                        'owner-id' => $owner_id, 'owner-link' => $self['url'], 'private' => $private, 'allow_cid' => $user['allow_cid'],
                        'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']];
-               dba::update('item', $fields, ['id' => $item_id]);
+               DBA::update('item', $fields, ['id' => $item_id]);
 
                self::updateThread($item_id);
 
@@ -2195,7 +2555,7 @@ class Item extends BaseObject
                }
 
                // Prevent the forwarding of posts that are forwarded
-               if ($datarray["extid"] == NETWORK_DFRN) {
+               if (!empty($datarray["extid"]) && ($datarray["extid"] == NETWORK_DFRN)) {
                        logger('Already forwarded', LOGGER_DEBUG);
                        return false;
                }
@@ -2220,7 +2580,7 @@ class Item extends BaseObject
                $datarray2 = $datarray;
                logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
                if ($contact['remote_self'] == 2) {
-                       $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
+                       $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
                                        ['uid' => $contact['uid'], 'self' => true]);
                        if (DBM::is_result($self)) {
                                $datarray['contact-id'] = $self["id"];
@@ -2242,7 +2602,7 @@ class Item extends BaseObject
                        }
 
                        if ($contact['network'] != NETWORK_FEED) {
-                               $datarray["guid"] = get_guid(32);
+                               $datarray["guid"] = System::createGUID(32);
                                unset($datarray["plink"]);
                                $datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
                                $datarray["parent-uri"] = $datarray["uri"];
@@ -2315,7 +2675,7 @@ class Item extends BaseObject
                                        $res = substr($i, $x + 1);
                                        $i = substr($i, 0, $x);
                                        $fields = ['data', 'type', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
-                                       $photo = dba::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
+                                       $photo = DBA::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
                                        if (DBM::is_result($photo)) {
                                                /*
                                                 * Check to see if we should replace this photo link with an embedded image
@@ -2383,17 +2743,8 @@ class Item extends BaseObject
 
        private static function hasPermissions($obj)
        {
-               return (
-                       (
-                               x($obj, 'allow_cid')
-                       ) || (
-                               x($obj, 'allow_gid')
-                       ) || (
-                               x($obj, 'deny_cid')
-                       ) || (
-                               x($obj, 'deny_gid')
-                       )
-               );
+               return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) ||
+                       !empty($obj['deny_cid']) || !empty($obj['deny_gid']);
        }
 
        private static function samePermissions($obj1, $obj2)
@@ -2459,81 +2810,86 @@ class Item extends BaseObject
                        return;
                }
 
+               $condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?",
+                       $uid, GRAVITY_PARENT];
+
                /*
                 * $expire_network_only = save your own wall posts
                 * and just expire conversations started by others
                 */
-               $expire_network_only = PConfig::get($uid,'expire', 'network_only');
-               $sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : "");
+               $expire_network_only = PConfig::get($uid, 'expire', 'network_only', false);
+
+               if ($expire_network_only) {
+                       $condition[0] .= " AND NOT `wall`";
+               }
 
                if ($network != "") {
-                       $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
+                       $condition[0] .= " AND `network` = ?";
+                       $condition[] = $network;
 
                        /*
                         * There is an index "uid_network_received" but not "uid_network_created"
                         * This avoids the creation of another index just for one purpose.
                         * And it doesn't really matter wether to look at "received" or "created"
                         */
-                       $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+                       $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+                       $condition[] = $days;
                } else {
-                       $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+                       $condition[0] .= " AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+                       $condition[] = $days;
                }
 
-               $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
-                       WHERE `uid` = %d $range
-                       AND `id` = `parent`
-                       $sql_extra
-                       AND `deleted` = 0",
-                       intval($uid),
-                       intval($days)
-               );
+               $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
 
-               if (!DBM::is_result($r)) {
+               if (!DBM::is_result($items)) {
                        return;
                }
 
-               $expire_items = PConfig::get($uid, 'expire', 'items', 1);
+               $expire_items = PConfig::get($uid, 'expire', 'items', true);
 
                // Forcing expiring of items - but not notes and marked items
                if ($force) {
                        $expire_items = true;
                }
 
-               $expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
-               $expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
-               $expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
+               $expire_notes = PConfig::get($uid, 'expire', 'notes', true);
+               $expire_starred = PConfig::get($uid, 'expire', 'starred', true);
+               $expire_photos = PConfig::get($uid, 'expire', 'photos', false);
 
-               logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
-
-               foreach ($r as $item) {
+               $expired = 0;
 
+               while ($item = Item::fetch($items)) {
                        // don't expire filed items
 
-                       if (strpos($item['file'],'[') !== false) {
+                       if (strpos($item['file'], '[') !== false) {
                                continue;
                        }
 
                        // Only expire posts, not photos and photo comments
 
-                       if ($expire_photos == 0 && strlen($item['resource-id'])) {
+                       if (!$expire_photos && strlen($item['resource-id'])) {
                                continue;
-                       } elseif ($expire_starred == 0 && intval($item['starred'])) {
+                       } elseif (!$expire_starred && intval($item['starred'])) {
                                continue;
-                       } elseif ($expire_notes == 0 && $item['type'] == 'note') {
+                       } elseif (!$expire_notes && $item['type'] == 'note') {
                                continue;
-                       } elseif ($expire_items == 0 && $item['type'] != 'note') {
+                       } elseif (!$expire_items && $item['type'] != 'note') {
                                continue;
                        }
 
                        self::deleteById($item['id'], PRIORITY_LOW);
+
+                       ++$expired;
                }
+               DBA::close($items);
+               logger('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
        }
 
        public static function firstPostDate($uid, $wall = false)
        {
                $condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
                $params = ['order' => ['created' => false]];
-               $thread = dba::selectFirst('thread', ['created'], $condition, $params);
+               $thread = DBA::selectFirst('thread', ['created'], $condition, $params);
                if (DBM::is_result($thread)) {
                        return substr(DateTimeFormat::local($thread['created']), 0, 10);
                }
@@ -2563,27 +2919,22 @@ class Item extends BaseObject
                switch ($verb) {
                        case 'like':
                        case 'unlike':
-                               $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
                                $activity = ACTIVITY_LIKE;
                                break;
                        case 'dislike':
                        case 'undislike':
-                               $bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
                                $activity = ACTIVITY_DISLIKE;
                                break;
                        case 'attendyes':
                        case 'unattendyes':
-                               $bodyverb = L10n::t('%1$s is attending %2$s\'s %3$s');
                                $activity = ACTIVITY_ATTEND;
                                break;
                        case 'attendno':
                        case 'unattendno':
-                               $bodyverb = L10n::t('%1$s is not attending %2$s\'s %3$s');
                                $activity = ACTIVITY_ATTENDNO;
                                break;
                        case 'attendmaybe':
                        case 'unattendmaybe':
-                               $bodyverb = L10n::t('%1$s may attend %2$s\'s %3$s');
                                $activity = ACTIVITY_ATTENDMAYBE;
                                break;
                        default:
@@ -2596,12 +2947,14 @@ class Item extends BaseObject
 
                logger('like: verb ' . $verb . ' item ' . $item_id);
 
-               $item = dba::selectFirst('item', [], ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
+               $item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
                if (!DBM::is_result($item)) {
                        logger('like: unknown item ' . $item_id);
                        return false;
                }
 
+               $item_uri = $item['uri'];
+
                $uid = $item['uid'];
                if (($uid == 0) && local_user()) {
                        $uid = local_user();
@@ -2613,7 +2966,7 @@ class Item extends BaseObject
                }
 
                // Retrieves the local post owner
-               $owner_self_contact = dba::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
+               $owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
                if (!DBM::is_result($owner_self_contact)) {
                        logger('like: unknown owner ' . $uid);
                        return false;
@@ -2622,7 +2975,7 @@ class Item extends BaseObject
                // Retrieve the current logged in user's public contact
                $author_id = public_contact();
 
-               $author_contact = dba::selectFirst('contact', [], ['id' => $author_id]);
+               $author_contact = DBA::selectFirst('contact', ['url'], ['id' => $author_id]);
                if (!DBM::is_result($author_contact)) {
                        logger('like: unknown author ' . $author_id);
                        return false;
@@ -2634,7 +2987,7 @@ class Item extends BaseObject
                        $item_contact = $owner_self_contact;
                } else {
                        $item_contact_id = Contact::getIdForURL($author_contact['url'], $uid, true);
-                       $item_contact = dba::selectFirst('contact', [], ['id' => $item_contact_id]);
+                       $item_contact = DBA::selectFirst('contact', [], ['id' => $item_contact_id]);
                        if (!DBM::is_result($item_contact)) {
                                logger('like: unknown item contact ' . $item_contact_id);
                                return false;
@@ -2646,40 +2999,32 @@ class Item extends BaseObject
                // we need to eradicate your first choice.
                if ($event_verb_flag) {
                        $verbs = [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+                       // Translate to the index based activity index
+                       $activities = [];
+                       foreach ($verbs as $verb) {
+                               $activities[] = self::activityToIndex($verb);
+                       }
                } else {
-                       $verbs = $activity;
+                       $activities = self::activityToIndex($activity);
                }
 
-               $base_condition = ['verb' => $verbs, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
-                       'author-id' => $author_contact['id'], 'uid' => item['uid']];
+               $condition = ['activity' => $activities, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
+                       'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent' => $item_uri];
 
-               $condition = array_merge($base_condition, ['parent' => $item_id]);
                $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
 
-               if (!DBM::is_result($like_item)) {
-                       $condition = array_merge($base_condition, ['parent-uri' => $item_id]);
-                       $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
-               }
-
-               if (!DBM::is_result($like_item)) {
-                       $condition = array_merge($base_condition, ['thr-parent' => $item_id]);
-                       $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
-               }
-
                // If it exists, mark it as deleted
                if (DBM::is_result($like_item)) {
                        // Already voted, undo it
                        $fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()];
                        /// @todo Consider using self::update - but before doing so, check the side effects
-                       dba::update('item', $fields, ['id' => $like_item['id']]);
+                       DBA::update('item', $fields, ['id' => $like_item['id']]);
 
                        // Clean up the Diaspora signatures for this like
-                       // Go ahead and do it even if Diaspora support is disabled. We still want to clean up
-                       // if it had been enabled in the past
-                       dba::delete('sign', ['iid' => $like_item['id']]);
+                       DBA::delete('sign', ['iid' => $like_item['id']]);
 
-                       $like_item_id = $like_item['id'];
-                       Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item_id);
+                       Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item['id']);
 
                        if (!$event_verb_flag || $like_item['verb'] == $activity) {
                                return true;
@@ -2691,55 +3036,25 @@ class Item extends BaseObject
                        return true;
                }
 
-               // Else or if event verb different from existing row, create a new item row
-               $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
-               if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
-                       $post_type = L10n::t('event');
-               }
                $objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
-               $link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
-               $body = $item['body'];
-
-               $obj = <<< EOT
-
-               <object>
-                       <type>$objtype</type>
-                       <local>1</local>
-                       <id>{$item['uri']}</id>
-                       <link>$link</link>
-                       <title></title>
-                       <content>$body</content>
-               </object>
-EOT;
-
-               $ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
-               $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-               $plink = '[url=' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 
                $new_item = [
-                       'guid'          => get_guid(32),
+                       'guid'          => System::createGUID(32),
                        'uri'           => self::newURI($item['uid']),
                        'uid'           => $item['uid'],
                        'contact-id'    => $item_contact_id,
-                       'type'          => 'activity',
                        'wall'          => $item['wall'],
                        'origin'        => 1,
+                       'network'       => NETWORK_DFRN,
                        'gravity'       => GRAVITY_ACTIVITY,
                        'parent'        => $item['id'],
                        'parent-uri'    => $item['uri'],
                        'thr-parent'    => $item['uri'],
                        'owner-id'      => $item['owner-id'],
-                       'owner-name'    => $item['owner-name'],
-                       'owner-link'    => $item['owner-link'],
-                       'owner-avatar'  => $item['owner-avatar'],
-                       'author-id'     => $author_contact['id'],
-                       'author-name'   => $author_contact['name'],
-                       'author-link'   => $author_contact['url'],
-                       'author-avatar' => $author_contact['thumb'],
-                       'body'          => sprintf($bodyverb, $ulink, $alink, $plink),
+                       'author-id'     => $author_id,
+                       'body'          => $activity,
                        'verb'          => $activity,
                        'object-type'   => $objtype,
-                       'object'        => $obj,
                        'allow_cid'     => $item['allow_cid'],
                        'allow_gid'     => $item['allow_gid'],
                        'deny_cid'      => $item['deny_cid'],
@@ -2770,10 +3085,10 @@ EOT;
        private static function addThread($itemid, $onlyshadow = false)
        {
                $fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
-                       'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+                       'moderated', 'visible', 'starred', 'contact-id', 'post-type',
                        'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
                $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
-               $item = dba::selectFirst('item', $fields, $condition);
+               $item = self::selectFirst($fields, $condition);
 
                if (!DBM::is_result($item)) {
                        return;
@@ -2782,7 +3097,7 @@ EOT;
                $item['iid'] = $itemid;
 
                if (!$onlyshadow) {
-                       $result = dba::insert('thread', $item);
+                       $result = DBA::insert('thread', $item);
 
                        logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
                }
@@ -2790,12 +3105,12 @@ EOT;
 
        private static function updateThread($itemid, $setmention = false)
        {
-               $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed',
-                       'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+               $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
+                       'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id',
                        'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
                $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
 
-               $item = dba::selectFirst('item', $fields, $condition);
+               $item = self::selectFirst($fields, $condition);
                if (!DBM::is_result($item)) {
                        return;
                }
@@ -2814,28 +3129,28 @@ EOT;
                        }
                }
 
-               $result = dba::update('thread', $fields, ['iid' => $itemid]);
+               $result = DBA::update('thread', $fields, ['iid' => $itemid]);
 
                logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".(int)$result, LOGGER_DEBUG);
        }
 
        private static function deleteThread($itemid, $itemuri = "")
        {
-               $item = dba::selectFirst('thread', ['uid'], ['iid' => $itemid]);
+               $item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]);
                if (!DBM::is_result($item)) {
                        logger('No thread found for id '.$itemid, LOGGER_DEBUG);
                        return;
                }
 
                // Using dba::delete at this time could delete the associated item entries
-               $result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
+               $result = DBA::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
 
                logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
                if ($itemuri != "") {
                        $condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]];
                        if (!self::exists($condition)) {
-                               dba::delete('item', ['uri' => $itemuri, 'uid' => 0]);
+                               DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]);
                                logger("deleteThread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
                        }
                }