Only attach images

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 36d1a76b73de6ed8bc9adcbd4553cfa9ff65447d..7d3d3d6b7cc7033a1a8d06d18d78361d7e893c42 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -191,6 +191,10 @@ 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'])) {
+                                       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;
+                               }
                                Logger::info('Threaded comment', ['diaspora_delivery' => (int)$diaspora_delivery]);
                        }
 
@@ -467,7 +471,7 @@ class Notifier
                        Hook::callAll('notifier_end', $target_item);
 
                        // Workaround for pure connector posts
-                       if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+                       if ($cmd == Delivery::POST) {
                                if ($delivery_queue_count == 0) {
                                        Post\DeliveryData::incrementQueueDone($target_item['uri-id']);
                                        $delivery_queue_count = 1;
@@ -502,12 +506,25 @@ class Notifier
                $a = DI::app();
                $delivery_queue_count = 0;
 
+               if (!empty($target_item['verb']) && ($target_item['verb'] == Activity::ANNOUNCE)) {
+                       Logger::notice('Announces are only delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                       return 0;
+               }
+
                foreach ($contacts as $contact) {
                        // Direct delivery of local contacts
                        if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && $target_uid = User::getIdForURL($contact['url'])) {
-                               Logger::info('Direct delivery', ['uri-id' => $target_item['uri-id'], 'target' => $target_uid]);
-                               $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_DIRECT];
-                               Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                               if ($target_item['origin'] || ($target_item['network'] != Protocol::ACTIVITYPUB)) {
+                                       if ($target_uid != $target_item['uid']) {
+                                               $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_DIRECT];
+                                               Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                                               Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'target' => $target_uid]);
+                                       } else {
+                                               Logger::info('No need to deliver to myself', ['uid' => $target_uid, 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                       }
+                               } else {
+                                       Logger::info('Remote item does not need to be delivered locally', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                               }
                                continue;
                        }
 
@@ -560,6 +577,7 @@ class Notifier
                        if (Worker::add($deliver_options, 'Delivery', $cmd, $post_uriid, (int)$contact['id'], $sender_uid)) {
                                $delivery_queue_count++;
                        }
+                       Worker::coolDown();
                }
                return $delivery_queue_count;
        }
@@ -682,6 +700,7 @@ class Notifier
                        Logger::info('Account removal via ActivityPub', ['uid' => $self_user_id, 'inbox' => $inbox]);
                        Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true],
                                'APDelivery', Delivery::REMOVAL, 0, $inbox, $self_user_id, $receivers);
+                       Worker::coolDown();
                }
 
                return true;
@@ -775,12 +794,22 @@ class Notifier
 
                        if ((count($receivers) == 1) && Network::isLocalLink($inbox)) {
                                $contact = Contact::getById($receivers[0], ['url']);
-                               if ($target_uid = User::getIdForURL($contact['url'])) {
-                                       $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_BCC];
-                                       Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
-                                       Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
+                               if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && ($target_uid = User::getIdForURL($contact['url']))) {
+                                       if ($target_item['origin'] || ($target_item['network'] != Protocol::ACTIVITYPUB)) {
+                                               if ($target_uid != $target_item['uid']) {
+                                                       $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_BCC];
+                                                       Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                                                       Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
+                                               } else {
+                                                       Logger::info('No need to deliver to myself', ['uid' => $target_uid, 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                               }
+                                       } else {
+                                               Logger::info('Remote item does not need to be delivered locally', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                       }
                                        continue;
                                }
+                       } elseif ((count($receivers) >= 1) && Network::isLocalLink($inbox)) {
+                               Logger::info('Is this a thing?', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
                        }
 
                        Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
@@ -795,6 +824,7 @@ class Notifier
                                        $delivery_queue_count++;
                                }
                        }
+                       Worker::coolDown();
                }
 
                // We deliver posts to relay servers slightly delayed to priorize the direct delivery
@@ -810,6 +840,7 @@ class Notifier
                                        $delivery_queue_count++;
                                }
                        }
+                       Worker::coolDown();
                }
 
                return ['count' => $delivery_queue_count, 'contacts' => $contacts];