"UpdateServers" added

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index c98c60f4263fbcbd5f3d93bb3f568fa626e4db16..c364ce5e51e66c9a30a2f6ba785c9455d4d89046 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -15,6 +15,7 @@ use Friendica\Model;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
+use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
 use Friendica\Core\Worker;
@@ -250,6 +251,13 @@ class Delivery extends BaseObject
         */
        private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
        {
+               // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
+               if (Diaspora::isReshare($target_item['body']) && !empty(Diaspora::personByHandle($contact['addr'], false))) {
+                       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;
+               }
+
                Logger::info('Deliver ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' via DFRN to ' . (($contact['addr'] ?? '') ?: $contact['url']));
 
                if ($cmd == self::MAIL) {
@@ -500,6 +508,10 @@ class Delivery extends BaseObject
                        return;
                }
 
+               if ($target_item['verb'] != Activity::POST) {
+                       return;
+               }
+
                if (!empty($thr_parent['object'])) {
                        $data = json_decode($thr_parent['object'], true);
                        if (!empty($data['reply_to'])) {