Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 13:50:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 11553: Reliably return the user's contacts

Browse source
This commit is contained in:
Michael 2022-12-03 13:49:29 +00:00
parent 82972744a9
commit e4dda7d2ca
5 changed files with 189 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ namespace Friendica\Module\Api\Mastodon\Accounts;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Module\BaseApi;
/**
@ -55,33 +56,60 @@ class Followers extends BaseApi
'limit' => 40, // Maximum number of results to return. Defaults to 40.
], $request);
$params = ['order' => ['relation-cid' => true], 'limit' => $request['limit']];
if (false && $id == Contact::getPublicIdByUserId($uid)) {
$params = ['order' => ['pid' => true], 'limit' => $request['limit']];
$condition = ['cid' => $id, 'follows' => true];
$condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` < ?", $request['max_id']]);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['min_id']]);
$params['order'] = ['pid'];
}
$accounts = [];
foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) {
self::setBoundaries($follower['pid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['pid'], $uid);
}
} else {
$params = ['order' => ['relation-cid' => true], 'limit' => $request['limit']];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` < ?", $request['max_id']]);
$condition = ['cid' => $id, 'follows' => true];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` < ?", $request['max_id']]);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['min_id']]);
$params['order'] = ['relation-cid'];
}
$accounts = [];
$followers = DBA::select('contact-relation', ['relation-cid'], $condition, $params);
while ($follower = DBA::fetch($followers)) {
self::setBoundaries($follower['relation-cid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['relation-cid'], $uid);
}
DBA::close($followers);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['min_id']]);
$params['order'] = ['cid'];
}
$accounts = [];
$followers = DBA::select('contact-relation', ['relation-cid'], $condition, $params);
while ($follower = DBA::fetch($followers)) {
self::setBoundaries($follower['relation-cid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['relation-cid'], $uid);
}
DBA::close($followers);
if (!empty($request['min_id'])) {
$accounts = array_reverse($accounts);
}

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

@ -24,6 +24,7 @@ namespace Friendica\Module\Api\Mastodon\Accounts;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Module\BaseApi;
/**
@ -55,33 +56,60 @@ class Following extends BaseApi
'limit' => 40, // Maximum number of results to return. Defaults to 40.
], $request);
$params = ['order' => ['cid' => true], 'limit' => $request['limit']];
if ($id == Contact::getPublicIdByUserId($uid)) {
$params = ['order' => ['pid' => true], 'limit' => $request['limit']];
$condition = ['relation-cid' => $id, 'follows' => true];
$condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` < ?", $request['max_id']]);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['min_id']]);
$params['order'] = ['pid'];
}
$accounts = [];
foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) {
self::setBoundaries($follower['pid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['pid'], $uid);
}
} else {
$params = ['order' => ['cid' => true], 'limit' => $request['limit']];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` < ?", $request['max_id']]);
$condition = ['relation-cid' => $id, 'follows' => true];
if (!empty($request['max_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` < ?", $request['max_id']]);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['min_id']]);
$params['order'] = ['cid'];
}
$accounts = [];
$followers = DBA::select('contact-relation', ['cid'], $condition, $params);
while ($follower = DBA::fetch($followers)) {
self::setBoundaries($follower['cid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
}
DBA::close($followers);
}
if (!empty($request['since_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['since_id']]);
}
if (!empty($request['min_id'])) {
$condition = DBA::mergeConditions($condition, ["`cid` > ?", $request['min_id']]);
$params['order'] = ['cid'];
}
$accounts = [];
$followers = DBA::select('contact-relation', ['cid'], $condition, $params);
while ($follower = DBA::fetch($followers)) {
self::setBoundaries($follower['cid']);
$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
}
DBA::close($followers);
if (!empty($request['min_id'])) {
$accounts = array_reverse($accounts);
}