Add blocked/ignored filters to Mastodon Timeline API Home and Tags endpoints

diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index 5efaf4930ebbe380c26c38e857917b152f0f4040..c121bad666b00095ca9f0289082d2e9e65383694 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -90,6 +90,13 @@ class Home extends BaseApi
                        $condition = DBA::mergeConditions($condition, ['gravity' => Item::GRAVITY_PARENT]);
                }
 
+               if (!empty($uid)) {
+                       $condition = DBA::mergeConditions(
+                               $condition,
+                               ["NOT `parent-author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`) AND `cid` = `parent-author-id`)", $uid]
+                       );
+               }
+
                $items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
 
                $display_quotes = self::appSupportsQuotes();

diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 1d04dec6255170979e7a82bf0b1ada3e02bcf432..64cd84366e6b724adf822cfb65cd2aa0c823ade2 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -104,6 +104,13 @@ class Tag extends BaseApi
                        $params['order'] = ['uri-id'];
                }
 
+               if (!empty($uid)) {
+                       $condition = DBA::mergeConditions(
+                               $condition,
+                               ["NOT `parent-author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`) AND `cid` = `parent-author-id`)", $uid]
+                       );
+               }
+
                $items = DBA::select('tag-search-view', ['uri-id'], $condition, $params);
 
                $display_quotes = self::appSupportsQuotes();