Merge pull request #11392 from annando/new-acitivities

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 39e40c044a5286c726e2cad49c0439c4a6135fd6..b986cc409f9df08edc702acd2d22a845796f0b61 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2022.05-dev (Siberian Iris)
--- DB_UPDATE_VERSION 1452
+-- DB_UPDATE_VERSION 1454
 -- ------------------------------------------
 
 
@@ -332,6 +332,8 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
        `inbox` varchar(255) NOT NULL COMMENT '',
        `outbox` varchar(255) COMMENT '',
        `sharedinbox` varchar(255) COMMENT '',
+       `featured` varchar(255) COMMENT 'Address for the collection of featured posts',
+       `featured-tags` varchar(255) COMMENT 'Address for the collection of featured tags',
        `manually-approve` boolean COMMENT '',
        `discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory',
        `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -2412,10 +2414,8 @@ CREATE VIEW `account-view` AS SELECT
        `contact`.`archive` AS `archive`,
        `contact`.`deleted` AS `deleted`,
        `contact`.`blocked` AS `blocked`,
-       `contact`.`request` AS `dfrn-request`,
        `contact`.`notify` AS `dfrn-notify`,
        `contact`.`poll` AS `dfrn-poll`,
-       `contact`.`confirm` AS `dfrn-confirm`,
        `fcontact`.`guid` AS `diaspora-guid`,
        `fcontact`.`batch` AS `diaspora-batch`,
        `fcontact`.`notify` AS `diaspora-notify`,
@@ -2431,11 +2431,15 @@ CREATE VIEW `account-view` AS SELECT
        `apcontact`.`generator` AS `ap-generator`,
        `apcontact`.`following_count` AS `ap-following_count`,
        `apcontact`.`followers_count` AS `ap-followers_count`,
-       `apcontact`.`statuses_count` AS `ap-statuses_count`
+       `apcontact`.`statuses_count` AS `ap-statuses_count`,
+       `gserver`.`site_name` AS `site_name`,
+       `gserver`.`platform` AS `platform`,
+       `gserver`.`version` AS `version`
        FROM `contact`
                        LEFT JOIN `item-uri` ON `item-uri`.`id` = `contact`.`uri-id`
                        LEFT JOIN `apcontact` ON `apcontact`.`uri-id` = `contact`.`uri-id`
                        LEFT JOIN `fcontact` ON `fcontact`.`uri-id` = contact.`uri-id`
+                       LEFT JOIN `gserver` ON `gserver`.`id` = contact.`gsid`
                        WHERE `contact`.`uid` = 0;
 
 --
@@ -2511,10 +2515,8 @@ CREATE VIEW `account-user-view` AS SELECT
        `ucontact`.`subhub` AS `subhub`,
        `ucontact`.`hub-verify` AS `hub-verify`,
        `ucontact`.`reason` AS `reason`,
-       `contact`.`request` AS `dfrn-request`,
        `contact`.`notify` AS `dfrn-notify`,
        `contact`.`poll` AS `dfrn-poll`,
-       `contact`.`confirm` AS `dfrn-confirm`,
        `fcontact`.`guid` AS `diaspora-guid`,
        `fcontact`.`batch` AS `diaspora-batch`,
        `fcontact`.`notify` AS `diaspora-notify`,
@@ -2530,12 +2532,16 @@ CREATE VIEW `account-user-view` AS SELECT
        `apcontact`.`generator` AS `ap-generator`,
        `apcontact`.`following_count` AS `ap-following_count`,
        `apcontact`.`followers_count` AS `ap-followers_count`,
-       `apcontact`.`statuses_count` AS `ap-statuses_count`
+       `apcontact`.`statuses_count` AS `ap-statuses_count`,
+       `gserver`.`site_name` AS `site_name`,
+       `gserver`.`platform` AS `platform`,
+       `gserver`.`version` AS `version`
        FROM `contact` AS `ucontact`
                        INNER JOIN `contact` ON `contact`.`uri-id` = `ucontact`.`uri-id` AND `contact`.`uid` = 0
                        LEFT JOIN `item-uri` ON `item-uri`.`id` = `ucontact`.`uri-id`
                        LEFT JOIN `apcontact` ON `apcontact`.`uri-id` = `ucontact`.`uri-id`
-                       LEFT JOIN `fcontact` ON `fcontact`.`uri-id` = `ucontact`.`uri-id` AND `fcontact`.`network` = 'dspr';
+                       LEFT JOIN `fcontact` ON `fcontact`.`uri-id` = `ucontact`.`uri-id` AND `fcontact`.`network` = 'dspr'
+                       LEFT JOIN `gserver` ON `gserver`.`id` = contact.`gsid`;
 
 --
 -- VIEW pending-view