Merge remote-tracking branch 'upstream/develop' into diasppora-delivery

diff --cc src/Worker/Notifier.php
index d4ec33b2caca578f4d8acc0a21bdc2e6d2ecf24c,2d0140c17161c443d868a15e7be1aac8f7ee1ae1..8a35a34dcbd33d0c9e06e260a023092479a21fef
--- 1/src/Worker/Notifier.php
--- 2/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@@ -419,11 -420,7 +420,11 @@@ class Notifie
                // delivery loop
                if (DBA::isResult($r)) {
                        foreach ($r as $contact) {
-                               logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 +                              if (($contact['network'] == Protocol::DIASPORA) && $diaspora_delivery && $public_message && !empty($contact['batch'])
 +                                      && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
 +                                      continue;
 +                              }
+                               Logger::log("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], Logger::DEBUG);
  
                                Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
                                                'Delivery', $cmd, $item_id, (int)$contact['id']);