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

Legacy DFRN transport layer is removed

Browse Source
This commit is contained in:
Michael
2021-07-15 13:28:32 +00:00
parent fd37a57678
commit 3a5523820c
27 changed files with 199 additions and 3175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Worker/Delivery.php
View File

@@ -340,17 +340,9 @@ class Delivery
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
} elseif ($cmd != self::RELOCATION) {
} else {
// DFRN payload over Diaspora transport layer
$deliver_status = DFRN::transmit($owner, $contact, $atom);
if (($deliver_status < 200) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) {
// Legacy DFRN
$deliver_status = DFRN::deliver($owner, $contact, $atom);
$protocol = Model\Post\DeliveryData::LEGACY_DFRN;
}
} else {
$deliver_status = DFRN::deliver($owner, $contact, $atom);
$protocol = Model\Post\DeliveryData::LEGACY_DFRN;
}
Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]);