X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdbstructure.config.php;h=5cbd7cd2bee6edea439f40d476c9315cacfb0489;hb=38196aec674ca9acc5db7e72898b52906f0d9070;hp=77b57bfb95d45acb3def8a2c9ade8d1ea50578db;hpb=f9430175c6b35c4fc3d932d07f933d0570a16c65;p=friendica.git

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 77b57bfb95..5cbd7cd2be 100644
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -46,7 +46,7 @@
  * ],
  *
  * Whenever possible prefer "foreign" before "relation" with the foreign keys.
- * "foreign" adds true foreign keys on the database level, while "relation" simulates this behaviour.
+ * "foreign" adds true foreign keys on the database level, while "relation" is just an indicator of a table relation without any consequences
  *
  * If you need to make any change, make sure to increment the DB_UPDATE_VERSION constant value below.
  *
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1390);
+	define('DB_UPDATE_VERSION', 1412);
 }
 
 return [
@@ -91,6 +91,7 @@ return [
 			"PRIMARY" => ["id"],
 			"nurl" => ["UNIQUE", "nurl(190)"],
 			"next_contact" => ["next_contact"],
+			"network" => ["network"],
 		]
 	],
 	"user" => [
@@ -147,6 +148,8 @@ return [
 			"PRIMARY" => ["uid"],
 			"nickname" => ["nickname(32)"],
 			"parent-uid" => ["parent-uid"],
+			"guid" => ["guid"],
+			"email" => ["email(64)"],
 		]
 	],
 	"contact" => [
@@ -242,6 +245,7 @@ return [
 			"blocked_uid" => ["blocked", "uid"],
 			"uid_rel_network_poll" => ["uid", "rel", "network", "poll(64)", "archive"],
 			"uid_network_batch" => ["uid", "network", "batch(64)"],
+			"batch_contact-type" => ["batch(64)", "contact-type"],
 			"addr_uid" => ["addr(128)", "uid"],
 			"nurl_uid" => ["nurl(128)", "uid"],
 			"nick_uid" => ["nick(128)", "uid"],
@@ -251,6 +255,10 @@ return [
 			"network_uid_lastupdate" => ["network", "uid", "last-update"],
 			"uid_network_self_lastupdate" => ["uid", "network", "self", "last-update"],
 			"uid_lastitem" => ["uid", "last-item"],
+			"baseurl" => ["baseurl(64)"],
+			"uid_contact-type" => ["uid", "contact-type"],
+			"uid_self_contact-type" => ["uid", "self", "contact-type"],
+			"self_network_uid" => ["self", "network", "uid"],
 			"gsid" => ["gsid"]
 		]
 	],
@@ -317,7 +325,8 @@ return [
 			"name" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""]
 		],
 		"indexes" => [
-			"PRIMARY" => ["id"]
+			"PRIMARY" => ["id"],
+			"name" => ["name"]
 		]
 	],
 	// Main tables
@@ -348,6 +357,20 @@ return [
 			"PRIMARY" => ["uid", "code"]
 		]
 	],
+	"2fa_trusted_browser" => [
+		"comment" => "Two-factor authentication trusted browsers",
+		"fields" => [
+			"cookie_hash" => ["type" => "varchar(80)", "not null" => "1", "primary" => "1", "comment" => "Trusted cookie hash"],
+			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "User ID"],
+			"user_agent" => ["type" => "text", "comment" => "User agent string"],
+			"created" => ["type" => "datetime", "not null" => "1", "comment" => "Datetime the trusted browser was recorded"],
+			"last_used" => ["type" => "datetime", "comment" => "Datetime the trusted browser was last used"],
+		],
+		"indexes" => [
+			"PRIMARY" => ["cookie_hash"],
+			"uid" => ["uid"],
+		]
+	],
 	"addon" => [
 		"comment" => "registered addons",
 		"fields" => [
@@ -361,6 +384,7 @@ return [
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],
+			"installed_name" => ["installed", "name"],
 			"name" => ["UNIQUE", "name"],
 		]
 	],
