X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=eff8f83faf819ba88b0e92fae6eccdb5329a745c;hb=01abd5b3447c346fced1031483ded4d9423fd97d;hp=95e96a135a6733013f45145a8f976005aaee960a;hpb=3a5523820cccf73f1702a384d80f4b6787d38553;p=friendica.git

diff --git a/database.sql b/database.sql
index 95e96a135a..eff8f83faf 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.09-dev (Siberian Iris)
--- DB_UPDATE_VERSION 1430
+-- DB_UPDATE_VERSION 1434
 -- ------------------------------------------
 
 
@@ -126,7 +126,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`about` text COMMENT '',
 	`keywords` text COMMENT 'public keywords (interests) of the contact',
 	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT 'Deprecated',
-	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address',
+	`matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address',
 	`attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
@@ -231,21 +232,6 @@ CREATE TABLE IF NOT EXISTS `tag` (
 	 INDEX `url` (`url`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='tags and mentions';
 
---
--- TABLE clients
---
-CREATE TABLE IF NOT EXISTS `clients` (
-	`client_id` varchar(20) NOT NULL COMMENT '',
-	`pw` varchar(20) NOT NULL DEFAULT '' COMMENT '',
-	`redirect_uri` varchar(200) NOT NULL DEFAULT '' COMMENT '',
-	`name` text COMMENT '',
-	`icon` text COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	 PRIMARY KEY(`client_id`),
-	 INDEX `uid` (`uid`),
-	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth usage';
-
 --
 -- TABLE permissionset
 --
@@ -346,6 +332,8 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
 	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`name` varchar(255) COMMENT '',
 	`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',
 	`addr` varchar(255) COMMENT '',
@@ -434,20 +422,6 @@ CREATE TABLE IF NOT EXISTS `attach` (
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='file attachments';
 
---
--- TABLE auth_codes
---
-CREATE TABLE IF NOT EXISTS `auth_codes` (
-	`id` varchar(40) NOT NULL COMMENT '',
-	`client_id` varchar(20) NOT NULL DEFAULT '' COMMENT '',
-	`redirect_uri` varchar(200) NOT NULL DEFAULT '' COMMENT '',
-	`expires` int NOT NULL DEFAULT 0 COMMENT '',
-	`scope` varchar(250) NOT NULL DEFAULT '' COMMENT '',
-	 PRIMARY KEY(`id`),
-	 INDEX `client_id` (`client_id`),
-	FOREIGN KEY (`client_id`) REFERENCES `clients` (`client_id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth usage';
-
 --
 -- TABLE cache
 --
@@ -521,6 +495,31 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 	 INDEX `received` (`received`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Raw data and structure information for messages';
 
+--
+-- TABLE workerqueue
+--
+CREATE TABLE IF NOT EXISTS `workerqueue` (
+	`id` int unsigned NOT NULL auto_increment COMMENT 'Auto incremented worker task id',
+	`command` varchar(100) COMMENT 'Task command',
+	`parameter` mediumtext COMMENT 'Task parameter',
+	`priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Task priority',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
+	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
+	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Execution date',
+	`next_try` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
+	`retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
+	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked 1 when the task was done - will be deleted later',
+	 PRIMARY KEY(`id`),
+	 INDEX `command` (`command`),
+	 INDEX `done_command_parameter` (`done`,`command`,`parameter`(64)),
+	 INDEX `done_executed` (`done`,`executed`),
+	 INDEX `done_priority_retrial_created` (`done`,`priority`,`retrial`,`created`),
+	 INDEX `done_priority_next_try` (`done`,`priority`,`next_try`),
+	 INDEX `done_pid_next_try` (`done`,`pid`,`next_try`),
+	 INDEX `done_pid_retrial` (`done`,`pid`,`retrial`),
+	 INDEX `done_pid_priority_created` (`done`,`pid`,`priority`,`created`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Background tasks queue entries';
+
 --
 -- TABLE delayed-post
 --
@@ -529,9 +528,12 @@ CREATE TABLE IF NOT EXISTS `delayed-post` (
 	`uri` varchar(255) 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',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uid_uri` (`uid`,`uri`(190)),
-	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+	 INDEX `wid` (`wid`),
+	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`wid`) REFERENCES `workerqueue` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Posts that are about to be distributed at a later time';
 
 --
@@ -1367,7 +1369,8 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`education` text COMMENT 'Deprecated',
 	`contact` text COMMENT 'Deprecated',
 	`homepage` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`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 '',
 	`publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory',
@@ -1378,23 +1381,6 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='user profiles data';
 
---
--- TABLE profile_check
---
-CREATE TABLE IF NOT EXISTS `profile_check` (
-	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
-	`dfrn_id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`sec` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`expire` int unsigned NOT NULL DEFAULT 0 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='DFRN remote auth use';
-
 --
 -- TABLE profile_field
 --
@@ -1487,21 +1473,28 @@ CREATE TABLE IF NOT EXISTS `storage` (
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Data stored by Database storage backend';
 
 --
--- TABLE tokens
+-- TABLE subscription
 --
-CREATE TABLE IF NOT EXISTS `tokens` (
-	`id` varchar(40) NOT NULL COMMENT '',
-	`secret` text COMMENT '',
-	`client_id` varchar(20) NOT NULL DEFAULT '',
-	`expires` int NOT NULL DEFAULT 0 COMMENT '',
-	`scope` varchar(200) NOT NULL DEFAULT '' COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+CREATE TABLE IF NOT EXISTS `subscription` (
+	`id` int unsigned NOT NULL auto_increment COMMENT 'Auto incremented image data id',
+	`application-id` int unsigned NOT NULL COMMENT '',
+	`uid` mediumint unsigned NOT NULL COMMENT 'Owner User id',
+	`endpoint` varchar(511) COMMENT 'Endpoint URL',
+	`pubkey` varchar(127) COMMENT 'User agent public key',
+	`secret` varchar(32) COMMENT 'Auth secret',
+	`follow` boolean COMMENT '',
+	`favourite` boolean COMMENT '',
+	`reblog` boolean COMMENT '',
+	`mention` boolean COMMENT '',
+	`poll` boolean COMMENT '',
+	`follow_request` boolean COMMENT '',
+	`status` boolean COMMENT '',
 	 PRIMARY KEY(`id`),
-	 INDEX `client_id` (`client_id`),
-	 INDEX `uid` (`uid`),
-	FOREIGN KEY (`client_id`) REFERENCES `clients` (`client_id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	 UNIQUE INDEX `application-id_uid` (`application-id`,`uid`),
+	 INDEX `uid_application-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 usage';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Push Subscription for the API';
 
 --
 -- TABLE userd
@@ -1537,31 +1530,6 @@ CREATE TABLE IF NOT EXISTS `worker-ipc` (
 	 PRIMARY KEY(`key`)
 ) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Inter process communication between the frontend and the worker';
 
---
--- TABLE workerqueue
---
-CREATE TABLE IF NOT EXISTS `workerqueue` (
-	`id` int unsigned NOT NULL auto_increment COMMENT 'Auto incremented worker task id',
-	`command` varchar(100) COMMENT 'Task command',
-	`parameter` mediumtext COMMENT 'Task parameter',
-	`priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Task priority',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
-	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
-	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Execution date',
-	`next_try` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
-	`retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
-	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked 1 when the task was done - will be deleted later',
-	 PRIMARY KEY(`id`),
-	 INDEX `command` (`command`),
-	 INDEX `done_command_parameter` (`done`,`command`,`parameter`(64)),
-	 INDEX `done_executed` (`done`,`executed`),
-	 INDEX `done_priority_retrial_created` (`done`,`priority`,`retrial`,`created`),
-	 INDEX `done_priority_next_try` (`done`,`priority`,`next_try`),
-	 INDEX `done_pid_next_try` (`done`,`pid`,`next_try`),
-	 INDEX `done_pid_retrial` (`done`,`pid`,`retrial`),
-	 INDEX `done_pid_priority_created` (`done`,`pid`,`priority`,`created`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Background tasks queue entries';
-
 --
 -- VIEW application-view
 --
@@ -2259,6 +2227,7 @@ CREATE VIEW `owner-view` AS SELECT
 	`contact`.`keywords` AS `keywords`,
 	`contact`.`gender` AS `gender`,
 	`contact`.`xmpp` AS `xmpp`,
+	`contact`.`matrix` AS `matrix`,
 	`contact`.`attag` AS `attag`,
 	`contact`.`avatar` AS `avatar`,
 	`contact`.`photo` AS `photo`,
@@ -2385,6 +2354,7 @@ CREATE VIEW `account-view` AS SELECT
 	`contact`.`about` AS `about`,
 	`contact`.`keywords` AS `keywords`,
 	`contact`.`xmpp` AS `xmpp`,
+	`contact`.`matrix` AS `matrix`,
 	`contact`.`avatar` AS `avatar`,
 	`contact`.`photo` AS `photo`,
 	`contact`.`thumb` AS `thumb`,
@@ -2468,6 +2438,7 @@ CREATE VIEW `account-user-view` AS SELECT
 	`contact`.`about` AS `about`,
 	`contact`.`keywords` AS `keywords`,
 	`contact`.`xmpp` AS `xmpp`,
+	`contact`.`matrix` AS `matrix`,
 	`contact`.`avatar` AS `avatar`,
 	`contact`.`photo` AS `photo`,
 	`contact`.`thumb` AS `thumb`,