X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=33c32cec0a9e07cf546d7becb07b94713405d9b2;hb=b22d7452a3b6833dbf1cb902ede86af7b79f3049;hp=027242b609d75ae7bf59ef2afcee737b6438ea75;hpb=2d0443a1093cdca2515a38ce7409c34b3c2a02a8;p=friendica.git

diff --git a/database.sql b/database.sql
index 027242b609..33c32cec0a 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1391
+-- DB_UPDATE_VERSION 1395
 -- ------------------------------------------
 
 
@@ -283,10 +283,24 @@ CREATE TABLE IF NOT EXISTS `2fa_recovery_codes` (
 	`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
 --
@@ -686,7 +700,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`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, ...)',
@@ -708,6 +721,7 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`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',
@@ -765,8 +779,6 @@ CREATE TABLE IF NOT EXISTS `item` (
 	 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`),
@@ -1155,6 +1167,7 @@ CREATE TABLE IF NOT EXISTS `post-tag` (
 -- 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',
@@ -1164,7 +1177,8 @@ CREATE TABLE IF NOT EXISTS `post-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`),
@@ -1495,12 +1509,11 @@ DROP VIEW IF EXISTS `post-view`;
 CREATE VIEW `post-view` AS SELECT 
 	`item`.`id` AS `id`,
 	`item`.`id` AS `item_id`,
+	`post-user`.`id` AS `post-user-id`,
 	`item`.`uid` AS `uid`,
-	`item`.`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`,
@@ -1530,12 +1543,8 @@ CREATE VIEW `post-view` AS SELECT
 	`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`,
@@ -1580,18 +1589,18 @@ CREATE VIEW `post-view` AS SELECT
 	`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`,
@@ -1634,6 +1643,7 @@ CREATE VIEW `post-view` AS SELECT
 	`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`
@@ -1656,11 +1666,9 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`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`,
@@ -1671,7 +1679,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`item`.`gravity` AS `gravity`,
 	`item`.`extid` AS `extid`,
 	`thread`.`created` AS `created`,
-	`thread`.`edited` AS `edited`,
+	`item`.`edited` AS `edited`,
 	`thread`.`commented` AS `commented`,
 	`thread`.`received` AS `received`,
 	`thread`.`changed` AS `changed`,
@@ -1691,12 +1699,8 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`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`,
@@ -1741,18 +1745,18 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`thread`.`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`,
 	`thread`.`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`,
@@ -1806,7 +1810,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 			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`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
+			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`;
 
 --