Issue 14121: Don't display contacts from unavailable networks via API

diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index 748d7725e8721c41bdf2dd51630a8be7e831ebd4..be7d3bae2675219cf554dada1b0f8520c414ea5e 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -21,7 +21,7 @@
 
 namespace Friendica\Module\Api\Mastodon\Accounts;
 
-use Friendica\Core\System;
+use Friendica\Content\Widget;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -75,6 +75,9 @@ class Followers extends BaseApi
                                $params['order'] = ['pid'];
                        }
 
+                       $networks  = Widget::unavailableNetworks();
+                       $condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks));
+
                        $accounts = [];
 
                        foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) {

diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index a32e30d47028927cb391c6fb6b2ba5eb2b36de5d..8d5c48a88b4a93bf2fa52071fc99c8f697094d92 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -21,7 +21,7 @@
 
 namespace Friendica\Module\Api\Mastodon\Accounts;
 
-use Friendica\Core\System;
+use Friendica\Content\Widget;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -75,6 +75,9 @@ class Following extends BaseApi
                                $params['order'] = ['pid'];
                        }
 
+                       $networks  = Widget::unavailableNetworks();
+                       $condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks));
+
                        $accounts = [];
 
                        foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) {