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

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 2d0140c17161c443d868a15e7be1aac8f7ee1ae1..8a35a34dcbd33d0c9e06e260a023092479a21fef 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -413,13 +413,17 @@ class Notifier
                        if (!empty($networks)) {
                                $condition['network'] = $networks;
                        }
-                       $contacts = DBA::select('contact', ['id', 'url', 'network'], $condition);
+                       $contacts = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition);
                        $r = DBA::toArray($contacts);
                }
 
                // delivery loop
                if (DBA::isResult($r)) {
                        foreach ($r as $contact) {
+                               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],