keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6566 from annando/ap-debug

Browse source 
AP: Debug option to deliver via AP first
This commit is contained in:
Hypolite Petovan 2019-01-30 19:02:53 -05:00 committed by GitHub
commit 55150c97ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/defaults.config.php
View file

@ -425,5 +425,9 @@ return [
// ap_inbox_log (Boolean) // ap_inbox_log (Boolean)
// Logs every call to /inbox as a JSON file in Friendica's temporary directory // Logs every call to /inbox as a JSON file in Friendica's temporary directory
'ap_inbox_log' => false, 'ap_inbox_log' => false,
// total_ap_delivery (Boolean)
// Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols
'total_ap_delivery' => false,
] ]
]; ];

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

@ -325,11 +325,13 @@ class Transmitter
} }
} }
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step // Will be activated in a later step
// $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
} else {
// For now only send to these contacts: // For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
$data = ['to' => [], 'cc' => [], 'bcc' => []]; $data = ['to' => [], 'cc' => [], 'bcc' => []];
@ -473,11 +475,13 @@ class Transmitter
{ {
$inboxes = []; $inboxes = [];
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step // Will be activated in a later step
// $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
} else {
// For now only send to these contacts: // For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
$condition = ['uid' => $uid, 'network' => $networks, 'archive' => false, 'pending' => false]; $condition = ['uid' => $uid, 'network' => $networks, 'archive' => false, 'pending' => false];

13
src/Worker/Notifier.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\APContact;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation; use Friendica\Model\Conversation;
use Friendica\Model\Group; use Friendica\Model\Group;
@ -418,12 +419,17 @@ class Notifier
$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false, $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; 'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
$r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition)); $r2 = DBA::toArray(DBA::select('contact', ['id', 'url', 'name', 'network'], $condition));
$r = array_merge($r2, $relay_list); $r = array_merge($r2, $relay_list);
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if (Config::get('debug', 'total_ap_delivery') && !empty($rr['url']) && ($rr['network'] == Protocol::DFRN) && !empty(APContact::getByURL($rr['url'], false))) {
Logger::log('Skipping contact ' . $rr['url'] . ' since it will be delivered via AP', Logger::DEBUG);
continue;
}
$conversants[] = $rr['id']; $conversants[] = $rr['id'];
$delivery_queue_count++; $delivery_queue_count++;
@ -447,6 +453,11 @@ class Notifier
// delivery loop // delivery loop
while ($contact = DBA::fetch($delivery_contacts_stmt)) { while ($contact = DBA::fetch($delivery_contacts_stmt)) {
if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
Logger::log('Skipping contact ' . $contact['url'] . ' since it will be delivered via AP', Logger::DEBUG);
continue;
}
// Don't deliver to Diaspora if it already had been done as batch delivery // Don't deliver to Diaspora if it already had been done as batch delivery
if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) { if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
Logger::log('Already delivered id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG); Logger::log('Already delivered id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);