Merge pull request #12837 from HankG/fix-blocks-ignores-in-full-context-status-request

[friendica.git] / src / Module / Api / Mastodon / Statuses / Context.php

diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php
index 3fe3e5a4d2188de8ec823468448d5b6eb42b84c3..f683b01751910ab1e2011a3752065e63ca6c6acd 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Context.php
+++ b/src/Module/Api/Mastodon/Statuses/Context.php
@@ -45,10 +45,11 @@ class Context extends BaseApi
                }
 
                $request = $this->getRequest([
-                       'max_id'   => 0,  // Return results older than this id
-                       'since_id' => 0,  // Return results newer than this id
-                       'min_id'   => 0,  // Return results immediately newer than this id
-                       'limit'    => 40, // Maximum number of results to return. Defaults to 40.
+                       'max_id'   => 0,     // Return results older than this id
+                       'since_id' => 0,     // Return results newer than this id
+                       'min_id'   => 0,     // Return results immediately newer than this id
+                       'limit'    => 40,    // Maximum number of results to return. Defaults to 40.
+                       'show_all' => false, // shows posts for all users including blocked and ignored users
                ], $request);
 
                $id = $this->parameters['id'];
@@ -73,6 +74,13 @@ class Context extends BaseApi
                                $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]);
                                $params['order'] = ['uri-id'];
                        }
+
+                       if (!empty($uid) && !$request['show_all']) {
+                               $condition = DBA::mergeConditions(
+                                       $condition,
+                                       ["NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND (`blocked` OR `ignored`))", $uid]
+                               );
+                       }
        
                        $posts = Post::selectPosts(['uri-id', 'thr-parent-id'], $condition, $params);
                        while ($post = Post::fetch($posts)) {
@@ -115,7 +123,7 @@ class Context extends BaseApi
                $display_quotes = self::appSupportsQuotes();
 
                foreach (array_slice($ancestors, 0, $request['limit']) as $ancestor) {
-                       $statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid, true, true, $display_quotes);;
+                       $statuses['ancestors'][] = DI::mstdnStatus()->createFromUriId($ancestor, $uid, $display_quotes);
                }
 
                $descendants = self::getChildren($id, $children);
@@ -123,7 +131,7 @@ class Context extends BaseApi
                asort($descendants);
 
                foreach (array_slice($descendants, 0, $request['limit']) as $descendant) {
-                       $statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, true, true, $display_quotes);
+                       $statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, $display_quotes);
                }
 
                System::jsonExit($statuses);