@@ -466,6 +490,7 @@ return [
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],
+			"expire" => ["expire"],
 		]
 	],
 	"config" => [
@@ -679,6 +704,7 @@ return [
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],
+			"priority" => ["priority"],
 			"hook_file_function" => ["UNIQUE", "hook", "file", "function"],
 		]
 	],
@@ -729,172 +755,6 @@ return [
 			"uid" => ["uid"],
 		]
 	],
-	"item" => [
-		"comment" => "Structure for all posts",
-		"fields" => [
-			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-			"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this item"],
-			"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-			"uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
-			"parent" => ["type" => "int unsigned", "relation" => ["item" => "id"], "comment" => "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"],
-			"parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "uri of the top-level parent to this item"],
-			"parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the top-level parent uri"],
-			"thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"],
-			"thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"],
-			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."],
-			"edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"],
-			"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last comment/reply to this item"],
-			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"],
-			"changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
-			"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"],
-			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the owner of this item"],
-			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
-			"causer-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
-			"icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"],
-			"vid" => ["type" => "smallint unsigned", "foreign" => ["verb" => "id", "on delete" => "restrict"], "comment" => "Id of the verb table entry that contains the activity verbs"],
-			"extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-			"post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
-			"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"private" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "0=public, 1=private, 2=unlisted"],
-			"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been deleted"],
-			// User specific fields. Eventually they will move to user-item
-			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
-			"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id"],
-			"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
-			"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
-			"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been favourited"],
-			"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "item has not been seen"],
-			"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "The owner of this item was mentioned in it"],
-			"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-			"psid" => ["type" => "int unsigned", "foreign" => ["permissionset" => "id", "on delete" => "restrict"], "comment" => "ID of the permission set of this post"],
-			// It has to be decided whether these fields belong to the user or the structure
-			"resource-id" => ["type" => "varchar(32)", "not null" => "1", "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" => ["type" => "int unsigned", "relation" => ["event" => "id"], "comment" => "Used to link to the event.id"],
-			// Deprecated fields. Will be removed in upcoming versions
-			"iaid" => ["type" => "int unsigned", "comment" => "Deprecated"],
-			"attach" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"allow_cid" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"allow_gid" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"deny_cid" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"deny_gid" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"postopts" => ["type" => "text", "comment" => "Deprecated"],
-			"inform" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"type" => ["type" => "varchar(20)", "comment" => "Deprecated"],
-			"bookmark" => ["type" => "boolean", "comment" => "Deprecated"],
-			"file" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"location" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"coord" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"tag" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"plink" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"title" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"content-warning" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"body" => ["type" => "mediumtext", "comment" => "Deprecated"],
-			"app" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"verb" => ["type" => "varchar(100)", "comment" => "Deprecated"],
-			"object-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
-			"object" => ["type" => "text", "comment" => "Deprecated"],
-			"target-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
-			"target" => ["type" => "text", "comment" => "Deprecated"],
-			"author-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"author-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"author-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"owner-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"owner-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"owner-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
-			"rendered-hash" => ["type" => "varchar(32)", "comment" => "Deprecated"],
-			"rendered-html" => ["type" => "mediumtext", "comment" => "Deprecated"],
-		],
-		"indexes" => [
-			"PRIMARY" => ["id"],
-			"guid" => ["guid(191)"],
-			"uri" => ["uri(191)"],
-			"parent" => ["parent"],
-			"parent-uri" => ["parent-uri(191)"],
-			"extid" => ["extid(191)"],
-			"uid_id" => ["uid", "id"],
-			"uid_contactid_id" => ["uid", "contact-id", "id"],
-			"uid_received" => ["uid", "received"],
-			"uid_commented" => ["uid", "commented"],
-			"uid_unseen_contactid" => ["uid", "unseen", "contact-id"],
-			"uid_network_received" => ["uid", "network", "received"],
-			"uid_network_commented" => ["uid", "network", "commented"],
-			"uid_thrparent" => ["uid", "thr-parent(190)"],
-			"uid_parenturi" => ["uid", "parent-uri(190)"],
-			"uid_contactid_received" => ["uid", "contact-id", "received"],
-			"authorid_received" => ["author-id", "received"],
-			"ownerid" => ["owner-id"],
-			"contact-id" => ["contact-id"],
-			"uid_uri" => ["uid", "uri(190)"],
-			"resource-id" => ["resource-id"],
-			"deleted_changed" => ["deleted", "changed"],
-			"uid_wall_changed" => ["uid", "wall", "changed"],
-			"uid_unseen_wall" => ["uid", "unseen", "wall"],
-			"mention_uid_id" => ["mention", "uid", "id"],
-			"uid_eventid" => ["uid", "event-id"],
-			"icid" => ["icid"],
-			"iaid" => ["iaid"],
-			"vid" => ["vid"],
-			"psid_wall" => ["psid", "wall"],
-			"uri-id" => ["uri-id"],
-			"parent-uri-id" => ["parent-uri-id"],
-			"thr-parent-id" => ["thr-parent-id"],
-			"causer-id" => ["causer-id"],
-		]
-	],
-	"item-activity" => [
-		"comment" => "Activities for items",
-		"fields" => [
-			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-			"uri" => ["type" => "varchar(255)", "comment" => ""],
-			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-			"uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
-			"activity" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""]
-		],
-		"indexes" => [
-			"PRIMARY" => ["id"],
-			"uri-hash" => ["UNIQUE", "uri-hash"],
-			"uri" => ["uri(191)"],
-			"uri-id" => ["uri-id"]
-		]
-	],
-	"item-content" => [
-		"comment" => "Content for all posts",
-		"fields" => [
-			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-			"uri" => ["type" => "varchar(255)", "comment" => ""],
-			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-			"uri-plink-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
-			"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
-			"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-			"body" => ["type" => "mediumtext", "comment" => "item body content"],
-			"raw-body" => ["type" => "mediumtext", "comment" => "Body without embedded media links"],
-			"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"],
-			"coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
-			"language" => ["type" => "text", "comment" => "Language information about this post"],
-			"app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"],
-			"rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-			"rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"],
-			"object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams object type"],
-			"object" => ["type" => "text", "comment" => "JSON encoded object structure unless it is an implied object (normal post)"],
-			"target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"],
-			"target" => ["type" => "text", "comment" => "JSON encoded target structure if used"],
-			"plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"],
-			"verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams verb"]
-		],
-		"indexes" => [
-			"PRIMARY" => ["id"],
-			"uri-plink-hash" => ["UNIQUE", "uri-plink-hash"],
-			"title-content-warning-body" => ["FULLTEXT", "title", "content-warning", "body"],
-			"uri" => ["uri(191)"],
-			"plink" => ["plink(191)"],
-			"uri-id" => ["uri-id"]
-		]
-	],
 	"locks" => [
 		"comment" => "",
 		"fields" => [
@@ -986,8 +846,8 @@ return [
 			"msg" => ["type" => "mediumtext", "comment" => ""],
 			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
 			"link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-			"iid" => ["type" => "int unsigned", "relation" => ["item" => "id"], "comment" => "item.id"],
-			"parent" => ["type" => "int unsigned", "relation" => ["item" => "id"], "comment" => ""],
+			"iid" => ["type" => "int unsigned", "comment" => ""],
+			"parent" => ["type" => "int unsigned", "comment" => ""],
 			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the related post"],
 			"parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"],
 			"seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
@@ -1010,7 +870,7 @@ return [
 		"fields" => [
 			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
 			"notify-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["notify" => "id"], "comment" => ""],
-			"master-parent-item" => ["type" => "int unsigned", "foreign" => ["item" => "id"], "comment" => ""],
+			"master-parent-item" => ["type" => "int unsigned", "comment" => "Deprecated"],
 			"master-parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"],
 			"parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
 			"receiver-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"],
@@ -1018,7 +878,6 @@ return [
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],
-			"master-parent-item" => ["master-parent-item"],
 			"master-parent-uri-id" => ["master-parent-uri-id"],
 			"receiver-uid" => ["receiver-uid"],
 			"notify-id" => ["notify-id"],
@@ -1055,29 +914,18 @@ return [
 	"parsed_url" => [
 		"comment" => "cache for 'parse_url' queries",
 		"fields" => [
-			"url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "page url"],
+			"url_hash" => ["type" => "binary(64)", "not null" => "1", "primary" => "1", "comment" => "page url hash"],
 			"guessing" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => "is the 'guessing' mode active?"],
 			"oembed" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => "is the data the result of oembed?"],
+			"url" => ["type" => "text", "not null" => "1", "comment" => "page url"],
 			"content" => ["type" => "mediumtext", "comment" => "page data"],
 			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of creation"],
+			"expires" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of expiration"],
 		],
 		"indexes" => [
-			"PRIMARY" => ["url", "guessing", "oembed"],
+			"PRIMARY" => ["url_hash", "guessing", "oembed"],
 			"created" => ["created"],
-		]
-	],
-	"participation" => [
-		"comment" => "Storage for participation messages from Diaspora",
-		"fields" => [
-			"iid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item" => "id"], "comment" => ""],
-			"server" => ["type" => "varchar(60)", "not null" => "1", "primary" => "1", "comment" => ""],
-			"cid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["contact" => "id"], "comment" => ""],
-			"fid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["fcontact" => "id"], "comment" => ""],
-		],
-		"indexes" => [
-			"PRIMARY" => ["iid", "server"],
-			"cid" => ["cid"],
-			"fid" => ["fid"]
+			"expires" => ["expires"],
 		]
 	],
 	"pconfig" => [
@@ -1135,6 +983,39 @@ return [
 			"resource-id" => ["resource-id"],
 		]
 	],
