bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8589 from MrPetovan/task/8588-ap-contacts-endpoint

Browse source 
Only output ActivityPub contacts in /followers and /following AP endpoints
This commit is contained in:
Michael Vogel 2020-05-07 10:37:46 +02:00 committed by GitHub
parent eb8dcd43f3 63e7996891
commit 64f1bc8a68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Followers.php
View file

@ -22,8 +22,8 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
@ -49,7 +49,7 @@ class Followers extends BaseModule
$page = $_REQUEST['page'] ?? null; $page = $_REQUEST['page'] ?? null;
$followers = ActivityPub\Transmitter::getFollowers($owner, $page); $followers = ActivityPub\Transmitter::getContacts($owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers', $page);
header('Content-Type: application/activity+json'); header('Content-Type: application/activity+json');
echo json_encode($followers); echo json_encode($followers);

6
src/Module/Following.php
View file

@ -22,8 +22,8 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
@ -49,10 +49,10 @@ class Following extends BaseModule
$page = $_REQUEST['page'] ?? null; $page = $_REQUEST['page'] ?? null;
$Following = ActivityPub\Transmitter::getFollowing($owner, $page); $following = ActivityPub\Transmitter::getContacts($owner, [Contact::SHARING, Contact::FRIEND], 'following', $page);
header('Content-Type: application/activity+json'); header('Content-Type: application/activity+json');
echo json_encode($Following); echo json_encode($following);
exit(); exit();
} }
} }

105
src/Protocol/ActivityPub/Transmitter.php
View file

@ -62,24 +62,42 @@ require_once 'mod/share.php';
class Transmitter class Transmitter
{ {
/** /**
* collects the lost of followers of the given owner * Collects a list of contacts of the given owner
* *
* @param array $owner Owner array * @param array $owner Owner array
* @param integer $page Page number * @param int|array $rel The relevant value(s) contact.rel should match
* @param string $module The name of the relevant AP endpoint module (followers|following)
* @param integer $page Page number
* *
* @return array of owners * @return array of owners
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Exception
*/ */
public static function getFollowers($owner, $page = null) public static function getContacts($owner, $rel, $module, $page = null)
{ {
$condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], '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 . '/';
$data = ['@context' => ActivityPub::CONTEXT]; $data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = DI::baseUrl() . '/followers/' . $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']);
@ -88,72 +106,31 @@ class Transmitter
} }
if (empty($page)) { if (empty($page)) {
$data['first'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1'; $data['first'] = DI::baseUrl() . $modulePath . $owner['nickname'] . '?page=1';
} else { } else {
$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'];
} }
DBA::close($contacts); DBA::close($contacts);
if (!empty($list)) { if (!empty($list)) {
$data['next'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1); $data['next'] = DI::baseUrl() . $modulePath . $owner['nickname'] . '?page=' . ($page + 1);
} }
$data['partOf'] = DI::baseUrl() . '/followers/' . $owner['nickname']; $data['partOf'] = DI::baseUrl() . $modulePath . $owner['nickname'];
$data['orderedItems'] = $list;
}
return $data;
}
/**
* Create list of following contacts
*
* @param array $owner Owner array
* @param integer $page Page numbe
*
* @return array of following contacts
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function getFollowing($owner, $page = null)
{
$condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
$count = DBA::count('contact', $condition);
$data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = DI::baseUrl() . '/following/' . $owner['nickname'];
$data['type'] = 'OrderedCollection';
$data['totalItems'] = $count;
// When we hide our friends we will only show the pure number but don't allow more.
$profile = Profile::getByUID($owner['uid']);
if (!empty($profile['hide-friends'])) {
return $data;
}
if (empty($page)) {
$data['first'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
} else {
$data['type'] = 'OrderedCollectionPage';
$list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
while ($contact = DBA::fetch($contacts)) {
$list[] = $contact['url'];
}
DBA::close($contacts);
if (!empty($list)) {
$data['next'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
}
$data['partOf'] = DI::baseUrl() . '/following/' . $owner['nickname'];
$data['orderedItems'] = $list; $data['orderedItems'] = $list;
} }