-- ------------------------------------------
-- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1386
+-- DB_UPDATE_VERSION 1395
-- ------------------------------------------
`code` varchar(50) NOT NULL COMMENT 'Recovery code string',
`generated` datetime NOT NULL COMMENT 'Datetime the code was generated',
`used` datetime COMMENT 'Datetime the code was used',
- PRIMARY KEY(`uid`,`code`),
+ PRIMARY KEY(`uid`,`code`),
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication recovery codes';
+--
+-- TABLE 2fa_trusted_browser
+--
+CREATE TABLE IF NOT EXISTS `2fa_trusted_browser` (
+ `cookie_hash` varchar(80) NOT NULL COMMENT 'Trusted cookie hash',
+ `uid` mediumint unsigned NOT NULL COMMENT 'User ID',
+ `user_agent` text COMMENT 'User agent string',
+ `created` datetime NOT NULL COMMENT 'Datetime the trusted browser was recorded',
+ `last_used` datetime COMMENT 'Datetime the trusted browser was last used',
+ PRIMARY KEY(`cookie_hash`),
+ INDEX `uid` (`uid`),
+ FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor authentication trusted browsers';
+
--
-- TABLE addon
--
`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`),
-- 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`.`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`,
`contact`.`nick` AS `contact-nick`,
`contact`.`thumb` AS `contact-avatar`,
`contact`.`network` AS `contact-network`,
+ `contact`.`blocked` AS `contact-blocked`,
+ `contact`.`hidden` AS `contact-hidden`,
+ `contact`.`readonly` AS `contact-readonly`,
+ `contact`.`archive` AS `contact-archive`,
+ `contact`.`pending` AS `contact-pending`,
+ `contact`.`rel` AS `contact-rel`,
`contact`.`uid` AS `contact-uid`,
+ `contact`.`contact-type` AS `contact-contact-type`,
IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
`contact`.`self` AS `self`,
`contact`.`id` AS `cid`,
`item`.`author-id` AS `author-id`,
`author`.`url` AS `author-link`,
`author`.`addr` AS `author-addr`,
- IF (`contact`.`url` = `author`.`url`, `contact`.`name`, `author`.`name`) AS `author-name`,
+ IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
`author`.`nick` AS `author-nick`,
- IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
+ IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
`author`.`network` AS `author-network`,
+ `author`.`blocked` AS `author-blocked`,
+ `author`.`hidden` AS `author-hidden`,
`item`.`owner-id` AS `owner-id`,
`owner`.`url` AS `owner-link`,
`owner`.`addr` AS `owner-addr`,
- IF (`contact`.`url` = `owner`.`url`, `contact`.`name`, `owner`.`name`) AS `owner-name`,
+ IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
`owner`.`nick` AS `owner-nick`,
- IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
+ IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
`owner`.`network` AS `owner-network`,
+ `owner`.`blocked` AS `owner-blocked`,
+ `owner`.`hidden` AS `owner-hidden`,
`item`.`causer-id` AS `causer-id`,
`causer`.`url` AS `causer-link`,
`causer`.`addr` AS `causer-addr`,
`causer`.`nick` AS `causer-nick`,
`causer`.`thumb` AS `causer-avatar`,
`causer`.`network` AS `causer-network`,
+ `causer`.`blocked` AS `causer-blocked`,
+ `causer`.`hidden` AS `causer-hidden`,
`causer`.`contact-type` AS `causer-contact-type`,
`post-delivery-data`.`postopts` AS `postopts`,
`post-delivery-data`.`inform` AS `inform`,
`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 `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
+ STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
+ STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+
+--
+-- VIEW post-thread-view
+--
+DROP VIEW IF EXISTS `post-thread-view`;
+CREATE VIEW `post-thread-view` AS SELECT
+ `item`.`id` AS `id`,
+ `thread`.`iid` AS `iid`,
+ `item`.`id` AS `item_id`,
+ `thread`.`uid` AS `uid`,
+ `item`.`parent` AS `parent`,
+ `item`.`uri` AS `uri`,
+ `item`.`uri-id` AS `uri-id`,
+ `item`.`parent-uri` AS `parent-uri`,
+ `item`.`parent-uri-id` AS `parent-uri-id`,
+ `item`.`thr-parent` AS `thr-parent`,
+ `item`.`thr-parent-id` AS `thr-parent-id`,
+ `item`.`guid` AS `guid`,
+ `item`.`type` AS `type`,
+ `thread`.`wall` AS `wall`,
+ `item`.`gravity` AS `gravity`,
+ `item`.`extid` AS `extid`,
+ `thread`.`created` AS `created`,
+ `item`.`edited` AS `edited`,
+ `thread`.`commented` AS `commented`,
+ `thread`.`received` AS `received`,
+ `thread`.`changed` AS `changed`,
+ `item`.`resource-id` AS `resource-id`,
+ `thread`.`post-type` AS `post-type`,
+ `thread`.`private` AS `private`,
+ `thread`.`pubmail` AS `pubmail`,
+ `thread`.`moderated` AS `moderated`,
+ `thread`.`ignored` AS `ignored`,
+ `thread`.`visible` AS `visible`,
+ `thread`.`starred` AS `starred`,
+ `item`.`bookmark` AS `bookmark`,
+ `item`.`unseen` AS `unseen`,
+ `thread`.`deleted` AS `deleted`,
+ `thread`.`origin` AS `origin`,
+ `thread`.`forum_mode` AS `forum_mode`,
+ `thread`.`mention` AS `mention`,
+ `item`.`global` AS `global`,
+ `thread`.`network` AS `network`,
+ `item`.`vid` AS `vid`,
+ `item`.`psid` AS `psid`,
+ IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
+ `item-content`.`title` AS `title`,
+ `item-content`.`content-warning` AS `content-warning`,
+ `item-content`.`raw-body` AS `raw-body`,
+ `item-content`.`body` AS `body`,
+ `item-content`.`rendered-hash` AS `rendered-hash`,
+ `item-content`.`rendered-html` AS `rendered-html`,
+ `item-content`.`language` AS `language`,
+ `item-content`.`plink` AS `plink`,
+ `item-content`.`location` AS `location`,
+ `item-content`.`coord` AS `coord`,
+ `item-content`.`app` AS `app`,
+ `item-content`.`object-type` AS `object-type`,
+ `item-content`.`object` AS `object`,
+ `item-content`.`target-type` AS `target-type`,
+ `item-content`.`target` AS `target`,
+ `thread`.`contact-id` AS `contact-id`,
+ `contact`.`url` AS `contact-link`,
+ `contact`.`addr` AS `contact-addr`,
+ `contact`.`name` AS `contact-name`,
+ `contact`.`nick` AS `contact-nick`,
+ `contact`.`thumb` AS `contact-avatar`,
+ `contact`.`network` AS `contact-network`,
+ `contact`.`blocked` AS `contact-blocked`,
+ `contact`.`hidden` AS `contact-hidden`,
+ `contact`.`readonly` AS `contact-readonly`,
+ `contact`.`archive` AS `contact-archive`,
+ `contact`.`pending` AS `contact-pending`,
+ `contact`.`rel` AS `contact-rel`,
+ `contact`.`uid` AS `contact-uid`,
+ `contact`.`contact-type` AS `contact-contact-type`,
+ IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
+ `contact`.`self` AS `self`,
+ `contact`.`id` AS `cid`,
+ `contact`.`alias` AS `alias`,
+ `contact`.`photo` AS `photo`,
+ `contact`.`name-date` AS `name-date`,
+ `contact`.`uri-date` AS `uri-date`,
+ `contact`.`avatar-date` AS `avatar-date`,
+ `contact`.`thumb` AS `thumb`,
+ `contact`.`dfrn-id` AS `dfrn-id`,
+ `thread`.`author-id` AS `author-id`,
+ `author`.`url` AS `author-link`,
+ `author`.`addr` AS `author-addr`,
+ IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
+ `author`.`nick` AS `author-nick`,
+ IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
+ `author`.`network` AS `author-network`,
+ `author`.`blocked` AS `author-blocked`,
+ `author`.`hidden` AS `author-hidden`,
+ `thread`.`owner-id` AS `owner-id`,
+ `owner`.`url` AS `owner-link`,
+ `owner`.`addr` AS `owner-addr`,
+ IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
+ `owner`.`nick` AS `owner-nick`,
+ IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
+ `owner`.`network` AS `owner-network`,
+ `owner`.`blocked` AS `owner-blocked`,
+ `owner`.`hidden` AS `owner-hidden`,
+ `item`.`causer-id` AS `causer-id`,
+ `causer`.`url` AS `causer-link`,
+ `causer`.`addr` AS `causer-addr`,
+ `causer`.`name` AS `causer-name`,
+ `causer`.`nick` AS `causer-nick`,
+ `causer`.`thumb` AS `causer-avatar`,
+ `causer`.`network` AS `causer-network`,
+ `causer`.`blocked` AS `causer-blocked`,
+ `causer`.`hidden` AS `causer-hidden`,
+ `causer`.`contact-type` AS `causer-contact-type`,
+ `post-delivery-data`.`postopts` AS `postopts`,
+ `post-delivery-data`.`inform` AS `inform`,
+ `post-delivery-data`.`queue_count` AS `delivery_queue_count`,
+ `post-delivery-data`.`queue_done` AS `delivery_queue_done`,
+ `post-delivery-data`.`queue_failed` AS `delivery_queue_failed`,
+ IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
+ IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
+ IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
+ IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
+ `item`.`event-id` AS `event-id`,
+ `event`.`created` AS `event-created`,
+ `event`.`edited` AS `event-edited`,
+ `event`.`start` AS `event-start`,
+ `event`.`finish` AS `event-finish`,
+ `event`.`summary` AS `event-summary`,
+ `event`.`desc` AS `event-desc`,
+ `event`.`location` AS `event-location`,
+ `event`.`type` AS `event-type`,
+ `event`.`nofinish` AS `event-nofinish`,
+ `event`.`adjust` AS `event-adjust`,
+ `event`.`ignore` AS `event-ignore`,
+ `diaspora-interaction`.`interaction` AS `signed_text`,
+ `parent-item`.`guid` AS `parent-guid`,
+ `parent-item`.`network` AS `parent-network`,
+ `parent-item`.`author-id` AS `parent-author-id`,
+ `parent-item-author`.`url` AS `parent-author-link`,
+ `parent-item-author`.`name` AS `parent-author-name`,
+ `parent-item-author`.`network` AS `parent-author-network`
+ FROM `thread`
+ STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
+ STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id`
+ STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id`
+ STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
+ LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
+ LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
+ LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id`
+ LEFT JOIN `item-content` ON `item-content`.`uri-id` = `thread`.`uri-id`
+ LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin`
+ LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
projects / friendica.git / blobdiff