Only attach images

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index d06dfead615d9cf6a5e7978da77acf0fb23a2475..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]);
                        }
 
@@ -502,6 +506,11 @@ 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'])) {
@@ -568,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;
        }
@@ -690,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;
@@ -813,6 +824,7 @@ class Notifier
                                        $delivery_queue_count++;
                                }
                        }
+                       Worker::coolDown();
                }
 
                // We deliver posts to relay servers slightly delayed to priorize the direct delivery
@@ -828,6 +840,7 @@ class Notifier
                                        $delivery_queue_count++;
                                }
                        }
+                       Worker::coolDown();
                }
 
                return ['count' => $delivery_queue_count, 'contacts' => $contacts];