X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=202d5365523d77b093bc95ef0ad8ff11ffe55683;hb=5b2a006c7098a2c1a9f6b5180abf75afd1330972;hp=52a1d7eeb47a5b479d13e73c74afa2ab727b7495;hpb=ce6ad1aa73885196ce5393a910d1b57774a940d4;p=friendica.git diff --git a/database.sql b/database.sql index 52a1d7eeb4..202d536552 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 2021.03-dev (Red Hot Poker) --- DB_UPDATE_VERSION 1400 +-- Friendica 2021.06-rc (Siberian Iris) +-- DB_UPDATE_VERSION 1420 -- ------------------------------------------ @@ -33,7 +33,8 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `next_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Next connection request', PRIMARY KEY(`id`), UNIQUE INDEX `nurl` (`nurl`(190)), - INDEX `next_contact` (`next_contact`) + INDEX `next_contact` (`next_contact`), + INDEX `network` (`network`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers'; -- @@ -88,6 +89,8 @@ CREATE TABLE IF NOT EXISTS `user` ( PRIMARY KEY(`uid`), INDEX `nickname` (`nickname`(32)), INDEX `parent-uid` (`parent-uid`), + INDEX `guid` (`guid`), + INDEX `email` (`email`(64)), FOREIGN KEY (`parent-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users'; @@ -183,6 +186,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( INDEX `blocked_uid` (`blocked`,`uid`), INDEX `uid_rel_network_poll` (`uid`,`rel`,`network`,`poll`(64),`archive`), INDEX `uid_network_batch` (`uid`,`network`,`batch`(64)), + INDEX `batch_contact-type` (`batch`(64),`contact-type`), INDEX `addr_uid` (`addr`(128),`uid`), INDEX `nurl_uid` (`nurl`(128),`uid`), INDEX `nick_uid` (`nick`(128),`uid`), @@ -192,6 +196,10 @@ CREATE TABLE IF NOT EXISTS `contact` ( INDEX `network_uid_lastupdate` (`network`,`uid`,`last-update`), INDEX `uid_network_self_lastupdate` (`uid`,`network`,`self`,`last-update`), INDEX `uid_lastitem` (`uid`,`last-item`), + INDEX `baseurl` (`baseurl`(64)), + INDEX `uid_contact-type` (`uid`,`contact-type`), + INDEX `uid_self_contact-type` (`uid`,`self`,`contact-type`), + INDEX `self_network_uid` (`self`,`network`,`uid`), INDEX `gsid` (`gsid`), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT @@ -257,7 +265,8 @@ CREATE TABLE IF NOT EXISTS `permissionset` ( CREATE TABLE IF NOT EXISTS `verb` ( `id` smallint unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL DEFAULT '' COMMENT '', - PRIMARY KEY(`id`) + PRIMARY KEY(`id`), + INDEX `name` (`name`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activity Verbs'; -- @@ -313,6 +322,7 @@ CREATE TABLE IF NOT EXISTS `addon` ( `timestamp` int unsigned NOT NULL DEFAULT 0 COMMENT 'file timestamp to check for reloads', `plugin_admin` boolean NOT NULL DEFAULT '0' COMMENT '1 = has admin config, 0 = has no admin config', PRIMARY KEY(`id`), + INDEX `installed_name` (`installed`,`name`), UNIQUE INDEX `name` (`name`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons'; @@ -354,6 +364,45 @@ CREATE TABLE IF NOT EXISTS `apcontact` ( FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation'; +-- +-- TABLE application +-- +CREATE TABLE IF NOT EXISTS `application` ( + `id` int unsigned NOT NULL auto_increment COMMENT 'generated index', + `client_id` varchar(64) NOT NULL COMMENT '', + `client_secret` varchar(64) NOT NULL COMMENT '', + `name` varchar(255) NOT NULL COMMENT '', + `redirect_uri` varchar(255) NOT NULL COMMENT '', + `website` varchar(255) COMMENT '', + `scopes` varchar(255) COMMENT '', + `read` boolean COMMENT 'Read scope', + `write` boolean COMMENT 'Write scope', + `follow` boolean COMMENT 'Follow scope', + `push` boolean COMMENT 'Push scope', + PRIMARY KEY(`id`), + UNIQUE INDEX `client_id` (`client_id`) +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth application'; + +-- +-- TABLE application-token +-- +CREATE TABLE IF NOT EXISTS `application-token` ( + `application-id` int unsigned NOT NULL COMMENT '', + `uid` mediumint unsigned NOT NULL COMMENT 'Owner User id', + `code` varchar(64) NOT NULL COMMENT '', + `access_token` varchar(64) NOT NULL COMMENT '', + `created_at` datetime NOT NULL COMMENT 'creation time', + `scopes` varchar(255) COMMENT '', + `read` boolean COMMENT 'Read scope', + `write` boolean COMMENT 'Write scope', + `follow` boolean COMMENT 'Follow scope', + `push` boolean COMMENT 'Push scope', + PRIMARY KEY(`application-id`,`uid`), + INDEX `uid_id` (`uid`,`application-id`), + FOREIGN KEY (`application-id`) REFERENCES `application` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth user token'; + -- -- TABLE attach -- @@ -414,7 +463,8 @@ CREATE TABLE IF NOT EXISTS `challenge` ( `expire` int unsigned NOT NULL DEFAULT 0 COMMENT '', `type` varchar(255) NOT NULL DEFAULT '' COMMENT '', `last_update` varchar(255) NOT NULL DEFAULT '' COMMENT '', - PRIMARY KEY(`id`) + PRIMARY KEY(`id`), + INDEX `expire` (`expire`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; -- @@ -627,6 +677,7 @@ CREATE TABLE IF NOT EXISTS `hook` ( `function` varbinary(200) NOT NULL DEFAULT '' COMMENT 'function name of hook handler', `priority` smallint unsigned NOT NULL DEFAULT 0 COMMENT 'not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order', PRIMARY KEY(`id`), + INDEX `priority` (`priority`), UNIQUE INDEX `hook_file_function` (`hook`,`file`,`function`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='addon hook registry'; @@ -676,127 +727,6 @@ CREATE TABLE IF NOT EXISTS `intro` ( FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; --- --- TABLE item --- -CREATE TABLE IF NOT EXISTS `item` ( - `id` int unsigned NOT NULL auto_increment, - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this item', - `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri', - `parent` int unsigned COMMENT 'item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item', - `parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT 'uri of the top-level parent to this item', - `parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the top-level parent uri', - `thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT 'If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri', - `thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent 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)', - `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last comment/reply to this item', - `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime', - `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', - `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', - `vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs', - `extid` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)', - `global` boolean NOT NULL DEFAULT '0' COMMENT '', - `private` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0=public, 1=private, 2=unlisted', - `visible` boolean NOT NULL DEFAULT '0' COMMENT '', - `deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been deleted', - `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item', - `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id', - `unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen', - `origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site', - `psid` int unsigned COMMENT 'ID of the permission set of this post', - `starred` boolean NOT NULL DEFAULT '0' COMMENT 'item has been favourited', - `wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid', - `pubmail` boolean NOT NULL DEFAULT '0' COMMENT '', - `forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', - `event-id` int unsigned COMMENT 'Used to link to the event.id', - `mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it', - `bookmark` boolean COMMENT 'Deprecated', - `type` varchar(20) COMMENT 'Deprecated', - `moderated` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated', - `resource-id` varchar(32) COMMENT 'Deprecated', - `uri-hash` varchar(80) COMMENT 'Deprecated', - `iaid` int unsigned COMMENT 'Deprecated', - `icid` int unsigned COMMENT 'Deprecated', - `attach` mediumtext COMMENT 'Deprecated', - `allow_cid` mediumtext COMMENT 'Deprecated', - `allow_gid` mediumtext COMMENT 'Deprecated', - `deny_cid` mediumtext COMMENT 'Deprecated', - `deny_gid` mediumtext COMMENT 'Deprecated', - `postopts` text COMMENT 'Deprecated', - `inform` mediumtext COMMENT 'Deprecated', - `file` mediumtext COMMENT 'Deprecated', - `location` varchar(255) COMMENT 'Deprecated', - `coord` varchar(255) COMMENT 'Deprecated', - `tag` mediumtext COMMENT 'Deprecated', - `plink` varchar(255) COMMENT 'Deprecated', - `title` varchar(255) COMMENT 'Deprecated', - `content-warning` varchar(255) COMMENT 'Deprecated', - `body` mediumtext COMMENT 'Deprecated', - `app` varchar(255) COMMENT 'Deprecated', - `verb` varchar(100) COMMENT 'Deprecated', - `object-type` varchar(100) COMMENT 'Deprecated', - `object` text COMMENT 'Deprecated', - `target-type` varchar(100) COMMENT 'Deprecated', - `target` text COMMENT 'Deprecated', - `author-name` varchar(255) COMMENT 'Deprecated', - `author-link` varchar(255) COMMENT 'Deprecated', - `author-avatar` varchar(255) COMMENT 'Deprecated', - `owner-name` varchar(255) COMMENT 'Deprecated', - `owner-link` varchar(255) COMMENT 'Deprecated', - `owner-avatar` varchar(255) COMMENT 'Deprecated', - `rendered-hash` varchar(32) COMMENT 'Deprecated', - `rendered-html` mediumtext COMMENT 'Deprecated', - PRIMARY KEY(`id`), - INDEX `guid` (`guid`(191)), - INDEX `uri` (`uri`(191)), - INDEX `parent` (`parent`), - INDEX `parent-uri` (`parent-uri`(191)), - INDEX `extid` (`extid`(191)), - INDEX `uid_id` (`uid`,`id`), - INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`), - INDEX `uid_received` (`uid`,`received`), - INDEX `uid_commented` (`uid`,`commented`), - INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), - INDEX `uid_network_received` (`uid`,`network`,`received`), - INDEX `uid_network_commented` (`uid`,`network`,`commented`), - INDEX `uid_thrparent` (`uid`,`thr-parent`(190)), - INDEX `uid_parenturi` (`uid`,`parent-uri`(190)), - INDEX `uid_contactid_received` (`uid`,`contact-id`,`received`), - INDEX `authorid_received` (`author-id`,`received`), - INDEX `ownerid` (`owner-id`), - INDEX `contact-id` (`contact-id`), - INDEX `uid_uri` (`uid`,`uri`(190)), - INDEX `resource-id` (`resource-id`), - INDEX `deleted_changed` (`deleted`,`changed`), - INDEX `uid_wall_changed` (`uid`,`wall`,`changed`), - INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`), - INDEX `mention_uid_id` (`mention`,`uid`,`id`), - INDEX `uid_eventid` (`uid`,`event-id`), - INDEX `vid` (`vid`), - INDEX `psid_wall` (`psid`,`wall`), - INDEX `uri-id` (`uri-id`), - INDEX `parent-uri-id` (`parent-uri-id`), - INDEX `thr-parent-id` (`thr-parent-id`), - INDEX `causer-id` (`causer-id`), - 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 (`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 (`psid`) REFERENCES `permissionset` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT -) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts'; - -- -- TABLE locks -- @@ -821,6 +751,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `from-photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender', `from-url` varchar(255) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender', `contact-id` varchar(255) COMMENT 'contact.id', + `author-id` int unsigned COMMENT 'Link to the contact table with uid=0 of the author of the mail', `convid` int unsigned COMMENT 'conv.id', `title` varchar(255) NOT NULL DEFAULT '' COMMENT '', `body` mediumtext COMMENT '', @@ -829,7 +760,11 @@ CREATE TABLE IF NOT EXISTS `mail` ( `replied` boolean NOT NULL DEFAULT '0' COMMENT '', `unknown` boolean NOT NULL DEFAULT '0' COMMENT 'if sender not in the contact table this is 1', `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `uri-id` int unsigned COMMENT 'Item-uri id of the related mail', `parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related mail', + `thr-parent` varchar(255) COMMENT '', + `thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent uri', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time of the private message', PRIMARY KEY(`id`), INDEX `uid_seen` (`uid`,`seen`), @@ -837,7 +772,15 @@ CREATE TABLE IF NOT EXISTS `mail` ( INDEX `uri` (`uri`(64)), INDEX `parent-uri` (`parent-uri`(64)), INDEX `contactid` (`contact-id`(32)), - FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE + INDEX `author-id` (`author-id`), + INDEX `uri-id` (`uri-id`), + INDEX `parent-uri-id` (`parent-uri-id`), + INDEX `thr-parent-id` (`thr-parent-id`), + FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT, + 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 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='private messages'; -- @@ -889,7 +832,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `msg` mediumtext COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `link` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `iid` int unsigned COMMENT 'item.id', + `iid` int unsigned COMMENT '', `parent` int unsigned COMMENT '', `uri-id` int unsigned COMMENT 'Item-uri id of the related post', `parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post', @@ -915,17 +858,15 @@ CREATE TABLE IF NOT EXISTS `notify` ( CREATE TABLE IF NOT EXISTS `notify-threads` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `notify-id` int unsigned NOT NULL DEFAULT 0 COMMENT '', - `master-parent-item` int unsigned COMMENT '', + `master-parent-item` int unsigned COMMENT 'Deprecated', `master-parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post', `parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '', `receiver-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', PRIMARY KEY(`id`), - INDEX `master-parent-item` (`master-parent-item`), INDEX `master-parent-uri-id` (`master-parent-uri-id`), INDEX `receiver-uid` (`receiver-uid`), INDEX `notify-id` (`notify-id`), FOREIGN KEY (`notify-id`) REFERENCES `notify` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, - FOREIGN KEY (`master-parent-item`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`master-parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`receiver-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; @@ -961,13 +902,16 @@ CREATE TABLE IF NOT EXISTS `openwebauth-token` ( -- TABLE parsed_url -- CREATE TABLE IF NOT EXISTS `parsed_url` ( - `url` varbinary(255) NOT NULL COMMENT 'page url', + `url_hash` binary(64) NOT NULL COMMENT 'page url hash', `guessing` boolean NOT NULL DEFAULT '0' COMMENT 'is the \'guessing\' mode active?', `oembed` boolean NOT NULL DEFAULT '0' COMMENT 'is the data the result of oembed?', + `url` text NOT NULL COMMENT 'page url', `content` mediumtext COMMENT 'page data', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation', - PRIMARY KEY(`url`,`guessing`,`oembed`), - INDEX `created` (`created`) + `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of expiration', + PRIMARY KEY(`url_hash`,`guessing`,`oembed`), + INDEX `created` (`created`), + INDEX `expires` (`expires`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='cache for \'parse_url\' queries'; -- @@ -1033,6 +977,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', @@ -1040,8 +985,8 @@ CREATE TABLE IF NOT EXISTS `post` ( `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, ...)', + `causer-id` int unsigned 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, image, article, ...)', `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 '', @@ -1050,6 +995,7 @@ 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`), @@ -1057,6 +1003,7 @@ CREATE TABLE IF NOT EXISTS `post` ( 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, @@ -1102,6 +1049,7 @@ CREATE TABLE IF NOT EXISTS `post-content` ( `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', PRIMARY KEY(`uri-id`), INDEX `plink` (`plink`(191)), + INDEX `resource-id` (`resource-id`), FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts'; @@ -1141,6 +1089,13 @@ CREATE TABLE IF NOT EXISTS `post-media` ( `preview-height` smallint unsigned COMMENT 'Height of the preview picture', `preview-width` smallint unsigned COMMENT 'Width of the preview picture', `description` text COMMENT '', + `name` varchar(255) COMMENT 'Name of the media', + `author-url` varbinary(255) COMMENT 'URL of the author of the media', + `author-name` varchar(255) COMMENT 'Name of the author of the media', + `author-image` varbinary(255) COMMENT 'Image of the author of the media', + `publisher-url` varbinary(255) COMMENT 'URL of the publisher of the media', + `publisher-name` varchar(255) COMMENT 'Name of the publisher of the media', + `publisher-image` varbinary(255) COMMENT 'Image of the publisher of the media', PRIMARY KEY(`id`), UNIQUE INDEX `uri-id-url` (`uri-id`,`url`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE @@ -1169,7 +1124,7 @@ CREATE TABLE IF NOT EXISTS `post-thread` ( `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri', `owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner', `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author', - `causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation', + `causer-id` int unsigned 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 '', @@ -1181,7 +1136,6 @@ CREATE TABLE IF NOT EXISTS `post-thread` ( INDEX `causer-id` (`causer-id`), INDEX `received` (`received`), INDEX `commented` (`commented`), - INDEX `changed` (`changed`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT, FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT, @@ -1194,6 +1148,24 @@ 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 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, image, article, ...)', + `post-reason` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Reason why the post arrived at the user', + `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', @@ -1207,12 +1179,31 @@ CREATE TABLE IF NOT EXISTS `post-user` ( PRIMARY KEY(`id`), UNIQUE INDEX `uid_uri-id` (`uid`,`uri-id`), INDEX `uri-id` (`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 `contact-id` (`contact-id`), - INDEX `psid` (`psid`), - INDEX `uid_hidden` (`uid`,`hidden`), INDEX `event-id` (`event-id`), - INDEX `uid_wall` (`uid`,`wall`), + INDEX `psid` (`psid`), + INDEX `author-id_uid` (`author-id`,`uid`), + INDEX `author-id_received` (`author-id`,`received`), + INDEX `parent-uri-id_uid` (`parent-uri-id`,`uid`), + INDEX `uid_contactid` (`uid`,`contact-id`), + INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), + INDEX `uid_unseen` (`uid`,`unseen`), + INDEX `uid_hidden_uri-id` (`uid`,`hidden`,`uri-id`), 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 +1215,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 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 '', @@ -1239,13 +1238,24 @@ CREATE TABLE IF NOT EXISTS `post-thread-user` ( `psid` int unsigned COMMENT 'ID of the permission set of this post', `post-user-id` int unsigned COMMENT 'Id of the post-user table', PRIMARY KEY(`uid`,`uri-id`), - INDEX `uid_wall` (`uid`,`wall`), - INDEX `uid_pinned` (`uid`,`pinned`), INDEX `uri-id` (`uri-id`), + INDEX `owner-id` (`owner-id`), + INDEX `author-id` (`author-id`), + INDEX `causer-id` (`causer-id`), + INDEX `uid` (`uid`), INDEX `contact-id` (`contact-id`), INDEX `psid` (`psid`), INDEX `post-user-id` (`post-user-id`), + INDEX `commented` (`commented`), + INDEX `uid_received` (`uid`,`received`), + INDEX `uid_pinned` (`uid`,`pinned`), + INDEX `uid_commented` (`uid`,`commented`), + INDEX `uid_starred` (`uid`,`starred`), + INDEX `uid_mention` (`uid`,`mention`), 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, @@ -1409,7 +1419,8 @@ CREATE TABLE IF NOT EXISTS `search` ( `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `term` varchar(255) NOT NULL DEFAULT '' COMMENT '', PRIMARY KEY(`id`), - INDEX `uid` (`uid`), + INDEX `uid_term` (`uid`,`term`(64)), + INDEX `term` (`term`(64)), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; @@ -1512,45 +1523,71 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( ) 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`, +-- VIEW application-view +-- +DROP VIEW IF EXISTS `application-view`; +CREATE VIEW `application-view` AS SELECT + `application`.`id` AS `id`, + `application-token`.`uid` AS `uid`, + `application`.`name` AS `name`, + `application`.`redirect_uri` AS `redirect_uri`, + `application`.`website` AS `website`, + `application`.`client_id` AS `client_id`, + `application`.`client_secret` AS `client_secret`, + `application-token`.`code` AS `code`, + `application-token`.`access_token` AS `access_token`, + `application-token`.`created_at` AS `created_at`, + `application-token`.`scopes` AS `scopes`, + `application-token`.`read` AS `read`, + `application-token`.`write` AS `write`, + `application-token`.`follow` AS `follow`, + `application-token`.`push` AS `push` + FROM `application-token` + INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`; + +-- +-- VIEW post-user-view +-- +DROP VIEW IF EXISTS `post-user-view`; +CREATE VIEW `post-user-view` AS SELECT + `post-user`.`id` AS `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-user`.`uid` AS `uid`, + `parent-post`.`id` AS `parent`, + `item-uri`.`uri` AS `uri`, + `post-user`.`uri-id` AS `uri-id`, + `parent-item-uri`.`uri` AS `parent-uri`, + `post-user`.`parent-uri-id` AS `parent-uri-id`, + `thr-parent-item-uri`.`uri` AS `thr-parent`, + `post-user`.`thr-parent-id` AS `thr-parent-id`, + `item-uri`.`guid` AS `guid`, + `post-user`.`wall` AS `wall`, + `post-user`.`gravity` AS `gravity`, + `external-item-uri`.`uri` AS `extid`, + `post-user`.`external-id` AS `external-id`, + `post-user`.`created` AS `created`, + `post-user`.`edited` AS `edited`, + `post-thread-user`.`commented` AS `commented`, + `post-user`.`received` AS `received`, + `post-thread-user`.`changed` AS `changed`, + `post-user`.`post-type` AS `post-type`, + `post-user`.`post-reason` AS `post-reason`, + `post-user`.`private` AS `private`, + `post-thread-user`.`pubmail` AS `pubmail`, + `post-user`.`visible` AS `visible`, + `post-thread-user`.`starred` AS `starred`, + `post-thread-user`.`pinned` AS `pinned`, + `post-user`.`unseen` AS `unseen`, + `post-user`.`deleted` AS `deleted`, + `post-user`.`origin` AS `origin`, + `post-thread-user`.`origin` AS `parent-origin`, + `post-thread-user`.`forum_mode` AS `forum_mode`, + `post-thread-user`.`mention` AS `mention`, + `post-user`.`global` AS `global`, + `post-user`.`network` AS `network`, + `post-user`.`vid` AS `vid`, + `post-user`.`psid` AS `psid`, + IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, `post-content`.`title` AS `title`, `post-content`.`content-warning` AS `content-warning`, `post-content`.`raw-body` AS `raw-body`, @@ -1567,7 +1604,7 @@ CREATE VIEW `post-view` AS SELECT `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`, + `post-user`.`contact-id` AS `contact-id`, `contact`.`url` AS `contact-link`, `contact`.`addr` AS `contact-addr`, `contact`.`name` AS `contact-name`, @@ -1582,7 +1619,7 @@ CREATE VIEW `post-view` AS SELECT `contact`.`rel` AS `contact-rel`, `contact`.`uid` AS `contact-uid`, `contact`.`contact-type` AS `contact-contact-type`, - IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`, + IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`, `contact`.`self` AS `self`, `contact`.`id` AS `cid`, `contact`.`alias` AS `alias`, @@ -1592,7 +1629,7 @@ CREATE VIEW `post-view` AS SELECT `contact`.`avatar-date` AS `avatar-date`, `contact`.`thumb` AS `thumb`, `contact`.`dfrn-id` AS `dfrn-id`, - `item`.`author-id` AS `author-id`, + `post-user`.`author-id` AS `author-id`, `author`.`url` AS `author-link`, `author`.`addr` AS `author-addr`, IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`, @@ -1601,7 +1638,7 @@ CREATE VIEW `post-view` AS SELECT `author`.`network` AS `author-network`, `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, - `item`.`owner-id` AS `owner-id`, + `post-user`.`owner-id` AS `owner-id`, `owner`.`url` AS `owner-link`, `owner`.`addr` AS `owner-addr`, IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`, @@ -1610,7 +1647,8 @@ CREATE VIEW `post-view` AS SELECT `owner`.`network` AS `owner-network`, `owner`.`blocked` AS `owner-blocked`, `owner`.`hidden` AS `owner-hidden`, - `item`.`causer-id` AS `causer-id`, + `owner`.`contact-type` AS `owner-contact-type`, + `post-user`.`causer-id` AS `causer-id`, `causer`.`url` AS `causer-link`, `causer`.`addr` AS `causer-addr`, `causer`.`name` AS `causer-name`, @@ -1625,11 +1663,11 @@ CREATE VIEW `post-view` AS SELECT `post-delivery-data`.`queue_count` AS `delivery_queue_count`, `post-delivery-data`.`queue_done` AS `delivery_queue_done`, `post-delivery-data`.`queue_failed` AS `delivery_queue_failed`, - IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, - IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, - IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, - IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, - `item`.`event-id` AS `event-id`, + IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, + IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, + IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, + IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, + `post-user`.`event-id` AS `event-id`, `event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`, `event`.`start` AS `event-start`, @@ -1642,67 +1680,76 @@ CREATE VIEW `post-view` AS SELECT `event`.`adjust` AS `event-adjust`, `event`.`ignore` AS `event-ignore`, `diaspora-interaction`.`interaction` AS `signed_text`, - `parent-item`.`guid` AS `parent-guid`, - `parent-item`.`network` AS `parent-network`, - `parent-item`.`author-id` AS `parent-author-id`, - `parent-item-author`.`url` AS `parent-author-link`, - `parent-item-author`.`name` AS `parent-author-name`, - `parent-item-author`.`network` AS `parent-author-network` - FROM `item` - 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`, + `parent-item-uri`.`guid` AS `parent-guid`, + `parent-post`.`network` AS `parent-network`, + `parent-post`.`author-id` AS `parent-author-id`, + `parent-post-author`.`url` AS `parent-author-link`, + `parent-post-author`.`name` AS `parent-author-name`, + `parent-post-author`.`network` AS `parent-author-network`, + `parent-post-author`.`blocked` AS `parent-author-blocked`, + `parent-post-author`.`hidden` AS `parent-author-hidden` + 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` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-user`.`author-id` + STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-user`.`owner-id` + LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-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 `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id` + LEFT JOIN `verb` ON `verb`.`id` = `post-user`.`vid` + LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id` + LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-user`.`uri-id` + LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-user`.`uri-id` + LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-user`.`uri-id` AND `post-user`.`origin` + LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid` + LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid` + LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; + +-- +-- VIEW post-thread-user-view +-- +DROP VIEW IF EXISTS `post-thread-user-view`; +CREATE VIEW `post-thread-user-view` AS SELECT + `post-user`.`id` AS `id`, `post-user`.`id` AS `post-user-id`, - `post-user`.`uid` AS `uid`, - `item`.`parent` AS `parent`, + `post-thread-user`.`uid` AS `uid`, + `parent-post`.`id` AS `parent`, `item-uri`.`uri` AS `uri`, - `post`.`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-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-thread-user`.`wall` AS `wall`, + `post-user`.`gravity` AS `gravity`, + `external-item-uri`.`uri` AS `extid`, + `post-user`.`external-id` AS `external-id`, + `post-thread-user`.`created` AS `created`, + `post-user`.`edited` AS `edited`, + `post-thread-user`.`commented` AS `commented`, + `post-thread-user`.`received` AS `received`, + `post-thread-user`.`changed` AS `changed`, + `post-user`.`post-type` AS `post-type`, + `post-user`.`post-reason` AS `post-reason`, + `post-user`.`private` AS `private`, `post-thread-user`.`pubmail` AS `pubmail`, - `post`.`visible` AS `visible`, + `post-thread-user`.`ignored` AS `ignored`, + `post-user`.`visible` AS `visible`, `post-thread-user`.`starred` AS `starred`, - `post-user`.`unseen` AS `unseen`, - `post`.`deleted` AS `deleted`, - `post-user`.`origin` AS `origin`, + `post-thread-user`.`pinned` AS `pinned`, + `post-thread-user`.`unseen` AS `unseen`, + `post-user`.`deleted` AS `deleted`, + `post-thread-user`.`origin` AS `origin`, `post-thread-user`.`forum_mode` AS `forum_mode`, `post-thread-user`.`mention` AS `mention`, - `post`.`global` AS `global`, - `post`.`network` AS `network`, - `post`.`vid` AS `vid`, - `post-user`.`psid` AS `psid`, - IF (`post`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, + `post-user`.`global` AS `global`, + `post-thread-user`.`network` AS `network`, + `post-user`.`vid` AS `vid`, + `post-thread-user`.`psid` AS `psid`, + IF (`post-user`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, `post-content`.`title` AS `title`, `post-content`.`content-warning` AS `content-warning`, `post-content`.`raw-body` AS `raw-body`, @@ -1719,7 +1766,7 @@ CREATE VIEW `post-view2` AS SELECT `post-content`.`target-type` AS `target-type`, `post-content`.`target` AS `target`, `post-content`.`resource-id` AS `resource-id`, - `post-user`.`contact-id` AS `contact-id`, + `post-thread-user`.`contact-id` AS `contact-id`, `contact`.`url` AS `contact-link`, `contact`.`addr` AS `contact-addr`, `contact`.`name` AS `contact-name`, @@ -1734,7 +1781,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 +1791,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-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`, @@ -1753,7 +1800,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-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`, @@ -1762,7 +1809,8 @@ 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`, + `owner`.`contact-type` AS `owner-contact-type`, + `post-thread-user`.`causer-id` AS `causer-id`, `causer`.`url` AS `causer-link`, `causer`.`addr` AS `causer-addr`, `causer`.`name` AS `causer-name`, @@ -1777,10 +1825,10 @@ CREATE VIEW `post-view2` AS SELECT `post-delivery-data`.`queue_count` AS `delivery_queue_count`, `post-delivery-data`.`queue_done` AS `delivery_queue_done`, `post-delivery-data`.`queue_failed` AS `delivery_queue_failed`, - IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, - IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, - IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, - IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, + IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, + IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, + IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, + IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, `post-user`.`event-id` AS `event-id`, `event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`, @@ -1797,41 +1845,128 @@ 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` + `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` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread-user`.`author-id` + STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread-user`.`owner-id` + LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread-user`.`causer-id` + LEFT JOIN `item-uri` ON `item-uri`.`id` = `post-thread-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 `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id` + LEFT JOIN `verb` ON `verb`.`id` = `post-user`.`vid` + LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id` + LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread-user`.`uri-id` + LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread-user`.`uri-id` + LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread-user`.`uri-id` AND `post-thread-user`.`origin` + LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid` + LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-thread-user`.`uid` + LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; + +-- +-- VIEW post-view +-- +DROP VIEW IF EXISTS `post-view`; +CREATE VIEW `post-view` AS SELECT + `item-uri`.`uri` AS `uri`, + `post`.`uri-id` AS `uri-id`, + `parent-item-uri`.`uri` AS `parent-uri`, + `post`.`parent-uri-id` AS `parent-uri-id`, + `thr-parent-item-uri`.`uri` AS `thr-parent`, + `post`.`thr-parent-id` AS `thr-parent-id`, + `item-uri`.`guid` AS `guid`, + `post`.`gravity` AS `gravity`, + `external-item-uri`.`uri` AS `extid`, + `post`.`external-id` AS `external-id`, + `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`.`visible` AS `visible`, + `post`.`deleted` AS `deleted`, + `post`.`global` AS `global`, + `post`.`network` AS `network`, + `post`.`vid` AS `vid`, + IF (`post`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, + `post-content`.`title` AS `title`, + `post-content`.`content-warning` AS `content-warning`, + `post-content`.`raw-body` AS `raw-body`, + `post-content`.`body` AS `body`, + `post-content`.`rendered-hash` AS `rendered-hash`, + `post-content`.`rendered-html` AS `rendered-html`, + `post-content`.`language` AS `language`, + `post-content`.`plink` AS `plink`, + `post-content`.`location` AS `location`, + `post-content`.`coord` AS `coord`, + `post-content`.`app` AS `app`, + `post-content`.`object-type` AS `object-type`, + `post-content`.`object` AS `object`, + `post-content`.`target-type` AS `target-type`, + `post-content`.`target` AS `target`, + `post-content`.`resource-id` AS `resource-id`, + `post`.`author-id` AS `author-id`, + `author`.`url` AS `author-link`, + `author`.`addr` AS `author-addr`, + `author`.`name` AS `author-name`, + `author`.`nick` AS `author-nick`, + `author`.`thumb` AS `author-avatar`, + `author`.`network` AS `author-network`, + `author`.`blocked` AS `author-blocked`, + `author`.`hidden` AS `author-hidden`, + `post`.`owner-id` AS `owner-id`, + `owner`.`url` AS `owner-link`, + `owner`.`addr` AS `owner-addr`, + `owner`.`name` AS `owner-name`, + `owner`.`nick` AS `owner-nick`, + `owner`.`thumb` AS `owner-avatar`, + `owner`.`network` AS `owner-network`, + `owner`.`blocked` AS `owner-blocked`, + `owner`.`hidden` AS `owner-hidden`, + `owner`.`contact-type` AS `owner-contact-type`, + `post`.`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`, + `diaspora-interaction`.`interaction` AS `signed_text`, + `parent-item-uri`.`guid` AS `parent-guid`, + `parent-post`.`network` AS `parent-network`, + `parent-post`.`author-id` AS `parent-author-id`, + `parent-post-author`.`url` AS `parent-author-link`, + `parent-post-author`.`name` AS `parent-author-name`, + `parent-post-author`.`network` AS `parent-author-network` FROM `post` - 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` + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post`.`author-id` + STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post`.`owner-id` + LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post`.`causer-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 `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 `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post`.`external-id` LEFT JOIN `verb` ON `verb`.`id` = `post`.`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 `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 `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; -- -- VIEW post-thread-view -- DROP VIEW IF EXISTS `post-thread-view`; CREATE VIEW `post-thread-view` AS SELECT - `item`.`id` AS `id`, - `item`.`id` AS `iid`, - `item`.`id` AS `item_id`, - `post-thread-user`.`post-user-id` AS `post-user-id`, - `post-thread-user`.`uid` AS `uid`, - `item`.`parent` AS `parent`, `item-uri`.`uri` AS `uri`, `post-thread`.`uri-id` AS `uri-id`, `parent-item-uri`.`uri` AS `parent-uri`, @@ -1839,9 +1974,9 @@ CREATE VIEW `post-thread-view` AS SELECT `thr-parent-item-uri`.`uri` AS `thr-parent`, `post`.`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`, + `external-item-uri`.`uri` AS `extid`, + `post`.`external-id` AS `external-id`, `post-thread`.`created` AS `created`, `post`.`edited` AS `edited`, `post-thread`.`commented` AS `commented`, @@ -1849,19 +1984,11 @@ CREATE VIEW `post-thread-view` AS SELECT `post-thread`.`changed` AS `changed`, `post`.`post-type` AS `post-type`, `post`.`private` AS `private`, - `post-thread-user`.`pubmail` AS `pubmail`, - `post-thread-user`.`ignored` AS `ignored`, `post`.`visible` AS `visible`, - `post-thread-user`.`starred` AS `starred`, - `post-thread-user`.`unseen` AS `unseen`, `post`.`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-thread-user`.`psid` AS `psid`, IF (`post`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, `post-content`.`title` AS `title`, `post-content`.`content-warning` AS `content-warning`, @@ -1879,49 +2006,25 @@ CREATE VIEW `post-thread-view` AS SELECT `post-content`.`target-type` AS `target-type`, `post-content`.`target` AS `target`, `post-content`.`resource-id` AS `resource-id`, - `post-thread-user`.`contact-id` AS `contact-id`, - `contact`.`url` AS `contact-link`, - `contact`.`addr` AS `contact-addr`, - `contact`.`name` AS `contact-name`, - `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 (`post`.`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`, `post-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`.`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`.`thumb` AS `author-avatar`, `author`.`network` AS `author-network`, `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, `post-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`.`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`.`thumb` AS `owner-avatar`, `owner`.`network` AS `owner-network`, `owner`.`blocked` AS `owner-blocked`, `owner`.`hidden` AS `owner-hidden`, + `owner`.`contact-type` AS `owner-contact-type`, `post-thread`.`causer-id` AS `causer-id`, `causer`.`url` AS `causer-link`, `causer`.`addr` AS `causer-addr`, @@ -1932,54 +2035,27 @@ CREATE VIEW `post-thread-view` AS SELECT `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 (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, - IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, - IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, - IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, - `post-user`.`event-id` AS `event-id`, - `event`.`created` AS `event-created`, - `event`.`edited` AS `event-edited`, - `event`.`start` AS `event-start`, - `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-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` + `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` - 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` + INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id` + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id` + STRAIGHT_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 `item-uri` ON `item-uri`.`id` = `post-thread`.`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 `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post`.`external-id` LEFT JOIN `verb` ON `verb`.`id` = `post`.`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 `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 `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; -- -- VIEW category-view @@ -1988,14 +2064,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 +2077,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 +2091,27 @@ CREATE VIEW `tag-view` AS SELECT -- DROP VIEW IF EXISTS `network-item-view`; CREATE VIEW `network-item-view` AS SELECT - `item`.`parent-uri-id` AS `uri-id`, - `item`.`parent-uri` AS `uri`, - `item`.`parent` AS `parent`, - `item`.`received` AS `received`, - `item`.`commented` AS `commented`, - `item`.`created` AS `created`, - `item`.`uid` AS `uid`, - `item`.`starred` AS `starred`, - `item`.`mention` AS `mention`, - `item`.`network` AS `network`, - `item`.`unseen` AS `unseen`, - `item`.`gravity` AS `gravity`, - `item`.`contact-id` AS `contact-id`, + `post-user`.`uri-id` AS `uri-id`, + `parent-post`.`id` AS `parent`, + `post-user`.`received` AS `received`, + `post-thread-user`.`commented` AS `commented`, + `post-user`.`created` AS `created`, + `post-user`.`uid` AS `uid`, + `post-thread-user`.`starred` AS `starred`, + `post-thread-user`.`mention` AS `mention`, + `post-user`.`network` AS `network`, + `post-user`.`unseen` AS `unseen`, + `post-user`.`gravity` AS `gravity`, + `post-user`.`contact-id` AS `contact-id`, `ownercontact`.`contact-type` AS `contact-type` - FROM `item` - INNER JOIN `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` + INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id` + LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id` + INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` + LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -2053,27 +2122,25 @@ 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`, - `item`.`id` AS `parent`, - `post-thread`.`received` AS `received`, - `post-thread`.`commented` AS `commented`, - `post-thread`.`created` AS `created`, + `post-thread-user`.`uri-id` AS `uri-id`, + `parent-post`.`id` AS `parent`, + `post-thread-user`.`received` AS `received`, + `post-thread-user`.`commented` AS `commented`, + `post-thread-user`.`created` AS `created`, `post-thread-user`.`uid` AS `uid`, `post-thread-user`.`starred` AS `starred`, `post-thread-user`.`mention` AS `mention`, - `post-thread`.`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` 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` + LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid` + WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) @@ -2242,19 +2309,20 @@ CREATE VIEW `pending-view` AS SELECT DROP VIEW IF EXISTS `tag-search-view`; CREATE VIEW `tag-search-view` AS SELECT `post-tag`.`uri-id` AS `uri-id`, - `item`.`id` AS `iid`, - `item`.`uri` AS `uri`, - `item`.`guid` AS `guid`, - `item`.`uid` AS `uid`, - `item`.`private` AS `private`, - `item`.`wall` AS `wall`, - `item`.`origin` AS `origin`, - `item`.`gravity` AS `gravity`, - `item`.`received` AS `received`, + `post-user`.`uid` AS `uid`, + `post-user`.`id` AS `iid`, + `post-user`.`private` AS `private`, + `post-user`.`wall` AS `wall`, + `post-user`.`origin` AS `origin`, + `post-user`.`global` AS `global`, + `post-user`.`gravity` AS `gravity`, + `post-user`.`received` AS `received`, + `post-user`.`network` AS `network`, + `post-user`.`author-id` AS `author-id`, `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; --