Fixed wrong reference to user.expire in Model\User::getActorName

[friendica.git] / static / dbstructure.config.php

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 1e7fae786feb07834dc3a97b23c0023a6b1a933e..f957596b6424571e12d6e4bbd838b1833c73885b 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1483);
+       define('DB_UPDATE_VERSION', 1489);
 }
 
 return [
@@ -136,7 +136,7 @@ return [
                        "pwdreset" => ["type" => "varchar(255)", "comment" => "Password reset request token"],
                        "pwdreset_time" => ["type" => "datetime", "comment" => "Timestamp of the last password reset request"],
                        "maxreq" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
-                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Delay in days before deleting user-related posts. Scope is controlled by pConfig."],
                        "account_removed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if 1 the account is removed"],
                        "account_expired" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
                        "account_expires_on" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp when account expires and will be deleted"],
@@ -371,6 +371,19 @@ return [
                        "uid" => ["uid"],
                ]
        ],
+       "account-user" => [
+               "comment" => "Remote and local accounts",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uri-id" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the account url"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "User ID"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uri-id_uid" => ["UNIQUE", "uri-id", "uid"],
+                       "uid_uri-id" => ["uid", "uri-id"],
+               ]
+       ],
        "addon" => [
                "comment" => "registered addons",
                "fields" => [
@@ -684,6 +697,7 @@ return [
                        "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
                        "alias" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""],
                        "pubkey" => ["type" => "text", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
                        "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
                        "interacting_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts this contact interactes with"],
                        "interacted_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts that interacted with this contact"],
@@ -1051,20 +1065,6 @@ return [
                        "uid" => ["uid"],
                ]
        ],
-       "pagecache" => [
-               "comment" => "Stores temporary data",
-               "fields" => [
-                       "page" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "Page"],
-                       "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the uri the page belongs to"],
-                       "content" => ["type" => "mediumtext", "comment" => "Page content"],
-                       "fetched" => ["type" => "datetime", "comment" => "date when the page had been fetched"],
-               ],
-               "indexes" => [
-                       "PRIMARY" => ["page"],
-                       "fetched" => ["fetched"],
-                       "uri-id" => ["uri-id"],
-               ],
-       ],
        "parsed_url" => [
                "comment" => "cache for 'parse_url' queries",
                "fields" => [
@@ -1218,6 +1218,7 @@ return [
                        "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"],
+                       "quote-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the quoted uri"],
                        "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"],
@@ -1236,6 +1237,7 @@ return [
                        "plink" => ["plink(191)"],
                        "resource-id" => ["resource-id"],
                        "title-content-warning-body" => ["FULLTEXT", "title", "content-warning", "body"],
+                       "quote-uri-id" => ["quote-uri-id"],
                ]
        ],
        "post-delivery" => [
@@ -1319,6 +1321,7 @@ return [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
                        "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"],
                        "url" => ["type" => "varbinary(1024)", "not null" => "1", "comment" => "Media URL"],
+                       "media-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the activities uri-id"],
                        "type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Media type"],
                        "mimetype" => ["type" => "varchar(60)", "comment" => ""],
                        "height" => ["type" => "smallint unsigned", "comment" => "Height of the media"],
@@ -1340,6 +1343,7 @@ return [
                        "PRIMARY" => ["id"],
                        "uri-id-url" => ["UNIQUE", "uri-id", "url(512)"],
                        "uri-id-id" => ["uri-id", "id"],
+                       "media-uri-id" => ["media-uri-id"],
                ]
        ],
        "post-question" => [
@@ -1576,6 +1580,7 @@ return [
                        "education" => ["type" => "text", "comment" => "Deprecated"],
                        "contact" => ["type" => "text", "comment" => "Deprecated"],
                        "homepage" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "homepage_verified" => ["type" => "boolean", "not null" => 1, "default" => "0", "comment" => "was the homepage verified by a rel-me link back to the profile"],
                        "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "XMPP address"],
                        "matrix" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Matrix address"],
                        "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""],
@@ -1644,6 +1649,33 @@ return [
                        "uid" => ["uid"],
                ]
        ],
+       "report" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "Reporting user"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["contact" => "id"], "comment" => "Reported contact"],
+                       "comment" => ["type" => "text", "comment" => "Report"],
+                       "forward" => ["type" => "boolean", "comment" => "Forward the report to the remote server"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+                       "cid" => ["cid"],
+               ]
+       ],
+       "report-post" => [
+               "comment" => "",
+               "fields" => [
+                       "rid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["report" => "id"], "comment" => "Report id"],
+                       "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Uri-id of the reported post"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["rid", "uri-id"],
+                       "uri-id" => ["uri-id"],
+               ]
+       ],
        "search" => [
                "comment" => "",
                "fields" => [