+	"post" => [
+		"comment" => "Structure for all posts",
+		"fields" => [
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the parent uri"],
+			"thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"],
+			"external-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the external uri"],
+			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."],
+			"edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"],
+			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"],
+			"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"],
+			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the owner of this item"],
+			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
+			"causer-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
+			"post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
+			"vid" => ["type" => "smallint unsigned", "foreign" => ["verb" => "id", "on delete" => "restrict"], "comment" => "Id of the verb table entry that contains the activity verbs"],
+			"private" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "0=public, 1=private, 2=unlisted"],
+			"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been marked for deletion"]
+		],
+		"indexes" => [
+			"PRIMARY" => ["uri-id"],
+			"parent-uri-id" => ["parent-uri-id"],
+			"thr-parent-id" => ["thr-parent-id"],
+			"external-id" => ["external-id"],
+			"owner-id" => ["owner-id"],
+			"author-id" => ["author-id"],
+			"causer-id" => ["causer-id"],
+			"vid" => ["vid"],
+		]
+	],
 	"post-category" => [
 		"comment" => "post relation to categories",
 		"fields" => [
@@ -1149,6 +1030,34 @@ return [
 			"uid" => ["uid"],
 		]
 	],
+	"post-content" => [
+		"comment" => "Content for all posts",
+		"fields" => [
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
+			"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+			"body" => ["type" => "mediumtext", "comment" => "item body content"],
+			"raw-body" => ["type" => "mediumtext", "comment" => "Body without embedded media links"],
+			"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"],
+			"coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
+			"language" => ["type" => "text", "comment" => "Language information about this post"],
+			"app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"],
+			"rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+			"rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"],
+			"object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams object type"],
+			"object" => ["type" => "text", "comment" => "JSON encoded object structure unless it is an implied object (normal post)"],
+			"target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"],
+			"target" => ["type" => "text", "comment" => "JSON encoded target structure if used"],
+			"resource-id" => ["type" => "varchar(32)", "not null" => "1", "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" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"]
+		],
+		"indexes" => [
+			"PRIMARY" => ["uri-id"],
+			"plink" => ["plink(191)"],
+			"resource-id" => ["resource-id"],
+			"title-content-warning-body" => ["FULLTEXT", "title", "content-warning", "body"],
+		]
+	],
 	"post-delivery-data" => [
 		"comment" => "Delivery data for items",
 		"fields" => [
@@ -1203,24 +1112,139 @@ return [
 			"cid" => ["cid"]
 		]
 	],
+	"post-thread" => [
+		"comment" => "Thread related data",
+		"fields" => [
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item owner"],
+			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item author"],
+			"causer-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
+			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+			"changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],			
+			"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""]
+		],
+		"indexes" => [
+			"PRIMARY" => ["uri-id"],
+			"owner-id" => ["owner-id"],
+			"author-id" => ["author-id"],
+			"causer-id" => ["causer-id"],
+			"received" => ["received"],
+			"commented" => ["commented"],
+		]
+	],
 	"post-user" => [
 		"comment" => "User specific post data",
 		"fields" => [
-			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
+			"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the parent uri"],
+			"thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"],
+			"external-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the external uri"],
+			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."],
+			"edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"],
+			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"],
+			"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"],
+			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the owner of this item"],
+			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
+			"causer-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
+			"post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
+			"vid" => ["type" => "smallint unsigned", "foreign" => ["verb" => "id", "on delete" => "restrict"], "comment" => "Id of the verb table entry that contains the activity verbs"],
+			"private" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "0=public, 1=private, 2=unlisted"],
+			"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been marked for deletion"],
+			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
 			"protocol" => ["type" => "tinyint unsigned", "comment" => "Protocol used to deliver the item for this user"],
 			"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id"],
