X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=33c32cec0a9e07cf546d7becb07b94713405d9b2;hb=b22d7452a3b6833dbf1cb902ede86af7b79f3049;hp=520c5e9b054e6f5f043fa8145424837d1cea1512;hpb=61ecdf789c648cc5789ade2da3172bb7cc7a734d;p=friendica.git

diff --git a/database.sql b/database.sql
index 520c5e9b05..33c32cec0a 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2020.12-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1382
+-- Friendica 2021.03-dev (Red Hot Poker)
+-- DB_UPDATE_VERSION 1395
 -- ------------------------------------------
 
 
@@ -20,17 +20,20 @@ CREATE TABLE IF NOT EXISTS `gserver` (
 	`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
+	`protocol` tinyint unsigned COMMENT 'The protocol of the server',
 	`platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system',
 	`relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get',
 	`detection-method` tinyint unsigned COMMENT 'Method that had been used to detect that server',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`last_poco_query` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Last successful connection request',
+	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Last failed connection request',
 	`failed` boolean COMMENT 'Connection failed',
+	`next_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Next connection request',
 	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `nurl` (`nurl`(190))
+	 UNIQUE INDEX `nurl` (`nurl`(190)),
+	 INDEX `next_contact` (`next_contact`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers';
 
 --
@@ -280,10 +283,24 @@ CREATE TABLE IF NOT EXISTS `2fa_recovery_codes` (
 	`code` varchar(50) NOT NULL COMMENT 'Recovery code string',
 	`generated` datetime NOT NULL COMMENT 'Datetime the code was generated',
 	`used` datetime COMMENT 'Datetime the code was used',
-	 PRIMARY KEY(`uid`,`code`),
+	PRIMARY KEY(`uid`,`code`),
 	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
 --
@@ -466,13 +483,13 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 --
 CREATE TABLE IF NOT EXISTS `delayed-post` (
 	`id` int unsigned NOT NULL auto_increment,
-	`uri` varchar(255) COMMENT 'URI of the post that will be posted later',
+	`uri` varchar(255) COMMENT 'URI of the post that will be distributed later',
 	`uid` mediumint unsigned COMMENT 'Owner User id',
 	`delayed` datetime COMMENT 'delay time',
 	 PRIMARY KEY(`id`),
-	 UNIQUE INDEX `uri` (`uri`(190)),
+	 UNIQUE INDEX `uid_uri` (`uid`,`uri`(190)),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Posts that are about to be posted at a later time';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Posts that are about to be distributed at a later time';
 
 --
 -- TABLE diaspora-interaction
@@ -683,7 +700,6 @@ 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, ...)',
@@ -705,6 +721,7 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`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',
 	`iaid` int unsigned COMMENT 'Deprecated',
+	`icid` int unsigned COMMENT 'Deprecated',
 	`attach` mediumtext COMMENT 'Deprecated',
 	`allow_cid` mediumtext COMMENT 'Deprecated',
 	`allow_gid` mediumtext COMMENT 'Deprecated',
@@ -762,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`),
@@ -1043,6 +1058,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
 	`guid` char(16) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this photo',
 	`resource-id` char(32) NOT NULL DEFAULT '' COMMENT '',
+	`hash` char(32) COMMENT 'hash value of the photo',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation date',
 	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edited date',
 	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -1151,6 +1167,7 @@ CREATE TABLE IF NOT EXISTS `post-tag` (
 -- 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',
 	`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',
@@ -1160,7 +1177,8 @@ CREATE TABLE IF NOT EXISTS `post-user` (
 	`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`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`),
@@ -1464,7 +1482,8 @@ CREATE TABLE IF NOT EXISTS `worker-ipc` (
 --
 CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`id` int unsigned NOT NULL auto_increment COMMENT 'Auto incremented worker task id',
-	`parameter` mediumtext COMMENT 'Task command',
+	`command` varchar(100) COMMENT 'Task command',
+	`parameter` mediumtext COMMENT 'Task parameter',
 	`priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Task priority',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
 	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
@@ -1473,7 +1492,8 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
 	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked 1 when the task was done - will be deleted later',
 	 PRIMARY KEY(`id`),
-	 INDEX `done_parameter` (`done`,`parameter`(64)),
+	 INDEX `command` (`command`),
+	 INDEX `done_command_parameter` (`done`,`command`,`parameter`(64)),
 	 INDEX `done_executed` (`done`,`executed`),
 	 INDEX `done_priority_retrial_created` (`done`,`priority`,`retrial`,`created`),
 	 INDEX `done_priority_next_try` (`done`,`priority`,`next_try`),
@@ -1482,10 +1502,321 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	 INDEX `done_pid_priority_created` (`done`,`pid`,`priority`,`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Background tasks queue entries';
 
+--
+-- VIEW post-view
+--
+DROP VIEW IF EXISTS `post-view`;
+CREATE VIEW `post-view` AS SELECT 
+	`item`.`id` AS `id`,
+	`item`.`id` AS `item_id`,
+	`post-user`.`id` AS `post-user-id`,
+	`item`.`uid` AS `uid`,
+	`item`.`parent` AS `parent`,
+	`item`.`uri` AS `uri`,
+	`item`.`uri-id` AS `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`.`vid` AS `vid`,
+	`item`.`psid` AS `psid`,
+	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`,
+	`contact`.`url` AS `contact-link`,
+	`contact`.`addr` AS `contact-addr`,
+	`contact`.`name` AS `contact-name`,
+	`contact`.`nick` AS `contact-nick`,
+	`contact`.`thumb` AS `contact-avatar`,
+	`contact`.`network` AS `contact-network`,
+	`contact`.`blocked` AS `contact-blocked`,
+	`contact`.`hidden` AS `contact-hidden`,
+	`contact`.`readonly` AS `contact-readonly`,
+	`contact`.`archive` AS `contact-archive`,
+	`contact`.`pending` AS `contact-pending`,
+	`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`,
+	`contact`.`self` AS `self`,
+	`contact`.`id` AS `cid`,
+	`contact`.`alias` AS `alias`,
+	`contact`.`photo` AS `photo`,
+	`contact`.`name-date` AS `name-date`,
+	`contact`.`uri-date` AS `uri-date`,
+	`contact`.`avatar-date` AS `avatar-date`,
+	`contact`.`thumb` AS `thumb`,
+	`contact`.`dfrn-id` AS `dfrn-id`,
+	`item`.`author-id` AS `author-id`,
+	`author`.`url` AS `author-link`,
+	`author`.`addr` AS `author-addr`,
+	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` 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`,
+	`owner`.`url` AS `owner-link`,
+	`owner`.`addr` AS `owner-addr`,
+	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` 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`,
+	`causer`.`url` AS `causer-link`,
+	`causer`.`addr` AS `causer-addr`,
+	`causer`.`name` AS `causer-name`,
+	`causer`.`nick` AS `causer-nick`,
+	`causer`.`thumb` AS `causer-avatar`,
+	`causer`.`network` AS `causer-network`,
+	`causer`.`blocked` AS `causer-blocked`,
+	`causer`.`hidden` AS `causer-hidden`,
+	`causer`.`contact-type` AS `causer-contact-type`,
+	`post-delivery-data`.`postopts` AS `postopts`,
+	`post-delivery-data`.`inform` AS `inform`,
+	`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`,
+	`event`.`created` AS `event-created`,
+	`event`.`edited` AS `event-edited`,
+	`event`.`start` AS `event-start`,
+	`event`.`finish` AS `event-finish`,
+	`event`.`summary` AS `event-summary`,
+	`event`.`desc` AS `event-desc`,
+	`event`.`location` AS `event-location`,
+	`event`.`type` AS `event-type`,
+	`event`.`nofinish` AS `event-nofinish`,
+	`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`
+			LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `item`.`uid`
+			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 `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`;
+
+--
+-- 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`.`parent` AS `parent`,
+	`item`.`uri` AS `uri`,
+	`item`.`uri-id` AS `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`,
+	`item`.`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`.`vid` AS `vid`,
+	`item`.`psid` AS `psid`,
+	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`,
+	`contact`.`url` AS `contact-link`,
+	`contact`.`addr` AS `contact-addr`,
+	`contact`.`name` AS `contact-name`,
+	`contact`.`nick` AS `contact-nick`,
+	`contact`.`thumb` AS `contact-avatar`,
+	`contact`.`network` AS `contact-network`,
+	`contact`.`blocked` AS `contact-blocked`,
+	`contact`.`hidden` AS `contact-hidden`,
+	`contact`.`readonly` AS `contact-readonly`,
+	`contact`.`archive` AS `contact-archive`,
+	`contact`.`pending` AS `contact-pending`,
+	`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`,
+	`contact`.`self` AS `self`,
+	`contact`.`id` AS `cid`,
+	`contact`.`alias` AS `alias`,
+	`contact`.`photo` AS `photo`,
+	`contact`.`name-date` AS `name-date`,
+	`contact`.`uri-date` AS `uri-date`,
+	`contact`.`avatar-date` AS `avatar-date`,
+	`contact`.`thumb` AS `thumb`,
+	`contact`.`dfrn-id` AS `dfrn-id`,
+	`thread`.`author-id` AS `author-id`,
+	`author`.`url` AS `author-link`,
+	`author`.`addr` AS `author-addr`,
+	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` 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`,
+	`owner`.`url` AS `owner-link`,
+	`owner`.`addr` AS `owner-addr`,
+	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` 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`,
+	`causer`.`url` AS `causer-link`,
+	`causer`.`addr` AS `causer-addr`,
+	`causer`.`name` AS `causer-name`,
+	`causer`.`nick` AS `causer-nick`,
+	`causer`.`thumb` AS `causer-avatar`,
+	`causer`.`network` AS `causer-network`,
+	`causer`.`blocked` AS `causer-blocked`,
+	`causer`.`hidden` AS `causer-hidden`,
+	`causer`.`contact-type` AS `causer-contact-type`,
+	`post-delivery-data`.`postopts` AS `postopts`,
+	`post-delivery-data`.`inform` AS `inform`,
+	`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`,
+	`event`.`created` AS `event-created`,
+	`event`.`edited` AS `event-edited`,
+	`event`.`start` AS `event-start`,
+	`event`.`finish` AS `event-finish`,
+	`event`.`summary` AS `event-summary`,
+	`event`.`desc` AS `event-desc`,
+	`event`.`location` AS `event-location`,
+	`event`.`type` AS `event-type`,
+	`event`.`nofinish` AS `event-nofinish`,
+	`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 `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`.`id` = `item`.`parent`
+			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+
 --
 -- VIEW category-view
 --
-DROP VIEW `category-view`;
+DROP VIEW IF EXISTS `category-view`;
 CREATE VIEW `category-view` AS SELECT 
 	`post-category`.`uri-id` AS `uri-id`,
 	`post-category`.`uid` AS `uid`,
@@ -1502,7 +1833,7 @@ CREATE VIEW `category-view` AS SELECT
 --
 -- VIEW tag-view
 --
-DROP VIEW `tag-view`;
+DROP VIEW IF EXISTS `tag-view`;
 CREATE VIEW `tag-view` AS SELECT 
 	`post-tag`.`uri-id` AS `uri-id`,
 	`item-uri`.`uri` AS `uri`,
@@ -1520,7 +1851,7 @@ CREATE VIEW `tag-view` AS SELECT
 --
 -- VIEW network-item-view
 --
-DROP VIEW `network-item-view`;
+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`,
@@ -1552,7 +1883,7 @@ CREATE VIEW `network-item-view` AS SELECT
 --
 -- VIEW network-thread-view
 --
-DROP VIEW `network-thread-view`;
+DROP VIEW IF EXISTS `network-thread-view`;
 CREATE VIEW `network-thread-view` AS SELECT 
 	`item`.`uri-id` AS `uri-id`,
 	`item`.`uri` AS `uri`,
@@ -1583,7 +1914,7 @@ CREATE VIEW `network-thread-view` AS SELECT
 --
 -- VIEW owner-view
 --
-DROP VIEW `owner-view`;
+DROP VIEW IF EXISTS `owner-view`;
 CREATE VIEW `owner-view` AS SELECT 
 	`contact`.`id` AS `id`,
 	`contact`.`uid` AS `uid`,
@@ -1718,7 +2049,7 @@ CREATE VIEW `owner-view` AS SELECT
 --
 -- VIEW pending-view
 --
-DROP VIEW `pending-view`;
+DROP VIEW IF EXISTS `pending-view`;
 CREATE VIEW `pending-view` AS SELECT 
 	`register`.`id` AS `id`,
 	`register`.`hash` AS `hash`,
@@ -1740,7 +2071,7 @@ CREATE VIEW `pending-view` AS SELECT
 --
 -- VIEW tag-search-view
 --
-DROP VIEW `tag-search-view`;
+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`,
@@ -1761,12 +2092,10 @@ CREATE VIEW `tag-search-view` AS SELECT
 --
 -- VIEW workerqueue-view
 --
-DROP VIEW `workerqueue-view`;
+DROP VIEW IF EXISTS `workerqueue-view`;
 CREATE VIEW `workerqueue-view` AS SELECT 
 	`process`.`pid` AS `pid`,
 	`workerqueue`.`priority` AS `priority`
 	FROM `process`
 			INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
 			WHERE NOT `workerqueue`.`done`;
-
-