X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=c68ae094c1aa5e11f531e980a9ae27fcebb663fa;hb=de76e860ad024a7cc0b5f3366cdabefd4915c3e9;hp=7663b71590c22ff0c568b1b02af0b48385a9833f;hpb=64894f9d6f436bbfc439538a6743e497f87af22c;p=friendica.git diff --git a/database.sql b/database.sql index 7663b71590..c68ae094c1 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 2022.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1477 +-- Friendica 2022.12-dev (Giant Rhubarb) +-- DB_UPDATE_VERSION 1492 -- ------------------------------------------ @@ -9,8 +9,8 @@ -- CREATE TABLE IF NOT EXISTS `gserver` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `nurl` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `version` varchar(255) NOT NULL DEFAULT '' COMMENT '', `site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '', `info` text COMMENT '', @@ -22,8 +22,8 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `local-posts` int unsigned COMMENT 'Number of local posts', `local-comments` int unsigned COMMENT 'Number of local comments', `directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)', - `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `poco` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `noscrape` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '', `protocol` tinyint unsigned COMMENT 'The protocol of the server', `platform` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `pwdreset` varchar(255) COMMENT 'Password reset request token', `pwdreset_time` datetime COMMENT 'Timestamp of the last password reset request', `maxreq` int unsigned NOT NULL DEFAULT 10 COMMENT '', - `expire` int unsigned NOT NULL DEFAULT 0 COMMENT '', + `expire` int unsigned NOT NULL DEFAULT 0 COMMENT 'Delay in days before deleting user-related posts. Scope is controlled by pConfig.', `account_removed` boolean NOT NULL DEFAULT '0' COMMENT 'if 1 the account is removed', `account_expired` boolean NOT NULL DEFAULT '0' COMMENT '', `account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp when account expires and will be deleted', @@ -104,7 +104,7 @@ CREATE TABLE IF NOT EXISTS `user` ( -- CREATE TABLE IF NOT EXISTS `item-uri` ( `id` int unsigned NOT NULL auto_increment, - `uri` varbinary(255) NOT NULL COMMENT 'URI of an item', + `uri` varbinary(383) NOT NULL COMMENT 'URI of an item', `guid` varbinary(255) COMMENT 'A unique identifier for an item', PRIMARY KEY(`id`), UNIQUE INDEX `uri` (`uri`), @@ -127,26 +127,28 @@ CREATE TABLE IF NOT EXISTS `contact` ( `keywords` text COMMENT 'public keywords (interests) of the contact', `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address', `matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address', - `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `header` varchar(255) COMMENT 'Header picture', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `avatar` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `header` varbinary(383) COMMENT 'Header picture', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `nurl` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the contact url', `addr` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `alias` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `alias` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `pubkey` text COMMENT 'RSA public key 4096 bit', `prvkey` text COMMENT 'RSA private key 4096 bit', - `batch` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `notify` varchar(255) COMMENT '', - `poll` varchar(255) COMMENT '', - `subscribe` varchar(255) COMMENT '', + `batch` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `notify` varbinary(383) COMMENT '', + `poll` varbinary(383) COMMENT '', + `subscribe` varbinary(383) COMMENT '', `last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last try to update the contact info', + `next-update` datetime COMMENT 'Next connection request', `success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful contact update', `failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last failed update', `failed` boolean COMMENT 'Connection failed', `term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'date of the last post', `last-discovery` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'date of the last follower discovery', + `local-data` boolean COMMENT 'Is true when there are posts with this contact on the system', `blocked` boolean NOT NULL DEFAULT '1' COMMENT 'Node-wide block status', `block_reason` text COMMENT 'Node-wide block reason', `readonly` boolean NOT NULL DEFAULT '0' COMMENT 'posts of the contact are readonly', @@ -155,7 +157,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `archive` boolean NOT NULL DEFAULT '0' COMMENT '', `unsearchable` boolean NOT NULL DEFAULT '0' COMMENT 'Contact prefers to not be searchable', `sensitive` boolean NOT NULL DEFAULT '0' COMMENT 'Contact posts sensitive content', - `baseurl` varchar(255) DEFAULT '' COMMENT 'baseurl of the contact', + `baseurl` varbinary(383) DEFAULT '' COMMENT 'baseurl of the contact', `gsid` int unsigned COMMENT 'Global Server ID', `bd` date NOT NULL DEFAULT '0001-01-01' COMMENT '', `reason` text COMMENT '', @@ -164,7 +166,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact', `protocol` char(4) NOT NULL DEFAULT '' COMMENT 'Protocol of the contact', `subhub` boolean NOT NULL DEFAULT '0' COMMENT '', - `hub-verify` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `hub-verify` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `rating` tinyint NOT NULL DEFAULT 0 COMMENT 'Automatically detected feed poll frequency', `priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Feed poll priority', `attag` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -175,15 +177,15 @@ CREATE TABLE IF NOT EXISTS `contact` ( `notify_new_posts` boolean NOT NULL DEFAULT '0' COMMENT '', `fetch_further_information` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `ffi_keyword_denylist` text COMMENT '', - `photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact', - `thumb` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)', - `micro` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (micro size)', + `photo` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo of the contact', + `thumb` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)', + `micro` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo (micro size)', `name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', - `request` varchar(255) COMMENT '', - `confirm` varchar(255) COMMENT '', - `poco` varchar(255) COMMENT '', + `request` varbinary(383) COMMENT '', + `confirm` varbinary(383) COMMENT '', + `poco` varbinary(383) COMMENT '', `writable` boolean NOT NULL DEFAULT '0' COMMENT '', `forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a forum. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = false instead', `prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = true instead', @@ -191,8 +193,8 @@ CREATE TABLE IF NOT EXISTS `contact` ( `site-pubkey` text COMMENT 'Deprecated', `gender` varchar(32) NOT NULL DEFAULT '' COMMENT 'Deprecated', `duplex` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated', - `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated', - `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated', + `issued-id` varbinary(383) NOT NULL DEFAULT '' COMMENT 'Deprecated', + `dfrn-id` varbinary(383) NOT NULL DEFAULT '' COMMENT 'Deprecated', `aes_allow` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated', `ret-aes` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated', `usehub` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated', @@ -213,12 +215,14 @@ CREATE TABLE IF NOT EXISTS `contact` ( INDEX `attag_uid` (`attag`(96),`uid`), INDEX `network_uid_lastupdate` (`network`,`uid`,`last-update`), INDEX `uid_network_self_lastupdate` (`uid`,`network`,`self`,`last-update`), + INDEX `next-update` (`next-update`), + INDEX `local-data-next-update` (`local-data`,`next-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`), + INDEX `gsid_uid_failed` (`gsid`,`uid`,`failed`), INDEX `uri-id` (`uri-id`), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, @@ -231,7 +235,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( CREATE TABLE IF NOT EXISTS `tag` ( `id` int unsigned NOT NULL auto_increment COMMENT '', `name` varchar(96) NOT NULL DEFAULT '' COMMENT '', - `url` varbinary(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `type` tinyint unsigned COMMENT 'Type of the tag (Unknown, General Collection, Follower Collection or Account)', PRIMARY KEY(`id`), UNIQUE INDEX `type_name_url` (`name`,`url`), @@ -305,6 +309,20 @@ CREATE TABLE IF NOT EXISTS `2fa_trusted_browser` ( FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication trusted browsers'; +-- +-- TABLE account-user +-- +CREATE TABLE IF NOT EXISTS `account-user` ( + `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', + `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the account url', + `uid` mediumint unsigned NOT NULL COMMENT 'User ID', + PRIMARY KEY(`id`), + UNIQUE INDEX `uri-id_uid` (`uri-id`,`uid`), + INDEX `uid_uri-id` (`uid`,`uri-id`), + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Remote and local accounts'; + -- -- TABLE addon -- @@ -325,17 +343,17 @@ CREATE TABLE IF NOT EXISTS `addon` ( -- TABLE apcontact -- CREATE TABLE IF NOT EXISTS `apcontact` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the contact', + `url` varbinary(383) NOT NULL COMMENT 'URL of the contact', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the apcontact url', - `uuid` varchar(255) COMMENT '', + `uuid` varbinary(255) COMMENT '', `type` varchar(20) NOT NULL COMMENT '', - `following` varchar(255) COMMENT '', - `followers` varchar(255) COMMENT '', - `inbox` varchar(255) NOT NULL COMMENT '', - `outbox` varchar(255) COMMENT '', - `sharedinbox` varchar(255) COMMENT '', - `featured` varchar(255) COMMENT 'Address for the collection of featured posts', - `featured-tags` varchar(255) COMMENT 'Address for the collection of featured tags', + `following` varbinary(383) COMMENT '', + `followers` varbinary(383) COMMENT '', + `inbox` varbinary(383) NOT NULL COMMENT '', + `outbox` varbinary(383) COMMENT '', + `sharedinbox` varbinary(383) COMMENT '', + `featured` varbinary(383) COMMENT 'Address for the collection of featured posts', + `featured-tags` varbinary(383) COMMENT 'Address for the collection of featured tags', `manually-approve` boolean COMMENT '', `discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory', `suspended` boolean COMMENT 'Mastodon extension: true if profile is suspended', @@ -344,13 +362,13 @@ CREATE TABLE IF NOT EXISTS `apcontact` ( `about` text COMMENT '', `xmpp` varchar(255) COMMENT 'XMPP address', `matrix` varchar(255) COMMENT 'Matrix address', - `photo` varchar(255) COMMENT '', - `header` varchar(255) COMMENT 'Header picture', + `photo` varbinary(383) COMMENT '', + `header` varbinary(383) COMMENT 'Header picture', `addr` varchar(255) COMMENT '', - `alias` varchar(255) COMMENT '', + `alias` varbinary(383) COMMENT '', `pubkey` text COMMENT '', - `subscribe` varchar(255) COMMENT '', - `baseurl` varchar(255) COMMENT 'baseurl of the ap contact', + `subscribe` varbinary(383) COMMENT '', + `baseurl` varbinary(383) COMMENT 'baseurl of the ap contact', `gsid` int unsigned COMMENT 'Global Server ID', `generator` varchar(255) COMMENT 'Name of the contact\'s system', `following_count` int unsigned DEFAULT 0 COMMENT 'Number of following contacts', @@ -377,8 +395,8 @@ CREATE TABLE IF NOT EXISTS `application` ( `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 '', + `redirect_uri` varbinary(383) NOT NULL COMMENT '', + `website` varbinary(383) COMMENT '', `scopes` varchar(255) COMMENT '', `read` boolean COMMENT 'Read scope', `write` boolean COMMENT 'Write scope', @@ -395,7 +413,7 @@ CREATE TABLE IF NOT EXISTS `application-marker` ( `application-id` int unsigned NOT NULL COMMENT '', `uid` mediumint unsigned NOT NULL COMMENT 'Owner User id', `timeline` varchar(64) NOT NULL COMMENT 'Marker (home, notifications)', - `last_read_id` varchar(255) COMMENT 'Marker id for the timeline', + `last_read_id` varbinary(383) COMMENT 'Marker id for the timeline', `version` smallint unsigned COMMENT 'Version number', `updated_at` datetime COMMENT 'creation time', PRIMARY KEY(`application-id`,`uid`,`timeline`), @@ -492,7 +510,7 @@ CREATE TABLE IF NOT EXISTS `contact-relation` ( -- CREATE TABLE IF NOT EXISTS `conv` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this conversation', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this conversation', `recips` text COMMENT 'sender_handle;recipient_handle', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `creator` varchar(255) NOT NULL DEFAULT '' COMMENT 'handle of creator', @@ -534,7 +552,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( -- CREATE TABLE IF NOT EXISTS `delayed-post` ( `id` int unsigned NOT NULL auto_increment, - `uri` varchar(255) COMMENT 'URI of the post that will be distributed later', + `uri` varbinary(383) COMMENT 'URI of the post that will be distributed later', `uid` mediumint unsigned COMMENT 'Owner User id', `delayed` datetime COMMENT 'delay time', `wid` int unsigned COMMENT 'Workerqueue id', @@ -559,7 +577,7 @@ CREATE TABLE IF NOT EXISTS `diaspora-interaction` ( -- TABLE endpoint -- CREATE TABLE IF NOT EXISTS `endpoint` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the contact', + `url` varbinary(383) NOT NULL COMMENT 'URL of the contact', `type` varchar(20) NOT NULL COMMENT '', `owner-uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the apcontact url', PRIMARY KEY(`url`), @@ -572,10 +590,10 @@ CREATE TABLE IF NOT EXISTS `endpoint` ( -- CREATE TABLE IF NOT EXISTS `event` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact_id (ID of the contact in contact table)', - `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `uri` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the event uri', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time', `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time', @@ -605,22 +623,23 @@ CREATE TABLE IF NOT EXISTS `event` ( -- CREATE TABLE IF NOT EXISTS `fcontact` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'unique id', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'unique id', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the fcontact url', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `request` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `request` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '', `addr` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `batch` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `notify` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `poll` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `confirm` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `batch` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `notify` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `poll` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `confirm` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '', - `alias` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `alias` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `pubkey` text COMMENT '', + `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `interacting_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts this contact interactes with', `interacted_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts that interacted with this contact', @@ -637,7 +656,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( -- CREATE TABLE IF NOT EXISTS `fetch-entry` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `url` varbinary(255) COMMENT 'url that awaiting to be fetched', + `url` varbinary(383) COMMENT 'url that awaiting to be fetched', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of the fetch request', `wid` int unsigned COMMENT 'Workerqueue id', PRIMARY KEY(`id`), @@ -655,9 +674,9 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `cid` int unsigned NOT NULL DEFAULT 0 COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `request` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `request` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `note` text COMMENT '', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', PRIMARY KEY(`id`), @@ -728,10 +747,10 @@ CREATE TABLE IF NOT EXISTS `hook` ( -- CREATE TABLE IF NOT EXISTS `inbox-entry` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `activity-id` varbinary(255) COMMENT 'id of the incoming activity', - `object-id` varbinary(255) COMMENT '', - `in-reply-to-id` varbinary(255) COMMENT '', - `conversation` varbinary(255) COMMENT '', + `activity-id` varbinary(383) COMMENT 'id of the incoming activity', + `object-id` varbinary(383) COMMENT '', + `in-reply-to-id` varbinary(383) COMMENT '', + `conversation` varbinary(383) COMMENT '', `type` varchar(64) COMMENT 'Type of the activity', `object-type` varchar(64) COMMENT 'Type of the object activity', `object-object-type` varchar(64) COMMENT 'Type of the object\'s object activity', @@ -765,7 +784,7 @@ CREATE TABLE IF NOT EXISTS `inbox-entry-receiver` ( -- TABLE inbox-status -- CREATE TABLE IF NOT EXISTS `inbox-status` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the inbox', + `url` varbinary(383) NOT NULL COMMENT 'URL of the inbox', `uri-id` int unsigned COMMENT 'Item-uri id of inbox url', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of this entry', `success` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful delivery', @@ -790,7 +809,7 @@ CREATE TABLE IF NOT EXISTS `intro` ( `knowyou` boolean NOT NULL DEFAULT '0' COMMENT '', `duplex` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated', `note` text COMMENT '', - `hash` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `hash` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `blocked` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated', `ignore` boolean NOT NULL DEFAULT '0' COMMENT '', @@ -822,11 +841,11 @@ CREATE TABLE IF NOT EXISTS `locks` ( CREATE TABLE IF NOT EXISTS `mail` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message', `from-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'name of the sender', - `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', + `from-photo` varbinary(383) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender', + `from-url` varbinary(383) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender', + `contact-id` varbinary(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 '', @@ -835,11 +854,11 @@ CREATE TABLE IF NOT EXISTS `mail` ( `reply` boolean NOT NULL DEFAULT '0' COMMENT '', `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` varbinary(383) 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` varbinary(383) 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` varbinary(383) 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`), @@ -916,6 +935,7 @@ CREATE TABLE IF NOT EXISTS `notification` ( INDEX `target-uri-id` (`target-uri-id`), INDEX `parent-uri-id` (`parent-uri-id`), INDEX `seen_uid` (`seen`,`uid`), + INDEX `uid_type_parent-uri-id_actor-id` (`uid`,`type`,`parent-uri-id`,`actor-id`), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`vid`) REFERENCES `verb` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT, FOREIGN KEY (`actor-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, @@ -930,12 +950,12 @@ CREATE TABLE IF NOT EXISTS `notify` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `msg` mediumtext COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', - `link` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `link` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `iid` int unsigned COMMENT '', `parent` int unsigned COMMENT '', `uri-id` int unsigned COMMENT 'Item-uri id of the related post', @@ -979,7 +999,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` ( -- TABLE oembed -- CREATE TABLE IF NOT EXISTS `oembed` ( - `url` varbinary(255) NOT NULL COMMENT 'page url', + `url` varbinary(383) NOT NULL COMMENT 'page url', `maxwidth` mediumint unsigned NOT NULL COMMENT 'Maximum width passed to Oembed', `content` mediumtext COMMENT 'OEmbed data of the page', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation', @@ -1149,9 +1169,12 @@ CREATE TABLE IF NOT EXISTS `post-category` ( CREATE TABLE IF NOT EXISTS `post-collection` ( `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri', `type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0 - Featured', + `author-id` int unsigned COMMENT 'Author of the featured post', PRIMARY KEY(`uri-id`,`type`), INDEX `type` (`type`), - FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE + INDEX `author-id` (`author-id`), + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Collection of posts'; -- @@ -1163,6 +1186,7 @@ CREATE TABLE IF NOT EXISTS `post-content` ( `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '', `body` mediumtext COMMENT 'item body content', `raw-body` mediumtext COMMENT 'Body without embedded media links', + `quote-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the quoted uri', `location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated', `coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated', `language` text COMMENT 'Language information about this post', @@ -1174,12 +1198,14 @@ CREATE TABLE IF NOT EXISTS `post-content` ( `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)', `target` text COMMENT 'JSON encoded target structure if used', `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type', - `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', + `plink` varbinary(383) 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 + INDEX `quote-uri-id` (`quote-uri-id`), + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`quote-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts'; -- @@ -1241,7 +1267,7 @@ CREATE TABLE IF NOT EXISTS `post-history` ( `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)', `target` text COMMENT 'JSON encoded target structure if used', `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type', - `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', + `plink` varbinary(383) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', PRIMARY KEY(`uri-id`,`edited`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Post history'; @@ -1266,6 +1292,7 @@ CREATE TABLE IF NOT EXISTS `post-media` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri', `url` varbinary(1024) NOT NULL COMMENT 'Media URL', + `media-uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the activities uri-id', `type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Media type', `mimetype` varchar(60) COMMENT '', `height` smallint unsigned COMMENT 'Height of the media', @@ -1276,16 +1303,18 @@ CREATE TABLE IF NOT EXISTS `post-media` ( `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-url` varbinary(383) 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', + `author-image` varbinary(383) COMMENT 'Image of the author of the media', + `publisher-url` varbinary(383) 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', + `publisher-image` varbinary(383) COMMENT 'Image of the publisher of the media', PRIMARY KEY(`id`), UNIQUE INDEX `uri-id-url` (`uri-id`,`url`(512)), INDEX `uri-id-id` (`uri-id`,`id`), - FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE + INDEX `media-uri-id` (`media-uri-id`), + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`media-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Attached media'; -- @@ -1408,6 +1437,7 @@ CREATE TABLE IF NOT EXISTS `post-user` ( 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_wall_received` (`uid`,`wall`,`received`), INDEX `uid_contactid` (`uid`,`contact-id`), INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), INDEX `uid_unseen` (`uid`,`unseen`), @@ -1547,10 +1577,11 @@ CREATE TABLE IF NOT EXISTS `profile` ( `education` text COMMENT 'Deprecated', `contact` text COMMENT 'Deprecated', `homepage` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `homepage_verified` boolean NOT NULL DEFAULT '0' COMMENT 'was the homepage verified by a rel-me link back to the profile', `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address', `matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `thumb` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory', `net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory', PRIMARY KEY(`id`), @@ -1585,7 +1616,7 @@ CREATE TABLE IF NOT EXISTS `profile_field` ( CREATE TABLE IF NOT EXISTS `push_subscriber` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', - `callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `callback_url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `topic` varchar(255) NOT NULL DEFAULT '' COMMENT '', `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '', `push` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter', @@ -1604,7 +1635,7 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` ( -- CREATE TABLE IF NOT EXISTS `register` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `hash` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `hash` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `password` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -1615,6 +1646,35 @@ CREATE TABLE IF NOT EXISTS `register` ( FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registrations requiring admin approval'; +-- +-- TABLE report +-- +CREATE TABLE IF NOT EXISTS `report` ( + `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', + `uid` mediumint unsigned COMMENT 'Reporting user', + `cid` int unsigned NOT NULL COMMENT 'Reported contact', + `comment` text COMMENT 'Report', + `forward` boolean COMMENT 'Forward the report to the remote server', + `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', + PRIMARY KEY(`id`), + INDEX `uid` (`uid`), + INDEX `cid` (`cid`), + FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; + +-- +-- TABLE report-post +-- +CREATE TABLE IF NOT EXISTS `report-post` ( + `rid` int unsigned NOT NULL COMMENT 'Report id', + `uri-id` int unsigned NOT NULL COMMENT 'Uri-id of the reported post', + PRIMARY KEY(`rid`,`uri-id`), + INDEX `uri-id` (`uri-id`), + FOREIGN KEY (`rid`) REFERENCES `report` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; + -- -- TABLE search -- @@ -1704,7 +1764,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( `fetch_further_information` tinyint unsigned COMMENT '', `ffi_keyword_denylist` text COMMENT '', `subhub` boolean COMMENT '', - `hub-verify` varchar(255) COMMENT '', + `hub-verify` varbinary(383) COMMENT '', `protocol` char(4) COMMENT 'Protocol of the contact', `rating` tinyint COMMENT 'Automatically detected feed poll frequency', `priority` tinyint unsigned COMMENT 'Feed poll priority', @@ -1716,6 +1776,24 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific public contact data'; +-- +-- TABLE arrived-activity +-- +CREATE TABLE IF NOT EXISTS `arrived-activity` ( + `object-id` varbinary(383) NOT NULL COMMENT 'object id of the incoming activity', + `received` datetime COMMENT 'Receiving date', + PRIMARY KEY(`object-id`) +) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Id of arrived activities'; + +-- +-- TABLE fetched-activity +-- +CREATE TABLE IF NOT EXISTS `fetched-activity` ( + `object-id` varbinary(383) NOT NULL COMMENT 'object id of fetched activity', + `received` datetime COMMENT 'Receiving date', + PRIMARY KEY(`object-id`) +) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Id of fetched activities'; + -- -- TABLE worker-ipc -- @@ -1765,6 +1843,8 @@ CREATE VIEW `post-user-view` AS SELECT `post-user`.`thr-parent-id` AS `thr-parent-id`, `conversation-item-uri`.`uri` AS `conversation`, `post-thread-user`.`conversation-id` AS `conversation-id`, + `quote-item-uri`.`uri` AS `quote-uri`, + `post-content`.`quote-uri-id` AS `quote-uri-id`, `item-uri`.`guid` AS `guid`, `post-user`.`wall` AS `wall`, `post-user`.`gravity` AS `gravity`, @@ -1902,9 +1982,7 @@ CREATE VIEW `post-user-view` AS SELECT `parent-post-author`.`url` AS `parent-author-link`, `parent-post-author`.`name` AS `parent-author-name`, `parent-post-author`.`nick` AS `parent-author-nick`, - `parent-post-author`.`network` AS `parent-author-network`, - `parent-post-author`.`blocked` AS `parent-author-blocked`, - `parent-post-author`.`hidden` AS `parent-author-hidden` + `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` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id` @@ -1920,6 +1998,7 @@ CREATE VIEW `post-user-view` AS SELECT 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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id` LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-user`.`uri-id` AND `post-user`.`origin` LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-user`.`uri-id` LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid` @@ -1943,6 +2022,8 @@ CREATE VIEW `post-thread-user-view` AS SELECT `post-user`.`thr-parent-id` AS `thr-parent-id`, `conversation-item-uri`.`uri` AS `conversation`, `post-thread-user`.`conversation-id` AS `conversation-id`, + `quote-item-uri`.`uri` AS `quote-uri`, + `post-content`.`quote-uri-id` AS `quote-uri-id`, `item-uri`.`guid` AS `guid`, `post-thread-user`.`wall` AS `wall`, `post-user`.`gravity` AS `gravity`, @@ -2078,9 +2159,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT `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` + `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` @@ -2096,6 +2175,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT 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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-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 `post-question` ON `post-question`.`uri-id` = `post-thread-user`.`uri-id` LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid` @@ -2115,6 +2195,8 @@ CREATE VIEW `post-view` AS SELECT `post`.`thr-parent-id` AS `thr-parent-id`, `conversation-item-uri`.`uri` AS `conversation`, `post-thread`.`conversation-id` AS `conversation-id`, + `quote-item-uri`.`uri` AS `quote-uri`, + `post-content`.`quote-uri-id` AS `quote-uri-id`, `item-uri`.`guid` AS `guid`, `post`.`gravity` AS `gravity`, `external-item-uri`.`uri` AS `extid`, @@ -2221,9 +2303,7 @@ CREATE VIEW `post-view` AS SELECT `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` + `parent-post-author`.`network` AS `parent-author-network` FROM `post` STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post`.`author-id` @@ -2237,6 +2317,7 @@ CREATE VIEW `post-view` AS SELECT LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid` 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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id` LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post`.`uri-id` LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; @@ -2254,6 +2335,8 @@ CREATE VIEW `post-thread-view` AS SELECT `post`.`thr-parent-id` AS `thr-parent-id`, `conversation-item-uri`.`uri` AS `conversation`, `post-thread`.`conversation-id` AS `conversation-id`, + `quote-item-uri`.`uri` AS `quote-uri`, + `post-content`.`quote-uri-id` AS `quote-uri-id`, `item-uri`.`guid` AS `guid`, `post`.`gravity` AS `gravity`, `external-item-uri`.`uri` AS `extid`, @@ -2354,15 +2437,15 @@ CREATE VIEW `post-thread-view` AS SELECT `post-question`.`end-time` AS `question-end-time`, 0 AS `has-categories`, EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-thread`.`uri-id`) AS `has-media`, + (SELECT COUNT(*) FROM `post` WHERE `parent-uri-id` = `post-thread`.`uri-id` AND `gravity` = 6) AS `total-comments`, + (SELECT COUNT(DISTINCT(`author-id`)) FROM `post` WHERE `parent-uri-id` = `post-thread`.`uri-id` AND `gravity` = 6) AS `total-actors`, `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`, - `parent-post-author`.`blocked` AS `parent-author-blocked`, - `parent-post-author`.`hidden` AS `parent-author-hidden` + `parent-post-author`.`network` AS `parent-author-network` FROM `post-thread` INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id` @@ -2376,6 +2459,7 @@ CREATE VIEW `post-thread-view` AS SELECT LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid` 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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id` LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread`.`uri-id` LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`; @@ -2401,7 +2485,7 @@ DROP VIEW IF EXISTS `collection-view`; CREATE VIEW `collection-view` AS SELECT `post-collection`.`uri-id` AS `uri-id`, `post-collection`.`type` AS `type`, - `post`.`author-id` AS `cid`, + `post-collection`.`author-id` AS `cid`, `post`.`received` AS `received`, `post`.`created` AS `created`, `post-thread`.`commented` AS `commented`, @@ -2409,7 +2493,7 @@ CREATE VIEW `collection-view` AS SELECT `post`.`visible` AS `visible`, `post`.`deleted` AS `deleted`, `post`.`thr-parent-id` AS `thr-parent-id`, - `post`.`author-id` AS `author-id`, + `post-collection`.`author-id` AS `author-id`, `post`.`gravity` AS `gravity` FROM `post-collection` INNER JOIN `post` ON `post-collection`.`uri-id` = `post`.`uri-id` @@ -2614,6 +2698,7 @@ CREATE VIEW `owner-view` AS SELECT `profile`.`postal-code` AS `postal-code`, `profile`.`country-name` AS `country-name`, `profile`.`homepage` AS `homepage`, + `profile`.`homepage_verified` AS `homepage_verified`, `profile`.`dob` AS `dob` FROM `user` INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`