mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #4783 from annando/queue-relay

Browse source 
Don't queue relay posts
This commit is contained in:
Hypolite Petovan 2018-04-08 08:35:36 -04:00 committed by GitHub
parent b2520bc48e a75858f02c
commit fa7bed8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -212,12 +212,16 @@ define('PAGE_PRVGROUP', 5);
*
* ACCOUNT_TYPE_COMMUNITY - the account is community forum
* Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
*
* ACCOUNT_TYPE_RELAY - the account is a relay
* This will only be assigned to contacts, not to user accounts
* @{
*/
define('ACCOUNT_TYPE_PERSON', 0);
define('ACCOUNT_TYPE_ORGANISATION', 1);
define('ACCOUNT_TYPE_NEWS', 2);
define('ACCOUNT_TYPE_COMMUNITY', 3);
define('ACCOUNT_TYPE_RELAY', 4);
/**
* @}
*/

31
src/Protocol/Diaspora.php
View file

@ -103,7 +103,10 @@ class Diaspora
foreach ($serverlist as $server_url) {
// We don't send messages to ourselves
if (!link_compare($server_url, System::baseUrl())) {
$contacts[] = self::getRelayContactId($server_url);
$cid = self::getRelayContactId($server_url);
if (!is_bool($cid)) {
$contacts[] = $cid;
}
}
}
@ -120,11 +123,30 @@ class Diaspora
{
$batch = $server_url . '/receive/public';
$fields = ['batch', 'id', 'name', 'network'];
$fields = ['batch', 'id', 'name', 'network', 'nick',
'url', 'archive', 'blocked', 'contact-type'];
// Fetch the first unarchived, unblocked account
$condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
'archive' => false, 'blocked' => false];
'archive' => false, 'blocked' => false];
$contact = dba::selectFirst('contact', $fields, $condition);
// If there is nothing found, we check if there is already a relay account
if (!DBM::is_result($contact)) {
$condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
'contact-type' => ACCOUNT_TYPE_RELAY];
$contact = dba::selectFirst('contact', $fields, $condition);
}
if (DBM::is_result($contact)) {
if ($contact['archive'] || $contact['blocked']) {
return false;
}
// Mark relay accounts as a relay, if this hadn't been the case before
if (($contact['url'] == $server_url) && ($contact['nick'] == 'relay') &&
($contact['name'] == 'relay') && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {
$fields = ['contact-type' => ACCOUNT_TYPE_RELAY];
dba::update('contact', $fields, ['id' => $contact['id']]);
}
return $contact;
} else {
$fields = ['uid' => 0, 'created' => DateTimeFormat::utcNow(),
@ -132,6 +154,7 @@ class Diaspora
'url' => $server_url, 'nurl' => normalise_link($server_url),
'batch' => $batch, 'network' => NETWORK_DIASPORA,
'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false,
'contact-type' => ACCOUNT_TYPE_RELAY,
'pending' => false, 'writable' => true];
dba::insert('contact', $fields);
@ -3299,7 +3322,7 @@ class Diaspora
logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
if (!$no_queue) {
if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {
logger("queue message");
// queue message for redelivery
Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch, $guid);

3
src/Worker/Queue.php
View file

@ -136,7 +136,8 @@ class Queue
logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
($contact['contact-type'] == ACCOUNT_TYPE_RELAY)) {
QueueModel::removeItem($q_item['id']);
} else {
QueueModel::updateTime($q_item['id']);