X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=8e0c51157834cb54d9b892ec37b2317f8c220527;hb=5f6d1b88b78fc5302bd8d97f16b567a7258c0a69;hp=a0cc74d591fc70f623636e3532784e04d0a49515;hpb=f9430175c6b35c4fc3d932d07f933d0570a16c65;p=friendica.git

diff --git a/database.sql b/database.sql
index a0cc74d591..8e0c511578 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1390
+-- DB_UPDATE_VERSION 1402
 -- ------------------------------------------
 
 
@@ -287,6 +287,20 @@ CREATE TABLE IF NOT EXISTS `2fa_recovery_codes` (
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication recovery codes';
 
+--
+-- TABLE 2fa_trusted_browser
+--
+CREATE TABLE IF NOT EXISTS `2fa_trusted_browser` (
+	`cookie_hash` varchar(80) NOT NULL COMMENT 'Trusted cookie hash',
+	`uid` mediumint unsigned NOT NULL COMMENT 'User ID',
+	`user_agent` text COMMENT 'User agent string',
+	`created` datetime NOT NULL COMMENT 'Datetime the trusted browser was recorded',
+	`last_used` datetime COMMENT 'Datetime the trusted browser was last used',
+	 PRIMARY KEY(`cookie_hash`),
+	 INDEX `uid` (`uid`),
+	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication trusted browsers';
+
 --
 -- TABLE addon
 --
@@ -670,7 +684,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this item',
 	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
-	`uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
 	`parent` int unsigned COMMENT 'item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item',
 	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT 'uri of the top-level parent to this item',
 	`parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the top-level parent uri',
@@ -686,28 +699,31 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
 	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
 	`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
-	`icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
 	`vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
 	`extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
 	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`private` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0=public, 1=private, 2=unlisted',
 	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been deleted',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item',
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
-	`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
+	`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen',
 	`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
-	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`psid` int unsigned COMMENT 'ID of the permission set of this post',
 	`starred` boolean NOT NULL DEFAULT '0' COMMENT 'item has been favourited',
-	`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen',
-	`mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`psid` int unsigned COMMENT 'ID of the permission set of this post',
-	`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
 	`event-id` int unsigned COMMENT 'Used to link to the event.id',
+	`mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it',
+	`bookmark` boolean COMMENT 'Deprecated',
+	`type` varchar(20) COMMENT 'Deprecated',
+	`moderated` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+	`resource-id` varchar(32) COMMENT 'Deprecated',
+	`uri-hash` varchar(80) COMMENT 'Deprecated',
 	`iaid` int unsigned COMMENT 'Deprecated',
+	`icid` int unsigned COMMENT 'Deprecated',
 	`attach` mediumtext COMMENT 'Deprecated',
 	`allow_cid` mediumtext COMMENT 'Deprecated',
 	`allow_gid` mediumtext COMMENT 'Deprecated',
@@ -715,8 +731,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`deny_gid` mediumtext COMMENT 'Deprecated',
 	`postopts` text COMMENT 'Deprecated',
 	`inform` mediumtext COMMENT 'Deprecated',
-	`type` varchar(20) COMMENT 'Deprecated',
-	`bookmark` boolean COMMENT 'Deprecated',
 	`file` mediumtext COMMENT 'Deprecated',
 	`location` varchar(255) COMMENT 'Deprecated',
 	`coord` varchar(255) COMMENT 'Deprecated',
@@ -765,8 +779,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	 INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`),
 	 INDEX `mention_uid_id` (`mention`,`uid`,`id`),
 	 INDEX `uid_eventid` (`uid`,`event-id`),
-	 INDEX `icid` (`icid`),
-	 INDEX `iaid` (`iaid`),
 	 INDEX `vid` (`vid`),
 	 INDEX `psid_wall` (`psid`,`wall`),
 	 INDEX `uri-id` (`uri-id`),
@@ -785,55 +797,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	FOREIGN KEY (`psid`) REFERENCES `permissionset` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
 
---
--- TABLE item-activity
---
-CREATE TABLE IF NOT EXISTS `item-activity` (
-	`id` int unsigned NOT NULL auto_increment,
-	`uri` varchar(255) COMMENT '',
-	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
-	`uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
-	`activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `uri-hash` (`uri-hash`),
-	 INDEX `uri` (`uri`(191)),
-	 INDEX `uri-id` (`uri-id`),
-	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activities for items';
-
---
--- TABLE item-content
---
-CREATE TABLE IF NOT EXISTS `item-content` (
-	`id` int unsigned NOT NULL auto_increment,
-	`uri` varchar(255) COMMENT '',
-	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
-	`uri-plink-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
-	`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
-	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`body` mediumtext COMMENT 'item body content',
-	`raw-body` mediumtext COMMENT 'Body without embedded media links',
-	`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
-	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
-	`language` text COMMENT 'Language information about this post',
-	`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
-	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
-	`rendered-html` mediumtext COMMENT 'item.body converted to html',
-	`object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type',
-	`object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)',
-	`target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)',
-	`target` text COMMENT 'JSON encoded target structure if used',
-	`plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
-	`verb` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams verb',
-	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `uri-plink-hash` (`uri-plink-hash`),
-	 FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`),
-	 INDEX `uri` (`uri`(191)),
-	 INDEX `plink` (`plink`(191)),
-	 INDEX `uri-id` (`uri-id`),
-	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
-
 --
 -- TABLE locks
 --
@@ -926,7 +889,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`msg` mediumtext COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
 	`link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`iid` int unsigned COMMENT 'item.id',
+	`iid` int unsigned COMMENT '',
 	`parent` int unsigned COMMENT '',
 	`uri-id` int unsigned COMMENT 'Item-uri id of the related post',
 	`parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
@@ -952,17 +915,15 @@ CREATE TABLE IF NOT EXISTS `notify` (
 CREATE TABLE IF NOT EXISTS `notify-threads` (
 	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`notify-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`master-parent-item` int unsigned COMMENT '',
+	`master-parent-item` int unsigned COMMENT 'Deprecated',
 	`master-parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
 	`parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`receiver-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`),
-	 INDEX `master-parent-item` (`master-parent-item`),
 	 INDEX `master-parent-uri-id` (`master-parent-uri-id`),
 	 INDEX `receiver-uid` (`receiver-uid`),
 	 INDEX `notify-id` (`notify-id`),
 	FOREIGN KEY (`notify-id`) REFERENCES `notify` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`master-parent-item`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`master-parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`receiver-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
@@ -1007,22 +968,6 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
 	 INDEX `created` (`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='cache for \'parse_url\' queries';
 
---
--- TABLE participation
---
-CREATE TABLE IF NOT EXISTS `participation` (
-	`iid` int unsigned NOT NULL COMMENT '',
-	`server` varchar(60) NOT NULL COMMENT '',
-	`cid` int unsigned NOT NULL COMMENT '',
-	`fid` int unsigned NOT NULL COMMENT '',
-	 PRIMARY KEY(`iid`,`server`),
-	 INDEX `cid` (`cid`),
-	 INDEX `fid` (`fid`),
-	FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`fid`) REFERENCES `fcontact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Storage for participation messages from Diaspora';
-
 --
 -- TABLE pconfig
 --
@@ -1079,6 +1024,47 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='photo storage';
 
+--
+-- TABLE post
+--
+CREATE TABLE IF NOT EXISTS `post` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the parent uri',
+	`thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent uri',
+	`external-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the external uri',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation timestamp.',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last edit (default is created)',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime',
+	`gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network from where the item comes from',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
+	`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
+	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
+	`vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
+	`private` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0=public, 1=private, 2=unlisted',
+	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been marked for deletion',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `parent-uri-id` (`parent-uri-id`),
+	 INDEX `thr-parent-id` (`thr-parent-id`),
+	 INDEX `external-id` (`external-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `author-id` (`author-id`),
+	 INDEX `causer-id` (`causer-id`),
+	 INDEX `vid` (`vid`),
+	 INDEX `received` (`received`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`thr-parent-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`external-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`causer-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`vid`) REFERENCES `verb` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
+
 --
 -- TABLE post-category
 --
@@ -1095,6 +1081,33 @@ CREATE TABLE IF NOT EXISTS `post-category` (
 	FOREIGN KEY (`tid`) REFERENCES `tag` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to categories';
 
+--
+-- TABLE post-content
+--
+CREATE TABLE IF NOT EXISTS `post-content` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
+	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`body` mediumtext COMMENT 'item body content',
+	`raw-body` mediumtext COMMENT 'Body without embedded media links',
+	`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
+	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
+	`language` text COMMENT 'Language information about this post',
+	`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
+	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`rendered-html` mediumtext COMMENT 'item.body converted to html',
+	`object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type',
+	`object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)',
+	`target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)',
+	`target` text COMMENT 'JSON encoded target structure if used',
+	`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
+	`plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `plink` (`plink`(191)),
+	 FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
+
 --
 -- TABLE post-delivery-data
 --
@@ -1151,29 +1164,177 @@ CREATE TABLE IF NOT EXISTS `post-tag` (
 	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to tags';
 
+--
+-- TABLE post-thread
+--
+CREATE TABLE IF NOT EXISTS `post-thread` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author',
+	`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again',
+	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `author-id` (`author-id`),
+	 INDEX `causer-id` (`causer-id`),
+	 INDEX `received` (`received`),
+	 INDEX `commented` (`commented`),
+	 INDEX `changed` (`changed`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`causer-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Thread related data';
+
 --
 -- TABLE post-user
 --
 CREATE TABLE IF NOT EXISTS `post-user` (
+	`id` int unsigned NOT NULL auto_increment,
 	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the parent uri',
+	`thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent uri',
+	`external-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the external uri',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation timestamp.',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last edit (default is created)',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime',
+	`gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network from where the item comes from',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
+	`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
+	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
+	`vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
+	`private` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0=public, 1=private, 2=unlisted',
+	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been marked for deletion',
 	`uid` mediumint unsigned NOT NULL COMMENT 'Owner id which owns this copy of the item',
 	`protocol` tinyint unsigned COMMENT 'Protocol used to deliver the item for this user',
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
+	`event-id` int unsigned COMMENT 'Used to link to the event.id',
 	`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'post has not been seen',
 	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide the post from the user',
 	`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
 	`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
 	`psid` int unsigned COMMENT 'ID of the permission set of this post',
-	 PRIMARY KEY(`uid`,`uri-id`),
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `uid_uri-id` (`uid`,`uri-id`),
 	 INDEX `uri-id` (`uri-id`),
 	 INDEX `contact-id` (`contact-id`),
 	 INDEX `psid` (`psid`),
+	 INDEX `uid_hidden` (`uid`,`hidden`),
+	 INDEX `event-id` (`event-id`),
+	 INDEX `uid_wall` (`uid`,`wall`),
+	 INDEX `parent-uri-id_uid` (`parent-uri-id`,`uid`),
+	 INDEX `thr-parent-id` (`thr-parent-id`),
+	 INDEX `external-id` (`external-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `author-id_uid` (`author-id`,`uid`),
+	 INDEX `causer-id` (`causer-id`),
+	 INDEX `vid` (`vid`),
+	 INDEX `uid_received` (`uid`,`received`),
+	 INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
+	 INDEX `uid_network_received` (`uid`,`network`,`received`),
+	 INDEX `uid_contactid_received` (`uid`,`contact-id`,`received`),
+	 INDEX `authorid_received` (`author-id`,`received`),
+	 INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`),
+	 INDEX `uid_eventid` (`uid`,`event-id`),
+	 INDEX `psid_wall` (`psid`,`wall`),
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`thr-parent-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`external-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`causer-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`vid`) REFERENCES `verb` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`event-id`) REFERENCES `event` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`psid`) REFERENCES `permissionset` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific post data';
 
+--
+-- TABLE post-thread-user
+--
+CREATE TABLE IF NOT EXISTS `post-thread-user` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author',
+	`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again',
+	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item',
+	`pinned` boolean NOT NULL DEFAULT '0' COMMENT 'The thread is pinned on the profile page',
+	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`ignored` boolean NOT NULL DEFAULT '0' COMMENT 'Ignore updates for this thread',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
+	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
+	`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'post has not been seen',
+	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide the post from the user',
+	`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
+	`psid` int unsigned COMMENT 'ID of the permission set of this post',
+	`post-user-id` int unsigned COMMENT 'Id of the post-user table',
+	 PRIMARY KEY(`uid`,`uri-id`),
+	 INDEX `uid_wall` (`uid`,`wall`),
+	 INDEX `uid_pinned` (`uid`,`pinned`),
+	 INDEX `uri-id` (`uri-id`),
+	 INDEX `contact-id` (`contact-id`),
+	 INDEX `psid` (`psid`),
+	 INDEX `post-user-id` (`post-user-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `causer-id` (`causer-id`),
+	 INDEX `uid_received` (`uid`,`received`),
+	 INDEX `uid_commented` (`uid`,`commented`),
+	 INDEX `uid_changed` (`uid`,`changed`),
+	 INDEX `uid_contact-id` (`uid`,`contact-id`,`received`),
+	 INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
+	 INDEX `uid_network_received` (`uid`,`network`,`received`),
+	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
+	 INDEX `uid_contact-id_received` (`uid`,`contact-id`,`received`),
+	 INDEX `author-id_received` (`author-id`,`received`),
+	 INDEX `uid_wall_changed` (`uid`,`wall`,`changed`),
+	 INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`),
+	 INDEX `mention_uid` (`mention`,`uid`),
+	 INDEX `psid_wall` (`psid`,`wall`),
+	 INDEX `received` (`received`),
+	 INDEX `commented` (`commented`),
+	 INDEX `changed` (`changed`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`causer-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`psid`) REFERENCES `permissionset` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`post-user-id`) REFERENCES `post-user` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Thread related data per user';
+
+--
+-- TABLE post-user-notification
+--
+CREATE TABLE IF NOT EXISTS `post-user-notification` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`uid` mediumint unsigned NOT NULL COMMENT 'Owner id which owns this copy of the item',
+	`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	 PRIMARY KEY(`uid`,`uri-id`),
+	 INDEX `uri-id` (`uri-id`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User post notifications';
+
 --
 -- TABLE process
 --
@@ -1344,57 +1505,6 @@ CREATE TABLE IF NOT EXISTS `storage` (
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Data stored by Database storage backend';
 
---
--- TABLE thread
---
-CREATE TABLE IF NOT EXISTS `thread` (
-	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'sequential ID',
-	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
-	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`wall` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`private` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0=public, 1=private, 2=unlisted',
-	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`ignored` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
-	`unseen` boolean NOT NULL DEFAULT '1' COMMENT '',
-	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`origin` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
-	`bookmark` boolean COMMENT '',
-	 PRIMARY KEY(`iid`),
-	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
-	 INDEX `uid_network_received` (`uid`,`network`,`received`),
-	 INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
-	 INDEX `uid_contactid_received` (`uid`,`contact-id`,`received`),
-	 INDEX `contactid` (`contact-id`),
-	 INDEX `ownerid` (`owner-id`),
-	 INDEX `authorid` (`author-id`),
-	 INDEX `uid_received` (`uid`,`received`),
-	 INDEX `uid_commented` (`uid`,`commented`),
-	 INDEX `uid_wall_received` (`uid`,`wall`,`received`),
-	 INDEX `private_wall_origin_commented` (`private`,`wall`,`origin`,`commented`),
-	 INDEX `uri-id` (`uri-id`),
-	FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
-	FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Thread related data';
-
 --
 -- TABLE tokens
 --
@@ -1437,23 +1547,6 @@ CREATE TABLE IF NOT EXISTS `user-contact` (
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific public contact data';
 
---
--- TABLE user-item
---
-CREATE TABLE IF NOT EXISTS `user-item` (
-	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item id',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide an item from the user',
-	`ignored` boolean COMMENT 'Ignore this thread if set',
-	`pinned` boolean COMMENT 'The item is pinned on the profile page',
-	`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	 PRIMARY KEY(`uid`,`iid`),
-	 INDEX `uid_pinned` (`uid`,`pinned`),
-	 INDEX `iid_uid` (`iid`,`uid`),
-	FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
-
 --
 -- TABLE worker-ipc
 --
@@ -1493,66 +1586,60 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 --
 DROP VIEW IF EXISTS `post-view`;
 CREATE VIEW `post-view` AS SELECT 
-	`item`.`id` AS `id`,
-	`item`.`id` AS `item_id`,
-	`item`.`uid` AS `uid`,
-	`item`.`uid` AS `internal-uid`,
-	`item`.`parent` AS `parent`,
-	`item`.`uri` AS `uri`,
-	`item`.`uri-id` AS `uri-id`,
-	`item`.`uri-id` AS `internal-uri-id`,
-	`item`.`parent-uri` AS `parent-uri`,
-	`item`.`parent-uri-id` AS `parent-uri-id`,
-	`item`.`thr-parent` AS `thr-parent`,
-	`item`.`thr-parent-id` AS `thr-parent-id`,
-	`item`.`guid` AS `guid`,
-	`item`.`type` AS `type`,
-	`item`.`wall` AS `wall`,
-	`item`.`gravity` AS `gravity`,
-	`item`.`extid` AS `extid`,
-	`item`.`created` AS `created`,
-	`item`.`edited` AS `edited`,
-	`item`.`commented` AS `commented`,
-	`item`.`received` AS `received`,
-	`item`.`changed` AS `changed`,
-	`item`.`resource-id` AS `resource-id`,
-	`item`.`post-type` AS `post-type`,
-	`item`.`private` AS `private`,
-	`item`.`pubmail` AS `pubmail`,
-	`item`.`moderated` AS `moderated`,
-	`item`.`visible` AS `visible`,
-	`item`.`starred` AS `starred`,
-	`item`.`bookmark` AS `bookmark`,
-	`item`.`unseen` AS `unseen`,
-	`item`.`deleted` AS `deleted`,
-	`item`.`origin` AS `origin`,
-	`item`.`forum_mode` AS `forum_mode`,
-	`item`.`mention` AS `mention`,
-	`item`.`global` AS `global`,
-	`item`.`network` AS `network`,
-	`item`.`icid` AS `icid`,
-	`item`.`vid` AS `vid`,
-	`item`.`psid` AS `psid`,
-	`item`.`attach` AS `attach`,
-	(SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
-	NULL AS `file`,
-	IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
-	`item-content`.`title` AS `title`,
-	`item-content`.`content-warning` AS `content-warning`,
-	`item-content`.`raw-body` AS `raw-body`,
-	`item-content`.`body` AS `body`,
-	`item-content`.`rendered-hash` AS `rendered-hash`,
-	`item-content`.`rendered-html` AS `rendered-html`,
-	`item-content`.`language` AS `language`,
-	`item-content`.`plink` AS `plink`,
-	`item-content`.`location` AS `location`,
-	`item-content`.`coord` AS `coord`,
-	`item-content`.`app` AS `app`,
-	`item-content`.`object-type` AS `object-type`,
-	`item-content`.`object` AS `object`,
-	`item-content`.`target-type` AS `target-type`,
-	`item-content`.`target` AS `target`,
-	`item`.`contact-id` AS `contact-id`,
+	`post-user`.`id` AS `id`,
+	`item`.`id` AS `item-id`,
+	`post-user`.`id` AS `post-user-id`,
+	`post-user`.`uid` AS `uid`,
+	`parent-post`.`id` AS `parent`,
+	`item-uri`.`uri` AS `uri`,
+	`post-user`.`uri-id` AS `uri-id`,
+	`parent-item-uri`.`uri` AS `parent-uri`,
+	`post-user`.`parent-uri-id` AS `parent-uri-id`,
+	`thr-parent-item-uri`.`uri` AS `thr-parent`,
+	`post-user`.`thr-parent-id` AS `thr-parent-id`,
+	`item-uri`.`guid` AS `guid`,
+	`post-user`.`wall` AS `wall`,
+	`post-user`.`gravity` AS `gravity`,
+	`external-item-uri`.`uri` AS `extid`,
+	`post-user`.`external-id` AS `external-id`,
+	`post-user`.`created` AS `created`,
+	`post-user`.`edited` AS `edited`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-user`.`received` AS `received`,
+	`post-thread-user`.`changed` AS `changed`,
+	`post-user`.`post-type` AS `post-type`,
+	`post-user`.`private` AS `private`,
+	`post-thread-user`.`pubmail` AS `pubmail`,
+	`post-user`.`visible` AS `visible`,
+	`post-thread-user`.`starred` AS `starred`,
+	`post-user`.`unseen` AS `unseen`,
+	`post-user`.`deleted` AS `deleted`,
+	`post-user`.`origin` AS `origin`,
+	`post-thread-user`.`origin` AS `parent-origin`,
+	`post-thread-user`.`forum_mode` AS `forum_mode`,
+	`post-thread-user`.`mention` AS `mention`,
+	`post-user`.`global` AS `global`,
+	`post-user`.`network` AS `network`,
+	`post-user`.`vid` AS `vid`,
+	`post-user`.`psid` AS `psid`,
+	IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
+	`post-content`.`title` AS `title`,
+	`post-content`.`content-warning` AS `content-warning`,
+	`post-content`.`raw-body` AS `raw-body`,
+	`post-content`.`body` AS `body`,
+	`post-content`.`rendered-hash` AS `rendered-hash`,
+	`post-content`.`rendered-html` AS `rendered-html`,
+	`post-content`.`language` AS `language`,
+	`post-content`.`plink` AS `plink`,
+	`post-content`.`location` AS `location`,
+	`post-content`.`coord` AS `coord`,
+	`post-content`.`app` AS `app`,
+	`post-content`.`object-type` AS `object-type`,
+	`post-content`.`object` AS `object`,
+	`post-content`.`target-type` AS `target-type`,
+	`post-content`.`target` AS `target`,
+	`post-content`.`resource-id` AS `resource-id`,
+	`post-user`.`contact-id` AS `contact-id`,
 	`contact`.`url` AS `contact-link`,
 	`contact`.`addr` AS `contact-addr`,
 	`contact`.`name` AS `contact-name`,
@@ -1567,7 +1654,7 @@ CREATE VIEW `post-view` AS SELECT
 	`contact`.`rel` AS `contact-rel`,
 	`contact`.`uid` AS `contact-uid`,
 	`contact`.`contact-type` AS `contact-contact-type`,
-	IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
+	IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
 	`contact`.`self` AS `self`,
 	`contact`.`id` AS `cid`,
 	`contact`.`alias` AS `alias`,
@@ -1577,26 +1664,25 @@ CREATE VIEW `post-view` AS SELECT
 	`contact`.`avatar-date` AS `avatar-date`,
 	`contact`.`thumb` AS `thumb`,
 	`contact`.`dfrn-id` AS `dfrn-id`,
-	`group_member`.`gid` AS `group-id`,
-	`item`.`author-id` AS `author-id`,
+	`post-user`.`author-id` AS `author-id`,
 	`author`.`url` AS `author-link`,
 	`author`.`addr` AS `author-addr`,
-	IF (`contact`.`url` = `author`.`url`, `contact`.`name`, `author`.`name`) AS `author-name`,
+	IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
 	`author`.`nick` AS `author-nick`,
-	IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
+	IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
-	`item`.`owner-id` AS `owner-id`,
+	`post-user`.`owner-id` AS `owner-id`,
 	`owner`.`url` AS `owner-link`,
 	`owner`.`addr` AS `owner-addr`,
-	IF (`contact`.`url` = `owner`.`url`, `contact`.`name`, `owner`.`name`) AS `owner-name`,
+	IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
-	IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
+	IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
-	`item`.`causer-id` AS `causer-id`,
+	`post-user`.`causer-id` AS `causer-id`,
 	`causer`.`url` AS `causer-link`,
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
@@ -1611,11 +1697,11 @@ CREATE VIEW `post-view` AS SELECT
 	`post-delivery-data`.`queue_count` AS `delivery_queue_count`,
 	`post-delivery-data`.`queue_done` AS `delivery_queue_done`,
 	`post-delivery-data`.`queue_failed` AS `delivery_queue_failed`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
-	`item`.`event-id` AS `event-id`,
+	IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
+	IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
+	IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
+	IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
+	`post-user`.`event-id` AS `event-id`,
 	`event`.`created` AS `event-created`,
 	`event`.`edited` AS `event-edited`,
 	`event`.`start` AS `event-start`,
@@ -1628,94 +1714,91 @@ CREATE VIEW `post-view` AS SELECT
 	`event`.`adjust` AS `event-adjust`,
 	`event`.`ignore` AS `event-ignore`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
-	`parent-item`.`guid` AS `parent-guid`,
-	`parent-item`.`network` AS `parent-network`,
-	`parent-item`.`author-id` AS `parent-author-id`,
-	`parent-item-author`.`url` AS `parent-author-link`,
-	`parent-item-author`.`name` AS `parent-author-name`,
-	`parent-item-author`.`network` AS `parent-author-network`
-	FROM `item`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
-			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
-			LEFT JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
-			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
-			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
-			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
-			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
-			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
-			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
-			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+	`parent-item-uri`.`guid` AS `parent-guid`,
+	`parent-post`.`network` AS `parent-network`,
+	`parent-post`.`author-id` AS `parent-author-id`,
+	`parent-post-author`.`url` AS `parent-author-link`,
+	`parent-post-author`.`name` AS `parent-author-name`,
+	`parent-post-author`.`network` AS `parent-author-network`
+	FROM `post-user`
+			STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
+			LEFT JOIN `item` ON `item`.`uri-id` = `post-user`.`uri-id` AND `item`.`uid` = `post-user`.`uid`
+			INNER JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
+			INNER JOIN `contact` AS `author` ON `author`.`id` = `post-user`.`author-id`
+			INNER JOIN `contact` AS `owner` ON `owner`.`id` = `post-user`.`owner-id`
+			INNER JOIN `contact` AS `causer` ON `causer`.`id` = `post-user`.`causer-id`
+			INNER JOIN `item-uri` ON `item-uri`.`id` = `post-user`.`uri-id`
+			INNER JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post-user`.`thr-parent-id`
+			INNER JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post-user`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id`
+			INNER JOIN `verb` ON `verb`.`id` = `post-user`.`vid`
+			LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id`
+			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-user`.`uri-id`
+			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-user`.`uri-id`
+			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-user`.`uri-id` AND `post-user`.`origin`
+			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			INNER JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
 
 --
 -- VIEW post-thread-view
 --
 DROP VIEW IF EXISTS `post-thread-view`;
 CREATE VIEW `post-thread-view` AS SELECT 
-	`item`.`id` AS `id`,
-	`thread`.`iid` AS `iid`,
-	`item`.`id` AS `item_id`,
-	`thread`.`uid` AS `uid`,
-	`item`.`uid` AS `internal-uid`,
-	`item`.`parent` AS `parent`,
-	`item`.`uri` AS `uri`,
-	`item`.`uri-id` AS `uri-id`,
-	`item`.`uri-id` AS `internal-uri-id`,
-	`item`.`parent-uri` AS `parent-uri`,
-	`item`.`parent-uri-id` AS `parent-uri-id`,
-	`item`.`thr-parent` AS `thr-parent`,
-	`item`.`thr-parent-id` AS `thr-parent-id`,
-	`item`.`guid` AS `guid`,
-	`item`.`type` AS `type`,
-	`thread`.`wall` AS `wall`,
-	`item`.`gravity` AS `gravity`,
-	`item`.`extid` AS `extid`,
-	`thread`.`created` AS `created`,
-	`thread`.`edited` AS `edited`,
-	`thread`.`commented` AS `commented`,
-	`thread`.`received` AS `received`,
-	`thread`.`changed` AS `changed`,
-	`item`.`resource-id` AS `resource-id`,
-	`thread`.`post-type` AS `post-type`,
-	`thread`.`private` AS `private`,
-	`thread`.`pubmail` AS `pubmail`,
-	`thread`.`moderated` AS `moderated`,
-	`thread`.`ignored` AS `ignored`,
-	`thread`.`visible` AS `visible`,
-	`thread`.`starred` AS `starred`,
-	`item`.`bookmark` AS `bookmark`,
-	`item`.`unseen` AS `unseen`,
-	`thread`.`deleted` AS `deleted`,
-	`thread`.`origin` AS `origin`,
-	`thread`.`forum_mode` AS `forum_mode`,
-	`thread`.`mention` AS `mention`,
-	`item`.`global` AS `global`,
-	`thread`.`network` AS `network`,
-	`item`.`icid` AS `icid`,
-	`item`.`vid` AS `vid`,
-	`item`.`psid` AS `psid`,
-	`item`.`attach` AS `attach`,
-	(SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
-	NULL AS `file`,
-	IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
-	`item-content`.`title` AS `title`,
-	`item-content`.`content-warning` AS `content-warning`,
-	`item-content`.`raw-body` AS `raw-body`,
-	`item-content`.`body` AS `body`,
-	`item-content`.`rendered-hash` AS `rendered-hash`,
-	`item-content`.`rendered-html` AS `rendered-html`,
-	`item-content`.`language` AS `language`,
-	`item-content`.`plink` AS `plink`,
-	`item-content`.`location` AS `location`,
-	`item-content`.`coord` AS `coord`,
-	`item-content`.`app` AS `app`,
-	`item-content`.`object-type` AS `object-type`,
-	`item-content`.`object` AS `object`,
-	`item-content`.`target-type` AS `target-type`,
-	`item-content`.`target` AS `target`,
-	`thread`.`contact-id` AS `contact-id`,
+	`post-user`.`id` AS `id`,
+	`item`.`id` AS `item-id`,
+	`post-user`.`id` AS `post-user-id`,
+	`post-thread-user`.`uid` AS `uid`,
+	`parent-post`.`id` AS `parent`,
+	`item-uri`.`uri` AS `uri`,
+	`post-thread-user`.`uri-id` AS `uri-id`,
+	`parent-item-uri`.`uri` AS `parent-uri`,
+	`post-user`.`parent-uri-id` AS `parent-uri-id`,
+	`thr-parent-item-uri`.`uri` AS `thr-parent`,
+	`post-user`.`thr-parent-id` AS `thr-parent-id`,
+	`item-uri`.`guid` AS `guid`,
+	`post-thread-user`.`wall` AS `wall`,
+	`post-user`.`gravity` AS `gravity`,
+	`external-item-uri`.`uri` AS `extid`,
+	`post-user`.`external-id` AS `external-id`,
+	`post-thread-user`.`created` AS `created`,
+	`post-user`.`edited` AS `edited`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-thread-user`.`received` AS `received`,
+	`post-thread-user`.`changed` AS `changed`,
+	`post-user`.`post-type` AS `post-type`,
+	`post-user`.`private` AS `private`,
+	`post-thread-user`.`pubmail` AS `pubmail`,
+	`post-thread-user`.`ignored` AS `ignored`,
+	`post-user`.`visible` AS `visible`,
+	`post-thread-user`.`starred` AS `starred`,
+	`post-thread-user`.`unseen` AS `unseen`,
+	`post-user`.`deleted` AS `deleted`,
+	`post-thread-user`.`origin` AS `origin`,
+	`post-thread-user`.`forum_mode` AS `forum_mode`,
+	`post-thread-user`.`mention` AS `mention`,
+	`post-user`.`global` AS `global`,
+	`post-thread-user`.`network` AS `network`,
+	`post-user`.`vid` AS `vid`,
+	`post-thread-user`.`psid` AS `psid`,
+	IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
+	`post-content`.`title` AS `title`,
+	`post-content`.`content-warning` AS `content-warning`,
+	`post-content`.`raw-body` AS `raw-body`,
+	`post-content`.`body` AS `body`,
+	`post-content`.`rendered-hash` AS `rendered-hash`,
+	`post-content`.`rendered-html` AS `rendered-html`,
+	`post-content`.`language` AS `language`,
+	`post-content`.`plink` AS `plink`,
+	`post-content`.`location` AS `location`,
+	`post-content`.`coord` AS `coord`,
+	`post-content`.`app` AS `app`,
+	`post-content`.`object-type` AS `object-type`,
+	`post-content`.`object` AS `object`,
+	`post-content`.`target-type` AS `target-type`,
+	`post-content`.`target` AS `target`,
+	`post-content`.`resource-id` AS `resource-id`,
+	`post-thread-user`.`contact-id` AS `contact-id`,
 	`contact`.`url` AS `contact-link`,
 	`contact`.`addr` AS `contact-addr`,
 	`contact`.`name` AS `contact-name`,
@@ -1730,7 +1813,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`contact`.`rel` AS `contact-rel`,
 	`contact`.`uid` AS `contact-uid`,
 	`contact`.`contact-type` AS `contact-contact-type`,
-	IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
+	IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
 	`contact`.`self` AS `self`,
 	`contact`.`id` AS `cid`,
 	`contact`.`alias` AS `alias`,
@@ -1740,26 +1823,25 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`contact`.`avatar-date` AS `avatar-date`,
 	`contact`.`thumb` AS `thumb`,
 	`contact`.`dfrn-id` AS `dfrn-id`,
-	`group_member`.`gid` AS `group-id`,
-	`thread`.`author-id` AS `author-id`,
+	`post-thread-user`.`author-id` AS `author-id`,
 	`author`.`url` AS `author-link`,
 	`author`.`addr` AS `author-addr`,
-	IF (`contact`.`url` = `author`.`url`, `contact`.`name`, `author`.`name`) AS `author-name`,
+	IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
 	`author`.`nick` AS `author-nick`,
-	IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
+	IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
-	`thread`.`owner-id` AS `owner-id`,
+	`post-thread-user`.`owner-id` AS `owner-id`,
 	`owner`.`url` AS `owner-link`,
 	`owner`.`addr` AS `owner-addr`,
-	IF (`contact`.`url` = `owner`.`url`, `contact`.`name`, `owner`.`name`) AS `owner-name`,
+	IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
-	IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
+	IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
-	`item`.`causer-id` AS `causer-id`,
+	`post-thread-user`.`causer-id` AS `causer-id`,
 	`causer`.`url` AS `causer-link`,
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
@@ -1774,11 +1856,11 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`post-delivery-data`.`queue_count` AS `delivery_queue_count`,
 	`post-delivery-data`.`queue_done` AS `delivery_queue_done`,
 	`post-delivery-data`.`queue_failed` AS `delivery_queue_failed`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
-	IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
-	`item`.`event-id` AS `event-id`,
+	IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
+	IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
+	IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
+	IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
+	`post-user`.`event-id` AS `event-id`,
 	`event`.`created` AS `event-created`,
 	`event`.`edited` AS `event-edited`,
 	`event`.`start` AS `event-start`,
@@ -1791,27 +1873,31 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`event`.`adjust` AS `event-adjust`,
 	`event`.`ignore` AS `event-ignore`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
-	`parent-item`.`guid` AS `parent-guid`,
-	`parent-item`.`network` AS `parent-network`,
-	`parent-item`.`author-id` AS `parent-author-id`,
-	`parent-item-author`.`url` AS `parent-author-link`,
-	`parent-item-author`.`name` AS `parent-author-name`,
-	`parent-item-author`.`network` AS `parent-author-network`
-	FROM `thread`
-			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id`
-			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id`
-			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
-			LEFT JOIN `group_member` ON `group_member`.`contact-id` = `thread`.`contact-id`
-			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
-			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
-			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id`
-			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `thread`.`uri-id`
-			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin`
-			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
-			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+	`parent-item-uri`.`guid` AS `parent-guid`,
+	`parent-post`.`network` AS `parent-network`,
+	`parent-post`.`author-id` AS `parent-author-id`,
+	`parent-post-author`.`url` AS `parent-author-link`,
+	`parent-post-author`.`name` AS `parent-author-name`,
+	`parent-post-author`.`network` AS `parent-author-network`
+	FROM `post-thread-user`
+			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
+			LEFT JOIN `item` ON `item`.`uri-id` = `post-thread-user`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid`
+			INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			INNER JOIN `contact` AS `author` ON `author`.`id` = `post-thread-user`.`author-id`
+			INNER JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread-user`.`owner-id`
+			INNER JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread-user`.`causer-id`
+			INNER JOIN `item-uri` ON `item-uri`.`id` = `post-user`.`uri-id`
+			INNER JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post-user`.`thr-parent-id`
+			INNER JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post-user`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id`
+			INNER JOIN `verb` ON `verb`.`id` = `post-user`.`vid`
+			LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id`
+			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread-user`.`uri-id`
+			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread-user`.`uri-id`
+			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread-user`.`uri-id` AND `post-thread-user`.`origin`
+			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			INNER JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
 
 --
 -- VIEW category-view
@@ -1820,14 +1906,11 @@ DROP VIEW IF EXISTS `category-view`;
 CREATE VIEW `category-view` AS SELECT 
 	`post-category`.`uri-id` AS `uri-id`,
 	`post-category`.`uid` AS `uid`,
-	`item-uri`.`uri` AS `uri`,
-	`item-uri`.`guid` AS `guid`,
 	`post-category`.`type` AS `type`,
 	`post-category`.`tid` AS `tid`,
 	`tag`.`name` AS `name`,
 	`tag`.`url` AS `url`
 	FROM `post-category`
-			INNER JOIN `item-uri` ON `item-uri`.id = `post-category`.`uri-id`
 			LEFT JOIN `tag` ON `post-category`.`tid` = `tag`.`id`;
 
 --
@@ -1836,15 +1919,12 @@ CREATE VIEW `category-view` AS SELECT
 DROP VIEW IF EXISTS `tag-view`;
 CREATE VIEW `tag-view` AS SELECT 
 	`post-tag`.`uri-id` AS `uri-id`,
-	`item-uri`.`uri` AS `uri`,
-	`item-uri`.`guid` AS `guid`,
 	`post-tag`.`type` AS `type`,
 	`post-tag`.`tid` AS `tid`,
 	`post-tag`.`cid` AS `cid`,
 	CASE `cid` WHEN 0 THEN `tag`.`name` ELSE `contact`.`name` END AS `name`,
 	CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END AS `url`
 	FROM `post-tag`
-			INNER JOIN `item-uri` ON `item-uri`.id = `post-tag`.`uri-id`
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
 			LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`;
 
@@ -1853,30 +1933,29 @@ CREATE VIEW `tag-view` AS SELECT
 --
 DROP VIEW IF EXISTS `network-item-view`;
 CREATE VIEW `network-item-view` AS SELECT 
-	`item`.`parent-uri-id` AS `uri-id`,
-	`item`.`parent-uri` AS `uri`,
-	`item`.`parent` AS `parent`,
-	`item`.`received` AS `received`,
-	`item`.`commented` AS `commented`,
-	`item`.`created` AS `created`,
-	`item`.`uid` AS `uid`,
-	`item`.`starred` AS `starred`,
-	`item`.`mention` AS `mention`,
-	`item`.`network` AS `network`,
-	`item`.`unseen` AS `unseen`,
-	`item`.`gravity` AS `gravity`,
-	`item`.`contact-id` AS `contact-id`,
+	`post-user`.`uri-id` AS `uri-id`,
+	`parent-post`.`id` AS `parent`,
+	`post-user`.`received` AS `received`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-user`.`created` AS `created`,
+	`post-user`.`uid` AS `uid`,
+	`post-thread-user`.`starred` AS `starred`,
+	`post-thread-user`.`mention` AS `mention`,
+	`post-user`.`network` AS `network`,
+	`post-user`.`unseen` AS `unseen`,
+	`post-user`.`gravity` AS `gravity`,
+	`post-user`.`contact-id` AS `contact-id`,
 	`ownercontact`.`contact-type` AS `contact-type`
-	FROM `item`
-			INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
-			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
-			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
-			LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id`
-			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+	FROM `post-user`
+			STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`			
+			INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
+			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
+			INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
-			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
 			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
 			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
 
@@ -1885,29 +1964,27 @@ CREATE VIEW `network-item-view` AS SELECT
 --
 DROP VIEW IF EXISTS `network-thread-view`;
 CREATE VIEW `network-thread-view` AS SELECT 
-	`item`.`uri-id` AS `uri-id`,
-	`item`.`uri` AS `uri`,
-	`item`.`parent-uri-id` AS `parent-uri-id`,
-	`thread`.`iid` AS `parent`,
-	`thread`.`received` AS `received`,
-	`thread`.`commented` AS `commented`,
-	`thread`.`created` AS `created`,
-	`thread`.`uid` AS `uid`,
-	`thread`.`starred` AS `starred`,
-	`thread`.`mention` AS `mention`,
-	`thread`.`network` AS `network`,
-	`thread`.`contact-id` AS `contact-id`,
+	`post-thread-user`.`uri-id` AS `uri-id`,
+	`parent-post`.`id` AS `parent`,
+	`post-thread-user`.`received` AS `received`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-thread-user`.`created` AS `created`,
+	`post-thread-user`.`uid` AS `uid`,
+	`post-thread-user`.`starred` AS `starred`,
+	`post-thread-user`.`mention` AS `mention`,
+	`post-thread-user`.`network` AS `network`,
+	`post-thread-user`.`contact-id` AS `contact-id`,
 	`ownercontact`.`contact-type` AS `contact-type`
-	FROM `thread`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
-			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
-			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
-			LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id`
-			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+	FROM `post-thread-user`
+			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
+			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
+			LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
-			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
 			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
 			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
 
@@ -2074,19 +2151,17 @@ CREATE VIEW `pending-view` AS SELECT
 DROP VIEW IF EXISTS `tag-search-view`;
 CREATE VIEW `tag-search-view` AS SELECT 
 	`post-tag`.`uri-id` AS `uri-id`,
-	`item`.`id` AS `iid`,
-	`item`.`uri` AS `uri`,
-	`item`.`guid` AS `guid`,
-	`item`.`uid` AS `uid`,
-	`item`.`private` AS `private`,
-	`item`.`wall` AS `wall`,
-	`item`.`origin` AS `origin`,
-	`item`.`gravity` AS `gravity`,
-	`item`.`received` AS `received`,
+	`post-user`.`uid` AS `uid`,
+	`post-user`.`id` AS `iid`,
+	`post-user`.`private` AS `private`,
+	`post-user`.`wall` AS `wall`,
+	`post-user`.`origin` AS `origin`,
+	`post-user`.`gravity` AS `gravity`,
+	`post-user`.`received` AS `received`,
 	`tag`.`name` AS `name`
 	FROM `post-tag`
 			INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid`
-			INNER JOIN `item` ON `item`.`uri-id` = `post-tag`.`uri-id`
+			STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-tag`.`uri-id`
 			WHERE `post-tag`.`type` = 1;
 
 --