From 07c07ec4992be06f695bb8e4443b5bd642d0098e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 14 Feb 2021 09:43:27 +0000 Subject: [PATCH] More "item" traces removed --- database.sql | 494 ++++++++++++---------------- mod/item.php | 1 - src/Model/Item.php | 6 +- src/Model/Post.php | 8 +- src/Worker/CleanItemUri.php | 7 +- src/Worker/Cron.php | 3 - src/Worker/Expire.php | 9 +- src/Worker/ExpirePosts.php | 29 +- src/Worker/RemoveUnusedAvatars.php | 6 +- src/Worker/RemoveUnusedContacts.php | 28 +- src/Worker/RepairDatabase.php | 68 ---- src/Worker/UpdateContacts.php | 4 +- static/dbstructure.config.php | 4 + static/dbview.config.php | 117 ++++--- static/defaults.config.php | 4 - 15 files changed, 325 insertions(+), 463 deletions(-) delete mode 100644 src/Worker/RepairDatabase.php diff --git a/database.sql b/database.sql index 52a1d7eeb..69724c3e1 100644 --- a/database.sql +++ b/database.sql @@ -1033,6 +1033,7 @@ 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', @@ -1050,13 +1051,16 @@ CREATE TABLE IF NOT EXISTS `post` ( 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, @@ -1194,6 +1198,23 @@ CREATE TABLE IF NOT EXISTS `post-thread` ( 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', @@ -1212,7 +1233,29 @@ CREATE TABLE IF NOT EXISTS `post-user` ( INDEX `uid_hidden` (`uid`,`hidden`), INDEX `event-id` (`event-id`), INDEX `uid_wall` (`uid`,`wall`), + 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 `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, @@ -1224,6 +1267,14 @@ CREATE TABLE IF NOT EXISTS `post-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 '', @@ -1245,7 +1296,28 @@ CREATE TABLE IF NOT EXISTS `post-thread-user` ( 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, @@ -1517,192 +1589,42 @@ 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`, - `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`.`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`.`post-type` AS `post-type`, - `item`.`private` AS `private`, - `item`.`pubmail` AS `pubmail`, - `item`.`visible` AS `visible`, - `item`.`starred` AS `starred`, - `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`, - `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`, - `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 `post-content` ON `post-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-view2 --- -DROP VIEW IF EXISTS `post-view2`; -CREATE VIEW `post-view2` AS SELECT - `item`.`id` AS `id`, - `item`.`id` AS `item_id`, + `item`.`id` AS `item-id`, `post-user`.`id` AS `post-user-id`, `post-user`.`uid` AS `uid`, `item`.`parent` AS `parent`, + `parent-post`.`id` AS `parent-user-id`, `item-uri`.`uri` AS `uri`, - `post`.`uri-id` AS `uri-id`, + `post-user`.`uri-id` AS `uri-id`, `parent-item-uri`.`uri` AS `parent-uri`, - `post`.`parent-uri-id` AS `parent-uri-id`, + `post-user`.`parent-uri-id` AS `parent-uri-id`, `thr-parent-item-uri`.`uri` AS `thr-parent`, - `post`.`thr-parent-id` AS `thr-parent-id`, + `post-user`.`thr-parent-id` AS `thr-parent-id`, `item-uri`.`guid` AS `guid`, `post-user`.`wall` AS `wall`, - `post`.`gravity` AS `gravity`, - `item`.`extid` AS `extid`, - `post`.`created` AS `created`, - `post`.`edited` AS `edited`, - `post-thread`.`commented` AS `commented`, - `post`.`received` AS `received`, - `post-thread`.`changed` AS `changed`, - `post`.`post-type` AS `post-type`, - `post`.`private` AS `private`, + `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`.`visible` AS `visible`, + `post-user`.`visible` AS `visible`, `post-thread-user`.`starred` AS `starred`, `post-user`.`unseen` AS `unseen`, - `post`.`deleted` AS `deleted`, + `post-user`.`deleted` AS `deleted`, `post-user`.`origin` AS `origin`, `post-thread-user`.`forum_mode` AS `forum_mode`, `post-thread-user`.`mention` AS `mention`, - `post`.`global` AS `global`, - `post`.`network` AS `network`, - `post`.`vid` AS `vid`, + `post-user`.`global` AS `global`, + `post-user`.`network` AS `network`, + `post-user`.`vid` AS `vid`, `post-user`.`psid` AS `psid`, - IF (`post`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, + 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`, @@ -1734,7 +1656,7 @@ CREATE VIEW `post-view2` AS SELECT `contact`.`rel` AS `contact-rel`, `contact`.`uid` AS `contact-uid`, `contact`.`contact-type` AS `contact-contact-type`, - IF (`post`.`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`, @@ -1744,7 +1666,7 @@ CREATE VIEW `post-view2` AS SELECT `contact`.`avatar-date` AS `avatar-date`, `contact`.`thumb` AS `thumb`, `contact`.`dfrn-id` AS `dfrn-id`, - `post`.`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` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`, @@ -1753,7 +1675,7 @@ CREATE VIEW `post-view2` AS SELECT `author`.`network` AS `author-network`, `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, - `post`.`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` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`, @@ -1762,7 +1684,7 @@ CREATE VIEW `post-view2` AS SELECT `owner`.`network` AS `owner-network`, `owner`.`blocked` AS `owner-blocked`, `owner`.`hidden` AS `owner-hidden`, - `post`.`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`, @@ -1797,29 +1719,28 @@ CREATE VIEW `post-view2` AS SELECT `parent-item-uri`.`guid` AS `parent-guid`, `parent-post`.`network` AS `parent-network`, `parent-post`.`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 `post` - STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post`.`uri-id` - STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id` - STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid` - STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post`.`uri-id` AND `item`.`uid` = `post-user`.`uid` - LEFT JOIN `item-uri` ON `item-uri`.`id` = `post`.`uri-id` - LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post`.`thr-parent-id` - LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post`.`parent-uri-id` - LEFT JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id` - LEFT JOIN `contact` AS `author` ON `author`.`id` = `post`.`author-id` - LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `post`.`owner-id` - LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post`.`causer-id` - LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid` + `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`.`uri-id` - LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post`.`uri-id` - LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post`.`uri-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` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` - LEFT JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-post`.`author-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` + INNER JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; -- -- VIEW post-thread-view @@ -1827,42 +1748,44 @@ CREATE VIEW `post-view2` AS SELECT DROP VIEW IF EXISTS `post-thread-view`; CREATE VIEW `post-thread-view` AS SELECT `item`.`id` AS `id`, + `item`.`id` AS `item-id`, `item`.`id` AS `iid`, - `item`.`id` AS `item_id`, - `post-thread-user`.`post-user-id` AS `post-user-id`, + `post-user`.`id` AS `post-user-id`, `post-thread-user`.`uid` AS `uid`, `item`.`parent` AS `parent`, + `parent-post`.`id` AS `parent-user-id`, `item-uri`.`uri` AS `uri`, - `post-thread`.`uri-id` AS `uri-id`, + `post-thread-user`.`uri-id` AS `uri-id`, `parent-item-uri`.`uri` AS `parent-uri`, - `post`.`parent-uri-id` AS `parent-uri-id`, + `post-user`.`parent-uri-id` AS `parent-uri-id`, `thr-parent-item-uri`.`uri` AS `thr-parent`, - `post`.`thr-parent-id` AS `thr-parent-id`, + `post-user`.`thr-parent-id` AS `thr-parent-id`, `item-uri`.`guid` AS `guid`, `post-thread-user`.`wall` AS `wall`, - `post`.`gravity` AS `gravity`, - `item`.`extid` AS `extid`, - `post-thread`.`created` AS `created`, - `post`.`edited` AS `edited`, - `post-thread`.`commented` AS `commented`, - `post-thread`.`received` AS `received`, - `post-thread`.`changed` AS `changed`, - `post`.`post-type` AS `post-type`, - `post`.`private` AS `private`, + `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`.`visible` AS `visible`, + `post-user`.`visible` AS `visible`, `post-thread-user`.`starred` AS `starred`, `post-thread-user`.`unseen` AS `unseen`, - `post`.`deleted` AS `deleted`, + `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`.`global` AS `global`, - `post-thread`.`network` AS `network`, - `post`.`vid` AS `vid`, + `post-user`.`global` AS `global`, + `post-thread-user`.`network` AS `network`, + `post-user`.`vid` AS `vid`, `post-thread-user`.`psid` AS `psid`, - IF (`post`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, + 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`, @@ -1894,7 +1817,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 (`post`.`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`, @@ -1904,7 +1827,7 @@ CREATE VIEW `post-thread-view` AS SELECT `contact`.`avatar-date` AS `avatar-date`, `contact`.`thumb` AS `thumb`, `contact`.`dfrn-id` AS `dfrn-id`, - `post-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` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`, @@ -1913,7 +1836,7 @@ CREATE VIEW `post-thread-view` AS SELECT `author`.`network` AS `author-network`, `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, - `post-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` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`, @@ -1922,7 +1845,7 @@ CREATE VIEW `post-thread-view` AS SELECT `owner`.`network` AS `owner-network`, `owner`.`blocked` AS `owner-blocked`, `owner`.`hidden` AS `owner-hidden`, - `post-thread`.`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`, @@ -1957,29 +1880,28 @@ CREATE VIEW `post-thread-view` AS SELECT `parent-item-uri`.`guid` AS `parent-guid`, `parent-post`.`network` AS `parent-network`, `parent-post`.`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 `post-thread` - STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id` - STRAIGHT_JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id` - STRAIGHT_JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id` - LEFT JOIN `item-uri` ON `item-uri`.`id` = `post`.`uri-id` - LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post`.`thr-parent-id` - LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post`.`parent-uri-id` - LEFT JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` - LEFT JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` - LEFT JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id` - LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread`.`owner-id` - LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread`.`causer-id` - LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid` + `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`.`uri-id` - LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id` - LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread`.`uri-id` AND `post-thread-user`.`origin` + 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` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` - LEFT JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-post`.`author-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` + INNER JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; -- -- VIEW category-view @@ -1988,14 +1910,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`; -- @@ -2004,15 +1923,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`; @@ -2021,28 +1937,28 @@ 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`, + `post-user`.`uri-id` AS `uri-id`, `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`.`parent-uri-id` AS `parent-uri-id`, + `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 `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` - STRAIGHT_JOIN `contact` ON `contact`.`id` = `parent-item`.`contact-id` - LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `parent-item`.`uid` - LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `parent-item`.`uid` AND `author`.`cid` = `parent-item`.`author-id` - LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `parent-item`.`uid` AND `owner`.`cid` = `parent-item`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `parent-item`.`owner-id` - WHERE `parent-item`.`visible` AND NOT `parent-item`.`deleted` + 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-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` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -2053,27 +1969,26 @@ CREATE VIEW `network-item-view` AS SELECT -- DROP VIEW IF EXISTS `network-thread-view`; CREATE VIEW `network-thread-view` AS SELECT - `post-thread`.`uri-id` AS `uri-id`, - `item`.`uri` AS `uri`, - `item`.`parent-uri-id` AS `parent-uri-id`, + `post-thread-user`.`uri-id` AS `uri-id`, + `post-user`.`parent-uri-id` AS `parent-uri-id`, `item`.`id` AS `parent`, - `post-thread`.`received` AS `received`, - `post-thread`.`commented` AS `commented`, - `post-thread`.`created` AS `created`, + `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`.`network` AS `network`, + `post-thread-user`.`network` AS `network`, `post-thread-user`.`contact-id` AS `contact-id`, `ownercontact`.`contact-type` AS `contact-type` - FROM `post-thread` - STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id` - STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` + 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` 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`.`author-id` - LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread`.`owner-id` - WHERE `item`.`visible` AND NOT `item`.`deleted` + 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` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -2242,19 +2157,16 @@ 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`.`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; -- diff --git a/mod/item.php b/mod/item.php index 0c252cd6c..d180cb08a 100644 --- a/mod/item.php +++ b/mod/item.php @@ -651,7 +651,6 @@ function item_post(App $a) { // doesn't have an ID. $datarray["id"] = -1; $datarray["uri-id"] = -1; - $datarray["item_id"] = -1; $datarray["author-network"] = Protocol::DFRN; $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true); diff --git a/src/Model/Item.php b/src/Model/Item.php index 6114457d6..814696a49 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -77,7 +77,7 @@ class Item 'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink', 'wall', 'private', 'starred', 'origin', 'title', 'body', 'language', 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', - 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', + 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network', 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', @@ -959,6 +959,10 @@ class Item $item['deny_gid'] ); + if (!empty($item['extid'])) { + $item['external-id'] = ItemURI::getIdByURI($item['extid']); + } + if ($item['verb'] == Activity::ANNOUNCE) { self::setOwnerforResharedItem($item); } diff --git a/src/Model/Post.php b/src/Model/Post.php index 30515d711..4f06babf9 100644 --- a/src/Model/Post.php +++ b/src/Model/Post.php @@ -94,6 +94,10 @@ class Post } } + if (array_key_exists('extid', $row) && is_null($row['extid'])) { + $row['extid'] = ''; + } + return $row; } @@ -526,8 +530,8 @@ class Post } } if (!empty($update_fields)) { - $rows = DBA::selectToArray('post-view', ['id'], $condition, []); - $ids = array_column($rows, 'id'); + $rows = DBA::selectToArray('post-view', ['item-id'], $condition, []); + $ids = array_column($rows, 'item-id'); if (!DBA::update('item', $update_fields, ['id' => $ids])) { DBA::rollback(); Logger::notice('Updating item failed', ['fields' => $update_fields, 'condition' => $condition]); diff --git a/src/Worker/CleanItemUri.php b/src/Worker/CleanItemUri.php index 268fe29dc..8f74d99fb 100644 --- a/src/Worker/CleanItemUri.php +++ b/src/Worker/CleanItemUri.php @@ -42,9 +42,10 @@ class CleanItemUri } Logger::notice('Start deleting orphaned URI-ID', ['last-id' => $item['uri-id']]); $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` < ? - AND NOT `id` IN (SELECT `uri-id` FROM `item`) - AND NOT `id` IN (SELECT `parent-uri-id` FROM `item`) - AND NOT `id` IN (SELECT `thr-parent-id` FROM `item`)", $item['uri-id']); + AND NOT EXISTS(SELECT `uri-id` FROM `post-user` WHERE `uri-id` = `item-uri`.`id`) + AND NOT EXISTS(SELECT `parent-uri-id` FROM `post-user` WHERE `parent-uri-id` = `item-uri`.`id`) + AND NOT EXISTS(SELECT `thr-parent-id` FROM `post-user` WHERE `thr-parent-id` = `item-uri`.`id`) + AND NOT EXISTS(SELECT `external-id` FROM `post-user` WHERE `external-id` = `item-uri`.`id`)", $item['uri-id']); Logger::notice('Orphaned URI-ID entries removed', ['result' => $ret, 'rows' => DBA::affectedRows()]); } } diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index acb5132af..93e0215f7 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -111,9 +111,6 @@ class Cron // update nodeinfo data Worker::add(PRIORITY_LOW, 'NodeInfo'); - // Repair entries in the database - Worker::add(PRIORITY_LOW, 'RepairDatabase'); - Worker::add(PRIORITY_LOW, 'Expire'); Worker::add(PRIORITY_LOW, 'ExpirePosts'); diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index ca92bd1ee..31c0af039 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -55,21 +55,16 @@ class Expire Logger::info('Deleting orphaned post-content - start'); /// @todo Replace "item with "post-user" in the future when "item" is removed - $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-content`.`uri-id`)"]; + $condition = ["NOT EXISTS (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uri-id` = `post-content`.`uri-id`)"]; DBA::delete('post-content', $condition); Logger::info('Orphaned post-content deleted', ['rows' => DBA::affectedRows()]); Logger::info('Deleting orphaned post-thread - start'); /// @todo Replace "item with "post-user" in the future when "item" is removed - $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-thread`.`uri-id`)"]; + $condition = ["NOT EXISTS (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uri-id` = `post-thread`.`uri-id`)"]; DBA::delete('post-thread', $condition); Logger::info('Orphaned item content deleted', ['rows' => DBA::affectedRows()]); - // make this optional as it could have a performance impact on large sites - if (intval(DI::config()->get('system', 'optimize_items'))) { - DBA::e("OPTIMIZE TABLE `item`"); - } - Logger::log('Delete expired items - done', Logger::DEBUG); return; } elseif (intval($param) > 0) { diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php index 61343566d..0535c223b 100644 --- a/src/Worker/ExpirePosts.php +++ b/src/Worker/ExpirePosts.php @@ -50,15 +50,18 @@ class ExpirePosts Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]); $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN (SELECT `uri-id` FROM `post-thread` WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY - AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-thread-user` WHERE (`mention` OR `starred` OR `wall` OR `pinned`) AND `uri-id` = `post-thread`.`uri-id`) - AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin` AND `uri-id` = `post-thread`.`uri-id`) - AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-category` WHERE `uri-id` = `post-thread`.`uri-id`) - AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `uri-id` = `post-thread`.`uri-id`) - AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `contact-id` AND `notify_new_posts` + AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-thread-user` + WHERE (`mention` OR `starred` OR `wall` OR `pinned`) AND `uri-id` = `post-thread`.`uri-id`) + AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-category` + WHERE `uri-id` = `post-thread`.`uri-id`) + AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-media` + WHERE `uri-id` = `post-thread`.`uri-id`) + AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` INNER JOIN `contact` ON `contact`.`id` = `contact-id` AND `notify_new_posts` WHERE `parent-uri-id` = `post-thread`.`uri-id`) - AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` - WHERE (`origin` OR `starred` OR `resource-id` != 0 OR `event-id` != 0 OR `wall` OR `attach` != '' OR `post-type` = ?) - AND `parent-uri-id` = `post-thread`.`uri-id`)) + AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` + WHERE (`origin` OR `event-id` != 0 OR `post-type` = ?) AND `parent-uri-id` = `post-thread`.`uri-id`)) + AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-content` + WHERE (`resource-id` != 0) AND `uri-id` = `post-thread`.`uri-id`)) ORDER BY `id` LIMIT ?", $expire_days, Item::PT_PERSONAL_NOTE, $limit); $rows = DBA::affectedRows(); @@ -75,11 +78,11 @@ class ExpirePosts do { Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed]); $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN - (SELECT `uri-id` FROM `item` WHERE `gravity` = ? AND `uid` = ? AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY - AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` AS `i` WHERE `i`.`uid` != ? - AND `i`.`parent-uri-id` = `item`.`uri-id`) - AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` AS `i` WHERE `i`.`uid` = ? - AND `i`.`parent-uri-id` = `item`.`uri-id` AND `i`.`received` > UTC_TIMESTAMP() - INTERVAL ? DAY)) + (SELECT `uri-id` FROM `post-user` WHERE `gravity` = ? AND `uid` = ? AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY + AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` AS `i` WHERE `i`.`uid` != ? + AND `i`.`parent-uri-id` = `post-user`.`uri-id`) + AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` AS `i` WHERE `i`.`uid` = ? + AND `i`.`parent-uri-id` = `post-user`.`uri-id` AND `i`.`received` > UTC_TIMESTAMP() - INTERVAL ? DAY)) ORDER BY `id` LIMIT ?", GRAVITY_PARENT, 0, $expire_days_unclaimed, 0, 0, $expire_days_unclaimed, $limit); diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php index 0d9c0f6fb..bbfd3fdf8 100644 --- a/src/Worker/RemoveUnusedAvatars.php +++ b/src/Worker/RemoveUnusedAvatars.php @@ -35,9 +35,9 @@ class RemoveUnusedAvatars public static function execute() { $condition = ["`uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?) - AND `id` IN (SELECT `contact-id` FROM `photo`) AND NOT `id` IN (SELECT `author-id` FROM `item`) - AND NOT `id` IN (SELECT `owner-id` FROM `item`) AND NOT `id` IN (SELECT `causer-id` FROM `item`) - AND NOT `id` IN (SELECT `cid` FROM `post-tag`) AND NOT `id` IN (SELECT `contact-id` FROM `item`)", 0, 0]; + AND `id` IN (SELECT `contact-id` FROM `photo`) AND NOT `id` IN (SELECT `author-id` FROM `post-user`) + AND NOT `id` IN (SELECT `owner-id` FROM `post-user`) AND NOT `id` IN (SELECT `causer-id` FROM `post-user`) + AND NOT `id` IN (SELECT `cid` FROM `post-tag`) AND NOT `id` IN (SELECT `contact-id` FROM `post-user`)", 0, 0]; $total = DBA::count('contact', $condition); Logger::notice('Starting removal', ['total' => $total]); diff --git a/src/Worker/RemoveUnusedContacts.php b/src/Worker/RemoveUnusedContacts.php index f90abe369..a781a490a 100644 --- a/src/Worker/RemoveUnusedContacts.php +++ b/src/Worker/RemoveUnusedContacts.php @@ -36,11 +36,9 @@ class RemoveUnusedContacts { $condition = ["`uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?) AND (NOT `network` IN (?, ?, ?, ?, ?, ?) OR (`archive` AND `success_update` < UTC_TIMESTAMP() - INTERVAL ? DAY)) - AND NOT `id` IN (SELECT `author-id` FROM `item`) AND NOT `id` IN (SELECT `owner-id` FROM `item`) - AND NOT `id` IN (SELECT `causer-id` FROM `item`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`) - AND NOT `id` IN (SELECT `contact-id` FROM `item`) AND NOT `id` IN (SELECT `author-id` FROM `post-thread`) - AND NOT `id` IN (SELECT `owner-id` FROM `post-thread`) AND NOT `id` IN (SELECT `causer-id` FROM `post-thread`) - AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`) + AND NOT `id` IN (SELECT `author-id` FROM `post-user`) AND NOT `id` IN (SELECT `owner-id` FROM `post-user`) + AND NOT `id` IN (SELECT `causer-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`) + AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`) AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)", 0, 0, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Protocol::ACTIVITYPUB, 365]; @@ -54,6 +52,26 @@ class RemoveUnusedContacts DBA::delete('thread', ['owner-id' => $contact['id']]); DBA::delete('thread', ['author-id' => $contact['id']]); } + if (DBStructure::existsTable('item')) { + DBA::delete('item', ['owner-id' => $contact['id']]); + DBA::delete('item', ['author-id' => $contact['id']]); + DBA::delete('item', ['causer-id' => $contact['id']]); + } + + // There should be none entry for the contact in these tables when none was found in "post-user". + // But we want to be sure since the foreign key prohibits deletion otherwise. + DBA::delete('post', ['owner-id' => $contact['id']]); + DBA::delete('post', ['author-id' => $contact['id']]); + DBA::delete('post', ['causer-id' => $contact['id']]); + + DBA::delete('post-thread', ['owner-id' => $contact['id']]); + DBA::delete('post-thread', ['author-id' => $contact['id']]); + DBA::delete('post-thread', ['causer-id' => $contact['id']]); + + DBA::delete('post-thread-user', ['owner-id' => $contact['id']]); + DBA::delete('post-thread-user', ['author-id' => $contact['id']]); + DBA::delete('post-thread-user', ['causer-id' => $contact['id']]); + DBA::delete('contact', ['id' => $contact['id']]); if ((++$count % 1000) == 0) { Logger::notice('In removal', ['count' => $count, 'total' => $total]); diff --git a/src/Worker/RepairDatabase.php b/src/Worker/RepairDatabase.php deleted file mode 100644 index ef9035d89..000000000 --- a/src/Worker/RepairDatabase.php +++ /dev/null @@ -1,68 +0,0 @@ -. - * - */ - -namespace Friendica\Worker; - -use Friendica\Database\DBA; -use Friendica\Model\ItemURI; - -/** - * Do some repairs in database entries - * @todo This class can be deleted without replacement when the item table is removed - */ -class RepairDatabase -{ - public static function execute() - { - // Ensure that there are no "uri-id", "parent-uri-id" or "thr-parent-id" fields that are NULL - $items = DBA::select('item', ['id', 'uri', 'guid'], ["`uri-id` IS NULL"]); - while ($item = DBA::fetch($items)) { - $uriid = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); - DBA::update('item', ['uri-id' => $uriid], ['id' => $item['id']]); - } - DBA::close($items); - - $items = DBA::select('item', ['id', 'parent-uri'], ["`parent-uri-id` IS NULL"]); - while ($item = DBA::fetch($items)) { - $uriid = ItemURI::getIdByURI($item['parent-uri']); - DBA::update('item', ['parent-uri-id' => $uriid], ['id' => $item['id']]); - } - DBA::close($items); - - $items = DBA::select('item', ['id', 'thr-parent'], ["`thr-parent-id` IS NULL"]); - while ($item = DBA::fetch($items)) { - $uriid = ItemURI::getIdByURI($item['thr-parent']); - DBA::update('item', ['thr-parent-id' => $uriid], ['id' => $item['id']]); - } - DBA::close($items); - - // Ensure that all uri-id are set correctly - DBA::e("UPDATE `item` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item`.`uri` - SET `uri-id` = `item-uri`.`id` WHERE `item`.`uri-id` != `item-uri`.`id` AND `item`.`uri` != ?", ''); - DBA::e("UPDATE `item` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item`.`parent-uri` - SET `parent-uri-id` = `item-uri`.`id` WHERE `item`.`parent-uri-id` != `item-uri`.`id` AND `item`.`parent-uri` != ?", ''); - DBA::e("UPDATE `item` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item`.`thr-parent` - SET `thr-parent-id` = `item-uri`.`id` WHERE `item`.`thr-parent-id` != `item-uri`.`id` AND `item`.`thr-parent` != ?", ''); - - // Delete orphaned data from notify table. - DBA::e("DELETE FROM `notify` WHERE NOT `type` IN (1, 2, 16, 32, 512) AND NOT `iid` IN (SELECT `id` FROM `item`)"); - } -} diff --git a/src/Worker/UpdateContacts.php b/src/Worker/UpdateContacts.php index c1f38a3b4..699e0f5ab 100644 --- a/src/Worker/UpdateContacts.php +++ b/src/Worker/UpdateContacts.php @@ -51,8 +51,8 @@ class UpdateContacts // Add every contact our system interacted with and hadn't been updated for a week if unarchived // or for a month if archived. - $condition = DBA::mergeConditions($base_condition, ["(`id` IN (SELECT `author-id` FROM `item`) OR - `id` IN (SELECT `owner-id` FROM `item`) OR `id` IN (SELECT `causer-id` FROM `item`) OR + $condition = DBA::mergeConditions($base_condition, ["(`id` IN (SELECT `author-id` FROM `post-user`) OR + `id` IN (SELECT `owner-id` FROM `post-user`) OR `id` IN (SELECT `causer-id` FROM `post-user`) OR `id` IN (SELECT `cid` FROM `post-tag`) OR `id` IN (SELECT `cid` FROM `user-contact`) OR `uid` != ?) AND (`last-update` < ? OR (NOT `archive` AND `last-update` < ?))", 0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]); diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index b91cd8a93..f61262105 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1092,6 +1092,7 @@ return [ "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the parent uri"], "thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"], + "external-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the external uri"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."], "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"], "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"], @@ -1111,6 +1112,7 @@ return [ "PRIMARY" => ["uri-id"], "parent-uri-id" => ["parent-uri-id"], "thr-parent-id" => ["thr-parent-id"], + "external-id" => ["external-id"], "owner-id" => ["owner-id"], "author-id" => ["author-id"], "causer-id" => ["causer-id"], @@ -1243,6 +1245,7 @@ return [ "uri-id" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the parent uri"], "thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"], + "external-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the external uri"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."], "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"], "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"], @@ -1279,6 +1282,7 @@ return [ "uid_wall" => ["uid", "wall"], "parent-uri-id" => ["parent-uri-id"], "thr-parent-id" => ["thr-parent-id"], + "external-id" => ["external-id"], "owner-id" => ["owner-id"], "author-id" => ["author-id"], "causer-id" => ["causer-id"], diff --git a/static/dbview.config.php b/static/dbview.config.php index cd1e81d32..eba31db6a 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -40,10 +40,11 @@ "post-view" => [ "fields" => [ "id" => ["item", "id"], - "item_id" => ["item", "id"], + "item-id" => ["item", "id"], "post-user-id" => ["post-user", "id"], "uid" => ["post-user", "uid"], "parent" => ["item", "parent"], + "parent-user-id" => ["parent-post", "id"], "uri" => ["item-uri", "uri"], "uri-id" => ["post-user", "uri-id"], "parent-uri" => ["parent-item-uri", "uri"], @@ -53,7 +54,8 @@ "guid" => ["item-uri", "guid"], "wall" => ["post-user", "wall"], "gravity" => ["post-user", "gravity"], - "extid" => ["item", "extid"], + "extid" => ["external-item-uri", "uri"], + "external-id" => ["post-user", "external-id"], "created" => ["post-user", "created"], "edited" => ["post-user", "edited"], "commented" => ["post-thread-user", "commented"], @@ -182,11 +184,12 @@ 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` + 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`" @@ -194,10 +197,12 @@ "post-thread-view" => [ "fields" => [ "id" => ["item", "id"], + "item-id" => ["item", "id"], "iid" => ["item", "id"], - "item_id" => ["item", "id"], + "post-user-id" => ["post-user", "id"], "uid" => ["post-thread-user", "uid"], "parent" => ["item", "parent"], + "parent-user-id" => ["parent-post", "id"], "uri" => ["item-uri", "uri"], "uri-id" => ["post-thread-user", "uri-id"], "parent-uri" => ["parent-item-uri", "uri"], @@ -207,7 +212,8 @@ "guid" => ["item-uri", "guid"], "wall" => ["post-thread-user", "wall"], "gravity" => ["post-user", "gravity"], - "extid" => ["item", "extid"], + "extid" => ["external-item-uri", "uri"], + "external-id" => ["post-user", "external-id"], "created" => ["post-thread-user", "created"], "edited" => ["post-user", "edited"], "commented" => ["post-thread-user", "commented"], @@ -329,15 +335,16 @@ ], "query" => "FROM `post-thread-user` INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id` - INNER JOIN `item` ON `item`.`uri-id` = `post-thread-user`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` + 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` - LEFT JOIN `item-uri` ON `item-uri`.`id` = `post-user`.`uri-id` - LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post-user`.`thr-parent-id` - LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post-user`.`parent-uri-id` - LEFT JOIN `verb` ON `verb`.`id` = `post-user`.`vid` + 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` @@ -350,22 +357,17 @@ "fields" => [ "uri-id" => ["post-category", "uri-id"], "uid" => ["post-category", "uid"], - "uri" => ["item-uri", "uri"], - "guid" => ["item-uri", "guid"], "type" => ["post-category", "type"], "tid" => ["post-category", "tid"], "name" => ["tag", "name"], "url" => ["tag", "url"], ], "query" => "FROM `post-category` - INNER JOIN `item-uri` ON `item-uri`.id = `post-category`.`uri-id` LEFT JOIN `tag` ON `post-category`.`tid` = `tag`.`id`" ], "tag-view" => [ "fields" => [ "uri-id" => ["post-tag", "uri-id"], - "uri" => ["item-uri", "uri"], - "guid" => ["item-uri", "guid"], "type" => ["post-tag", "type"], "tid" => ["post-tag", "tid"], "cid" => ["post-tag", "cid"], @@ -373,35 +375,34 @@ "url" => "CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END", ], "query" => "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`" ], "network-item-view" => [ "fields" => [ - "uri-id" => ["item", "parent-uri-id"], - "uri" => ["item", "parent-uri"], + "uri-id" => ["post-user", "uri-id"], "parent" => ["item", "parent"], - "received" => ["item", "received"], - "commented" => ["item", "commented"], - "created" => ["item", "created"], - "uid" => ["item", "uid"], - "starred" => ["item", "starred"], - "mention" => ["item", "mention"], - "network" => ["item", "network"], - "unseen" => ["item", "unseen"], - "gravity" => ["item", "gravity"], - "contact-id" => ["item", "contact-id"], + "parent-uri-id" => ["post-user", "parent-uri-id"], + "received" => ["post-user", "received"], + "commented" => ["post-thread-user", "commented"], + "created" => ["post-user", "created"], + "uid" => ["post-user", "uid"], + "starred" => ["post-thread-user", "starred"], + "mention" => ["post-thread-user", "mention"], + "network" => ["post-user", "network"], + "unseen" => ["post-user", "unseen"], + "gravity" => ["post-user", "gravity"], + "contact-id" => ["post-user", "contact-id"], "contact-type" => ["ownercontact", "contact-type"], ], - "query" => "FROM `item` - INNER JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` - STRAIGHT_JOIN `contact` ON `contact`.`id` = `parent-item`.`contact-id` - LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `parent-item`.`uid` - LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `parent-item`.`uid` AND `author`.`cid` = `parent-item`.`author-id` - LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `parent-item`.`uid` AND `owner`.`cid` = `parent-item`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `parent-item`.`owner-id` - WHERE `parent-item`.`visible` AND NOT `parent-item`.`deleted` + "query" => "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-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` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -409,28 +410,27 @@ ], "network-thread-view" => [ "fields" => [ - "uri-id" => ["post-thread", "uri-id"], - "uri" => ["item", "uri"], - "parent-uri-id" => ["item", "parent-uri-id"], + "uri-id" => ["post-thread-user", "uri-id"], + "parent-uri-id" => ["post-user", "parent-uri-id"], "parent" => ["item", "id"], - "received" => ["post-thread", "received"], - "commented" => ["post-thread", "commented"], - "created" => ["post-thread", "created"], + "received" => ["post-thread-user", "received"], + "commented" => ["post-thread-user", "commented"], + "created" => ["post-thread-user", "created"], "uid" => ["post-thread-user", "uid"], "starred" => ["post-thread-user", "starred"], "mention" => ["post-thread-user", "mention"], - "network" => ["post-thread", "network"], + "network" => ["post-thread-user", "network"], "contact-id" => ["post-thread-user", "contact-id"], "contact-type" => ["ownercontact", "contact-type"], ], - "query" => "FROM `post-thread` - STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id` - STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` + "query" => "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` 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`.`author-id` - LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread`.`owner-id` - WHERE `item`.`visible` AND NOT `item`.`deleted` + 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` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -592,20 +592,17 @@ "tag-search-view" => [ "fields" => [ "uri-id" => ["post-tag", "uri-id"], - "iid" => ["item", "id"], - "uri" => ["item", "uri"], - "guid" => ["item", "guid"], - "uid" => ["item", "uid"], - "private" => ["item", "private"], - "wall" => ["item", "wall"], - "origin" => ["item", "origin"], - "gravity" => ["item", "gravity"], - "received" => ["item", "received"], + "uid" => ["post-user", "uid"], + "private" => ["post-user", "private"], + "wall" => ["post-user", "wall"], + "origin" => ["post-user", "origin"], + "gravity" => ["post-user", "gravity"], + "received" => ["post-user", "received"], "name" => ["tag", "name"], ], "query" => "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" ], "workerqueue-view" => [ diff --git a/static/defaults.config.php b/static/defaults.config.php index e11e4c5c8..91a048b94 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -405,10 +405,6 @@ return [ // Don't show smilies. 'no_smilies' => false, - // optimize_items (Boolean) - // Triggers an SQL command to optimize the item table before expiring items. - 'optimize_items' => false, - // paranoia (Boolean) // Log out users if their IP address changed. 'paranoia' => false,