Quickfix for hashtags in usernames in shared posts

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index cc2e4b790a487531dccd6b6ee090e902b4c72881..b6dcb8ab7ff5f2ee849bdcc4f7dbee3065ca888e 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.06-rc (Siberian Iris)
--- DB_UPDATE_VERSION 1421
+-- DB_UPDATE_VERSION 1424
 -- ------------------------------------------
 
 
@@ -120,6 +120,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
        `thumb` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)',
        `micro` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (micro size)',
+       `header` varchar(255) COMMENT 'Header picture',
        `site-pubkey` text COMMENT '',
        `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -339,10 +340,12 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
        `outbox` varchar(255) COMMENT '',
        `sharedinbox` varchar(255) COMMENT '',
        `manually-approve` boolean COMMENT '',
+       `discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory',
        `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `name` varchar(255) COMMENT '',
        `about` text COMMENT '',
        `photo` varchar(255) COMMENT '',
+       `header` varchar(255) COMMENT 'Header picture',
        `addr` varchar(255) COMMENT '',
        `alias` varchar(255) COMMENT '',
        `pubkey` text COMMENT '',
@@ -1874,7 +1877,9 @@ CREATE VIEW `post-thread-user-view` AS SELECT
        `parent-post`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
-       `parent-post-author`.`network` AS `parent-author-network`
+       `parent-post-author`.`network` AS `parent-author-network`,
+       `parent-post-author`.`blocked` AS `parent-author-blocked`,
+       `parent-post-author`.`hidden` AS `parent-author-hidden`
        FROM `post-thread-user`
                        INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
@@ -1938,6 +1943,31 @@ CREATE VIEW `post-view` AS SELECT
        `post-content`.`target-type` AS `target-type`,
        `post-content`.`target` AS `target`,
        `post-content`.`resource-id` AS `resource-id`,
+       `post`.`author-id` AS `contact-id`,
+       `author`.`url` AS `contact-link`,
+       `author`.`addr` AS `contact-addr`,
+       `author`.`name` AS `contact-name`,
+       `author`.`nick` AS `contact-nick`,
+       `author`.`thumb` AS `contact-avatar`,
+       `author`.`network` AS `contact-network`,
+       `author`.`blocked` AS `contact-blocked`,
+       `author`.`hidden` AS `contact-hidden`,
+       `author`.`readonly` AS `contact-readonly`,
+       `author`.`archive` AS `contact-archive`,
+       `author`.`pending` AS `contact-pending`,
+       `author`.`rel` AS `contact-rel`,
+       `author`.`uid` AS `contact-uid`,
+       `author`.`contact-type` AS `contact-contact-type`,
+       IF (`post`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `author`.`writable`) AS `writable`,
+       false AS `self`,
+       `author`.`id` AS `cid`,
+       `author`.`alias` AS `alias`,
+       `author`.`photo` AS `photo`,
+       `author`.`name-date` AS `name-date`,
+       `author`.`uri-date` AS `uri-date`,
+       `author`.`avatar-date` AS `avatar-date`,
+       `author`.`thumb` AS `thumb`,
+       `author`.`dfrn-id` AS `dfrn-id`,
        `post`.`author-id` AS `author-id`,
        `author`.`url` AS `author-link`,
        `author`.`addr` AS `author-addr`,
@@ -1973,7 +2003,9 @@ CREATE VIEW `post-view` AS SELECT
        `parent-post`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
-       `parent-post-author`.`network` AS `parent-author-network`
+       `parent-post-author`.`network` AS `parent-author-network`,
+       `parent-post-author`.`blocked` AS `parent-author-blocked`,
+       `parent-post-author`.`hidden` AS `parent-author-hidden`
        FROM `post`
                        STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post`.`author-id`
@@ -2033,6 +2065,31 @@ CREATE VIEW `post-thread-view` AS SELECT
        `post-content`.`target-type` AS `target-type`,
        `post-content`.`target` AS `target`,
        `post-content`.`resource-id` AS `resource-id`,
+       `post-thread`.`author-id` AS `contact-id`,
+       `author`.`url` AS `contact-link`,
+       `author`.`addr` AS `contact-addr`,
+       `author`.`name` AS `contact-name`,
+       `author`.`nick` AS `contact-nick`,
+       `author`.`thumb` AS `contact-avatar`,
+       `author`.`network` AS `contact-network`,
+       `author`.`blocked` AS `contact-blocked`,
+       `author`.`hidden` AS `contact-hidden`,
+       `author`.`readonly` AS `contact-readonly`,
+       `author`.`archive` AS `contact-archive`,
+       `author`.`pending` AS `contact-pending`,
+       `author`.`rel` AS `contact-rel`,
+       `author`.`uid` AS `contact-uid`,
+       `author`.`contact-type` AS `contact-contact-type`,
+       IF (`post`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `author`.`writable`) AS `writable`,
+       false AS `self`,
+       `author`.`id` AS `cid`,
+       `author`.`alias` AS `alias`,
+       `author`.`photo` AS `photo`,
+       `author`.`name-date` AS `name-date`,
+       `author`.`uri-date` AS `uri-date`,
+       `author`.`avatar-date` AS `avatar-date`,
+       `author`.`thumb` AS `thumb`,
+       `author`.`dfrn-id` AS `dfrn-id`,
        `post-thread`.`author-id` AS `author-id`,
        `author`.`url` AS `author-link`,
        `author`.`addr` AS `author-addr`,
@@ -2068,7 +2125,9 @@ CREATE VIEW `post-thread-view` AS SELECT
        `parent-post`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
-       `parent-post-author`.`network` AS `parent-author-network`
+       `parent-post-author`.`network` AS `parent-author-network`,
+       `parent-post-author`.`blocked` AS `parent-author-blocked`,
+       `parent-post-author`.`hidden` AS `parent-author-hidden`
        FROM `post-thread`
                        INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id`
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id`
@@ -2200,6 +2259,7 @@ CREATE VIEW `owner-view` AS SELECT
        `contact`.`photo` AS `photo`,
        `contact`.`thumb` AS `thumb`,
        `contact`.`micro` AS `micro`,
+       `contact`.`header` AS `header`,
        `contact`.`site-pubkey` AS `site-pubkey`,
        `contact`.`issued-id` AS `issued-id`,
        `contact`.`dfrn-id` AS `dfrn-id`,