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

Don't spool relay deliveries

Browse source
This commit is contained in:
Michael 2018-04-30 05:56:40 +00:00
parent d0dd5c44d9
commit bbbebb2b9c
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Worker/Delivery.php
View file

@ -275,6 +275,13 @@ class Delivery extends BaseObject
$public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY); $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);
$deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
// We never spool failed relay deliveries
if ($public_dfrn) {
logger('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
return;
}
if (($deliver_status < 200) || ($deliver_status > 299)) { if (($deliver_status < 200) || ($deliver_status > 299)) {
// Transmit via Diaspora if not possible via Friendica // Transmit via Diaspora if not possible via Friendica
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);