friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-03 01:05:04 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity

Issue 12373: Fix communication to Diaspora

Browse source
This commit is contained in:
Michael 2022-12-10 12:08:55 +00:00
commit 019bb56668
5 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Worker/Delivery.php
View file

@ -277,7 +277,7 @@ class Delivery
private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null)
{
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
if (Diaspora::getReshareDetails($target_item ?? []) && Diaspora::isSupportedByContactUrl($contact['addr'], false)) {
if (Diaspora::getReshareDetails($target_item ?? []) && Diaspora::isSupportedByContactUrl($contact['addr'])) {
Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;

2
src/Worker/Notifier.php
View file

@ -191,7 +191,7 @@ class Notifier
// when the original comment author does support the Diaspora protocol.
if ($thr_parent['author-link'] && $target_item['parent-uri'] != $target_item['thr-parent']) {
$diaspora_delivery = Diaspora::isSupportedByContactUrl($thr_parent['author-link']);
if ($diaspora_delivery && empty($target_item['signed_text'])) {
if ($diaspora_delivery && empty($target_item['signed_text'])) {
Logger::debug('Post has got no Diaspora signature, so there will be no Diaspora delivery', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id']]);
$diaspora_delivery = false;
}