Issue 14212: exclude channel only posts from the API timeline

diff --git a/database.sql b/database.sql
index 128323fcead56c61b24d3bd7d4bf3c8a977abc01..16e3b7af98a92e29e0a4f0a0a3f4ed5ea7a93e21 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2024.09-rc (Yellow Archangel)
--- DB_UPDATE_VERSION 1573
+-- DB_UPDATE_VERSION 1574
 -- ------------------------------------------
 
 
@@ -2163,7 +2163,10 @@ CREATE VIEW `post-timeline-view` AS SELECT
        `owner`.`gsid` AS `owner-gsid`,
        `post-user`.`causer-id` AS `causer-id`,
        `causer`.`blocked` AS `causer-blocked`,
-       `causer`.`gsid` AS `causer-gsid`
+       `causer`.`gsid` AS `causer-gsid`,
+       `post-thread-user`.`network` AS `parent-network`,
+       `post-thread-user`.`owner-id` AS `parent-owner-id`,
+       `post-thread-user`.`author-id` AS `parent-author-id`
        FROM `post-user`
                        LEFT JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
                        STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
@@ -2414,6 +2417,7 @@ CREATE VIEW `post-origin-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread-user`.`network` AS `parent-network`,
+       `post-thread-user`.`owner-id` AS `parent-owner-id`,
        `post-thread-user`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
@@ -2607,6 +2611,7 @@ CREATE VIEW `post-thread-origin-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread-user`.`network` AS `parent-network`,
+       `post-thread-user`.`owner-id` AS `parent-owner-id`,
        `post-thread-user`.`author-id` AS `parent-author-id`,
        `author`.`url` AS `parent-author-link`,
        `author`.`name` AS `parent-author-name`,
@@ -2800,6 +2805,7 @@ CREATE VIEW `post-user-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread-user`.`network` AS `parent-network`,
+       `post-thread-user`.`owner-id` AS `parent-owner-id`,
        `post-thread-user`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
@@ -2992,6 +2998,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread-user`.`network` AS `parent-network`,
+       `post-thread-user`.`owner-id` AS `parent-owner-id`,
        `post-thread-user`.`author-id` AS `parent-author-id`,
        `author`.`url` AS `parent-author-link`,
        `author`.`name` AS `parent-author-name`,
@@ -3148,6 +3155,7 @@ CREATE VIEW `post-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread`.`network` AS `parent-network`,
+       `post-thread`.`owner-id` AS `parent-owner-id`,
        `post-thread`.`author-id` AS `parent-author-id`,
        `parent-post-author`.`url` AS `parent-author-link`,
        `parent-post-author`.`name` AS `parent-author-name`,
@@ -3303,6 +3311,7 @@ CREATE VIEW `post-thread-view` AS SELECT
        `diaspora-interaction`.`interaction` AS `signed_text`,
        `parent-item-uri`.`guid` AS `parent-guid`,
        `post-thread`.`network` AS `parent-network`,
+       `post-thread`.`owner-id` AS `parent-owner-id`,
        `post-thread`.`author-id` AS `parent-author-id`,
        `author`.`url` AS `parent-author-link`,
        `author`.`name` AS `parent-author-name`,

diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index 9c13bb5cceed39c18722b50a076504162cc1dcb5..5d72b38ca92fd53c8b6f4600445c09f8a69eb98f 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -66,6 +66,8 @@ class Home extends BaseApi
                        $condition = DBA::mergeConditions($condition, ['gravity' => Item::GRAVITY_PARENT]);
                }
 
+               $condition = DBA::mergeConditions($condition, ["NOT EXISTS(SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` IN (`parent-owner-id`, `parent-author-id`) AND (`blocked` OR `ignored` OR `channel-only`))", $uid]);
+
                $items = Post::selectTimelineForUser($uid, ['uri-id'], $condition, $params);
 
                $display_quotes = self::appSupportsQuotes();

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 7399a6268db8f5621a303244024a740077609213..5956b5458cfc08b18368e5fae7926ec490c1671e 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -44,7 +44,7 @@ use Friendica\Database\DBA;
 
 // This file is required several times during the test in DbaDefinition which justifies this condition
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1573);
+       define('DB_UPDATE_VERSION', 1574);
 }
 
 return [

diff --git a/static/dbview.config.php b/static/dbview.config.php
index f5b293189762b542a1afd5f308d86c2b66674637..6a944d71885218e07d7b59e8109c27f7fa25f5ea 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -24,7 +24,7 @@
  *
  */
 
- return [
+return [
        "application-view" => [
                "fields" => [
                        "id" => ["application", "id"],
@@ -153,6 +153,9 @@
                        "causer-id" => ["post-user", "causer-id"],
                        "causer-blocked" => ["causer", "blocked"],
                        "causer-gsid" => ["causer", "gsid"],
+                       "parent-network" => ["post-thread-user", "network"],
+                       "parent-owner-id" => ["post-thread-user", "owner-id"],
+                       "parent-author-id" => ["post-thread-user", "author-id"],
                ],
                "query" => "FROM `post-user`
                        LEFT JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
@@ -397,6 +400,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread-user", "network"],
+                       "parent-owner-id" => ["post-thread-user", "owner-id"],
                        "parent-author-id" => ["post-thread-user", "author-id"],
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
@@ -588,6 +592,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread-user", "network"],
+                       "parent-owner-id" => ["post-thread-user", "owner-id"],
                        "parent-author-id" => ["post-thread-user", "author-id"],
                        "parent-author-link" => ["author", "url"],
                        "parent-author-name" => ["author", "name"],
@@ -779,6 +784,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread-user", "network"],
+                       "parent-owner-id" => ["post-thread-user", "owner-id"],
                        "parent-author-id" => ["post-thread-user", "author-id"],
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
@@ -969,6 +975,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread-user", "network"],
+                       "parent-owner-id" => ["post-thread-user", "owner-id"],
                        "parent-author-id" => ["post-thread-user", "author-id"],
                        "parent-author-link" => ["author", "url"],
                        "parent-author-name" => ["author", "name"],
@@ -1123,6 +1130,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread", "network"],
+                       "parent-owner-id" => ["post-thread", "owner-id"],
                        "parent-author-id" => ["post-thread", "author-id"],
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
@@ -1276,6 +1284,7 @@
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
                        "parent-network" => ["post-thread", "network"],
+                       "parent-owner-id" => ["post-thread", "owner-id"],
                        "parent-author-id" => ["post-thread", "author-id"],
                        "parent-author-link" => ["author", "url"],
                        "parent-author-name" => ["author", "name"],
@@ -1783,7 +1792,7 @@
                        "label" => ["profile_field", "label"],
                        "value" => ["profile_field", "value"],
                        "order" => ["profile_field", "order"],
-                       "psid"=> ["profile_field", "psid"],
+                       "psid" => ["profile_field", "psid"],
                        "allow_cid" => ["permissionset", "allow_cid"],
                        "allow_gid" => ["permissionset", "allow_gid"],
                        "deny_cid" => ["permissionset", "deny_cid"],