clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only output ActivityPub contacts in /followers and /following 

- Join contact table with apcontact to weed out non-AP contacts
This commit is contained in:
Hypolite Petovan 2020-05-05 22:33:26 -04:00
parent ccb69414d2
commit 4e579e77f5
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Protocol/ActivityPub/Transmitter.php
View File

@ -74,16 +74,30 @@ class Transmitter
*/ */
public static function getContacts($owner, $rel, $module, $page = null) public static function getContacts($owner, $rel, $module, $page = null)
{ {
$condition = ['rel' => $rel, 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'], $parameters = [
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false]; 'rel' => $rel,
$count = DBA::count('contact', $condition); 'uid' => $owner['uid'],
'self' => false,
'deleted' => false,
'hidden' => false,
'archive' => false,
'pending' => false
];
$condition = DBA::buildCondition($parameters);
$sql = "SELECT COUNT(*) as `count`
FROM `contact`
JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
" . $condition;
$contacts = DBA::fetchFirst($sql, ...$parameters);
$modulePath = '/' . $module . '/'; $modulePath = '/' . $module . '/';
$data = ['@context' => ActivityPub::CONTEXT]; $data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = DI::baseUrl() . $modulePath . $owner['nickname']; $data['id'] = DI::baseUrl() . $modulePath . $owner['nickname'];
$data['type'] = 'OrderedCollection'; $data['type'] = 'OrderedCollection';
$data['totalItems'] = $count; $data['totalItems'] = $contacts['count'];
// When we hide our friends we will only show the pure number but don't allow more. // When we hide our friends we will only show the pure number but don't allow more.
$profile = Profile::getByUID($owner['uid']); $profile = Profile::getByUID($owner['uid']);
@ -97,7 +111,16 @@ class Transmitter
$data['type'] = 'OrderedCollectionPage'; $data['type'] = 'OrderedCollectionPage';
$list = []; $list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]); $sql = "SELECT `contact`.`url`
FROM `contact`
JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
" . $condition . "
LIMIT ?, ?";
$parameters[] = ($page - 1) * 100;
$parameters[] = 100;
$contacts = DBA::p($sql, ...$parameters);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {
$list[] = $contact['url']; $list[] = $contact['url'];
} }