Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-09 23:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14354 from annando/issue-14121

Browse source 
Issue 14121: Don't display contacts from unavailable networks via API
This commit is contained in:
Tobias Diekershoff 2024-08-13 07:17:45 +02:00 committed by GitHub
commit 7801d3efe8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Api/Mastodon/Accounts/Followers.php
View file

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

5
src/Module/Api/Mastodon/Accounts/Following.php
View file

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