-- ------------------------------------------
-- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1392
+-- DB_UPDATE_VERSION 1396
-- ------------------------------------------
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication recovery codes';
+--
+-- TABLE 2fa_trusted_browser
+--
+CREATE TABLE IF NOT EXISTS `2fa_trusted_browser` (
+ `cookie_hash` varchar(80) NOT NULL COMMENT 'Trusted cookie hash',
+ `uid` mediumint unsigned NOT NULL COMMENT 'User ID',
+ `user_agent` text COMMENT 'User agent string',
+ `created` datetime NOT NULL COMMENT 'Datetime the trusted browser was recorded',
+ `last_used` datetime COMMENT 'Datetime the trusted browser was last used',
+ PRIMARY KEY(`cookie_hash`),
+ INDEX `uid` (`uid`),
+ FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication trusted browsers';
+
--
-- TABLE addon
--
`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
- `icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
`vid` smallint unsigned COMMENT 'Id of the verb table entry that contains the activity verbs',
`extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
`event-id` int unsigned COMMENT 'Used to link to the event.id',
`iaid` int unsigned COMMENT 'Deprecated',
+ `icid` int unsigned COMMENT 'Deprecated',
`attach` mediumtext COMMENT 'Deprecated',
`allow_cid` mediumtext COMMENT 'Deprecated',
`allow_gid` mediumtext COMMENT 'Deprecated',
INDEX `uid_unseen_wall` (`uid`,`unseen`,`wall`),
INDEX `mention_uid_id` (`mention`,`uid`,`id`),
INDEX `uid_eventid` (`uid`,`event-id`),
- INDEX `icid` (`icid`),
- INDEX `iaid` (`iaid`),
INDEX `vid` (`vid`),
INDEX `psid_wall` (`psid`,`wall`),
INDEX `uri-id` (`uri-id`),
FOREIGN KEY (`psid`) REFERENCES `permissionset` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
---
--- TABLE item-activity
---
-CREATE TABLE IF NOT EXISTS `item-activity` (
- `id` int unsigned NOT NULL auto_increment,
- `uri` varchar(255) COMMENT '',
- `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
- `uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
- `activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
- PRIMARY KEY(`id`),
- UNIQUE INDEX `uri-hash` (`uri-hash`),
- INDEX `uri` (`uri`(191)),
- INDEX `uri-id` (`uri-id`),
- FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activities for items';
-
---
--- TABLE item-content
---
-CREATE TABLE IF NOT EXISTS `item-content` (
- `id` int unsigned NOT NULL auto_increment,
- `uri` varchar(255) COMMENT '',
- `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
- `uri-plink-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
- `title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
- `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
- `body` mediumtext COMMENT 'item body content',
- `raw-body` mediumtext COMMENT 'Body without embedded media links',
- `location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
- `coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
- `language` text COMMENT 'Language information about this post',
- `app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
- `rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
- `rendered-html` mediumtext COMMENT 'item.body converted to html',
- `object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type',
- `object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)',
- `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)',
- `target` text COMMENT 'JSON encoded target structure if used',
- `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
- `verb` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams verb',
- PRIMARY KEY(`id`),
- UNIQUE INDEX `uri-plink-hash` (`uri-plink-hash`),
- FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`),
- INDEX `uri` (`uri`(191)),
- INDEX `plink` (`plink`(191)),
- INDEX `uri-id` (`uri-id`),
- FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
-
--
-- TABLE locks
--
FOREIGN KEY (`tid`) REFERENCES `tag` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to categories';
+--
+-- TABLE post-content
+--
+CREATE TABLE IF NOT EXISTS `post-content` (
+ `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+ `title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
+ `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `body` mediumtext COMMENT 'item body content',
+ `raw-body` mediumtext COMMENT 'Body without embedded media links',
+ `location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
+ `coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
+ `language` text COMMENT 'Language information about this post',
+ `app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
+ `rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+ `rendered-html` mediumtext COMMENT 'item.body converted to html',
+ `object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type',
+ `object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)',
+ `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)',
+ `target` text COMMENT 'JSON encoded target structure if used',
+ `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
+ `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
+ PRIMARY KEY(`uri-id`),
+ INDEX `plink` (`plink`(191)),
+ FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`),
+ FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
+
--
-- TABLE post-delivery-data
--
-- TABLE post-user
--
CREATE TABLE IF NOT EXISTS `post-user` (
+ `id` int unsigned NOT NULL auto_increment,
`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
`uid` mediumint unsigned NOT NULL COMMENT 'Owner id which owns this copy of the item',
`protocol` tinyint unsigned COMMENT 'Protocol used to deliver the item for this user',
`notification-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
`psid` int unsigned COMMENT 'ID of the permission set of this post',
- PRIMARY KEY(`uid`,`uri-id`),
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `uid_uri-id` (`uid`,`uri-id`),
INDEX `uri-id` (`uri-id`),
INDEX `contact-id` (`contact-id`),
INDEX `psid` (`psid`),
CREATE VIEW `post-view` AS SELECT
`item`.`id` AS `id`,
`item`.`id` AS `item_id`,
+ `post-user`.`id` AS `post-user-id`,
`item`.`uid` AS `uid`,
- `item`.`uid` AS `internal-uid`,
`item`.`parent` AS `parent`,
`item`.`uri` AS `uri`,
`item`.`uri-id` AS `uri-id`,
- `item`.`uri-id` AS `internal-uri-id`,
`item`.`parent-uri` AS `parent-uri`,
`item`.`parent-uri-id` AS `parent-uri-id`,
`item`.`thr-parent` AS `thr-parent`,
`item`.`commented` AS `commented`,
`item`.`received` AS `received`,
`item`.`changed` AS `changed`,
- `item`.`resource-id` AS `resource-id`,
`item`.`post-type` AS `post-type`,
`item`.`private` AS `private`,
`item`.`pubmail` AS `pubmail`,
`item`.`mention` AS `mention`,
`item`.`global` AS `global`,
`item`.`network` AS `network`,
- `item`.`icid` AS `icid`,
`item`.`vid` AS `vid`,
`item`.`psid` AS `psid`,
- `item`.`attach` AS `attach`,
- (SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
- NULL AS `file`,
IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
- `item-content`.`title` AS `title`,
- `item-content`.`content-warning` AS `content-warning`,
- `item-content`.`raw-body` AS `raw-body`,
- `item-content`.`body` AS `body`,
- `item-content`.`rendered-hash` AS `rendered-hash`,
- `item-content`.`rendered-html` AS `rendered-html`,
- `item-content`.`language` AS `language`,
- `item-content`.`plink` AS `plink`,
- `item-content`.`location` AS `location`,
- `item-content`.`coord` AS `coord`,
- `item-content`.`app` AS `app`,
- `item-content`.`object-type` AS `object-type`,
- `item-content`.`object` AS `object`,
- `item-content`.`target-type` AS `target-type`,
- `item-content`.`target` AS `target`,
+ `post-content`.`title` AS `title`,
+ `post-content`.`content-warning` AS `content-warning`,
+ `post-content`.`raw-body` AS `raw-body`,
+ `post-content`.`body` AS `body`,
+ `post-content`.`rendered-hash` AS `rendered-hash`,
+ `post-content`.`rendered-html` AS `rendered-html`,
+ `post-content`.`language` AS `language`,
+ `post-content`.`plink` AS `plink`,
+ `post-content`.`location` AS `location`,
+ `post-content`.`coord` AS `coord`,
+ `post-content`.`app` AS `app`,
+ `post-content`.`object-type` AS `object-type`,
+ `post-content`.`object` AS `object`,
+ `post-content`.`target-type` AS `target-type`,
+ `post-content`.`target` AS `target`,
+ `post-content`.`resource-id` AS `resource-id`,
`item`.`contact-id` AS `contact-id`,
`contact`.`url` AS `contact-link`,
`contact`.`addr` AS `contact-addr`,
`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`
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
- LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
+ LEFT JOIN `post-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`
`thread`.`iid` AS `iid`,
`item`.`id` AS `item_id`,
`thread`.`uid` AS `uid`,
- `item`.`uid` AS `internal-uid`,
`item`.`parent` AS `parent`,
`item`.`uri` AS `uri`,
`item`.`uri-id` AS `uri-id`,
- `item`.`uri-id` AS `internal-uri-id`,
`item`.`parent-uri` AS `parent-uri`,
`item`.`parent-uri-id` AS `parent-uri-id`,
`item`.`thr-parent` AS `thr-parent`,
`thread`.`commented` AS `commented`,
`thread`.`received` AS `received`,
`thread`.`changed` AS `changed`,
- `item`.`resource-id` AS `resource-id`,
`thread`.`post-type` AS `post-type`,
`thread`.`private` AS `private`,
`thread`.`pubmail` AS `pubmail`,
`thread`.`mention` AS `mention`,
`item`.`global` AS `global`,
`thread`.`network` AS `network`,
- `item`.`icid` AS `icid`,
`item`.`vid` AS `vid`,
`item`.`psid` AS `psid`,
- `item`.`attach` AS `attach`,
- (SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`) AS `internal-file-count`,
- NULL AS `file`,
IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
- `item-content`.`title` AS `title`,
- `item-content`.`content-warning` AS `content-warning`,
- `item-content`.`raw-body` AS `raw-body`,
- `item-content`.`body` AS `body`,
- `item-content`.`rendered-hash` AS `rendered-hash`,
- `item-content`.`rendered-html` AS `rendered-html`,
- `item-content`.`language` AS `language`,
- `item-content`.`plink` AS `plink`,
- `item-content`.`location` AS `location`,
- `item-content`.`coord` AS `coord`,
- `item-content`.`app` AS `app`,
- `item-content`.`object-type` AS `object-type`,
- `item-content`.`object` AS `object`,
- `item-content`.`target-type` AS `target-type`,
- `item-content`.`target` AS `target`,
+ `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`,
`thread`.`contact-id` AS `contact-id`,
`contact`.`url` AS `contact-link`,
`contact`.`addr` AS `contact-addr`,
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id`
- LEFT JOIN `item-content` ON `item-content`.`uri-id` = `thread`.`uri-id`
+ LEFT JOIN `post-content` ON `post-content`.`uri-id` = `thread`.`uri-id`
LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin`
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
projects / friendica.git / blobdiff