+			"event-id" => ["type" => "int unsigned", "foreign" => ["event" => "id"], "comment" => "Used to link to the event.id"],
 			"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "post has not been seen"],
 			"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide the post from the user"],
 			"notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+			"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
 			"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
 			"psid" => ["type" => "int unsigned", "foreign" => ["permissionset" => "id", "on delete" => "restrict"], "comment" => "ID of the permission set of this post"],
 		],
+		"indexes" => [
+			"PRIMARY" => ["id"],
+			"uid_uri-id" => ["UNIQUE", "uid", "uri-id"],
+			"uri-id" => ["uri-id"],
+			"parent-uri-id" => ["parent-uri-id"],
+			"thr-parent-id" => ["thr-parent-id"],
+			"external-id" => ["external-id"],
+			"owner-id" => ["owner-id"],
+			"author-id" => ["author-id"],
+			"causer-id" => ["causer-id"],
+			"vid" => ["vid"],
+			"contact-id" => ["contact-id"],
+			"event-id" => ["event-id"],
+			"psid" => ["psid"],
+			"author-id_uid" => ["author-id", "uid"],
+			"author-id_received" => ["author-id", "received"],
+			"parent-uri-id_uid" => ["parent-uri-id", "uid"],
+			"uid_contactid" => ["uid", "contact-id"],
+			"uid_unseen_contactid" => ["uid", "unseen", "contact-id"],
+			"uid_unseen" => ["uid", "unseen"],
+			"uid_hidden_uri-id" => ["uid", "hidden", "uri-id"],
+		],
+	],
+	"post-thread-user" => [
+		"comment" => "Thread related data per user",
+		"fields" => [
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item owner"],
+			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item author"],
+			"causer-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
+			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+			"changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
+			"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
+			"pinned" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "The thread is pinned on the profile page"],
+			"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Ignore updates for this thread"],
+			"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
+			"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+			"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+			"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id"],
+			"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "post has not been seen"],
+			"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide the post from the user"],
+			"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
+			"psid" => ["type" => "int unsigned", "foreign" => ["permissionset" => "id", "on delete" => "restrict"], "comment" => "ID of the permission set of this post"],
+			"post-user-id" => ["type" => "int unsigned", "foreign" => ["post-user" => "id"], "comment" => "Id of the post-user table"],
+		],
 		"indexes" => [
 			"PRIMARY" => ["uid", "uri-id"],
 			"uri-id" => ["uri-id"],
+			"owner-id" => ["owner-id"],
+			"author-id" => ["author-id"],
+			"causer-id" => ["causer-id"],
+			"uid" => ["uid"],
 			"contact-id" => ["contact-id"],
 			"psid" => ["psid"],
+			"post-user-id" => ["post-user-id"],
+			"commented" => ["commented"],
+			"uid_received" => ["uid", "received"],
+			"uid_pinned" => ["uid", "pinned"],
+			"uid_commented" => ["uid", "commented"],
+			"uid_starred" => ["uid", "starred"],
+			"uid_mention" => ["uid", "mention"],
+		]
+	],
+	"post-user-notification" => [
+		"comment" => "User post notifications",
+		"fields" => [
+			"uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
+			"notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+		],
+		"indexes" => [
+			"PRIMARY" => ["uid", "uri-id"],
+			"uri-id" => ["uri-id"],
 		],
 	],
 	"process" => [
@@ -1367,7 +1391,8 @@ return [
 		],
 		"indexes" => [
 			"PRIMARY" => ["id"],
-			"uid" => ["uid"],
+			"uid_term" => ["uid", "term(64)"],
+			"term" => ["term(64)"]
 		]
 	],
 	"session" => [
@@ -1394,53 +1419,6 @@ return [
 			"PRIMARY" => ["id"]
 		]
 	],
-	"thread" => [
-		"comment" => "Thread related data",
-		"fields" => [
-			"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "foreign" => ["item" => "id"],
-				"comment" => "sequential ID"],
-			"uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "User id"],
-			"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => ""],
-			"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item owner"],
-			"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item author"],
-			"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-			"edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-			"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-			"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-			"changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-			"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"private" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "0=public, 1=private, 2=unlisted"],
-			"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
-			"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-			"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-			"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-			"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-			"bookmark" => ["type" => "boolean", "comment" => ""],
-		],
-		"indexes" => [
-			"PRIMARY" => ["iid"],
-			"uid_network_commented" => ["uid", "network", "commented"],
-			"uid_network_received" => ["uid", "network", "received"],
-			"uid_contactid_commented" => ["uid", "contact-id", "commented"],
-			"uid_contactid_received" => ["uid", "contact-id", "received"],
-			"contactid" => ["contact-id"],
-			"ownerid" => ["owner-id"],
-			"authorid" => ["author-id"],
-			"uid_received" => ["uid", "received"],
-			"uid_commented" => ["uid", "commented"],
-			"uid_wall_received" => ["uid", "wall", "received"],
-			"private_wall_origin_commented" => ["private", "wall", "origin", "commented"],
-			"uri-id" => ["uri-id"],
-		]
-	],
 	"tokens" => [
 		"comment" => "OAuth usage",
 		"fields" => [
@@ -1482,22 +1460,6 @@ return [
 			"cid" => ["cid"],
 		]
 	],
-	"user-item" => [
-		"comment" => "User specific item data",
-		"fields" => [
-			"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "foreign" => ["item" => "id"], "comment" => "Item id"],
-			"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "User id"],
-			"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
-			"ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"],
-			"pinned" => ["type" => "boolean", "comment" => "The item is pinned on the profile page"],
-			"notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-		],
-		"indexes" => [
-			"PRIMARY" => ["uid", "iid"],
-			"uid_pinned" => ["uid", "pinned"],
-			"iid_uid" => ["iid", "uid"]
-		]
-	],
 	"worker-ipc" => [
 		"comment" => "Inter process communication between the frontend and the worker",
 		"fields" => [