Don't deliver answers to OStatus messages to Diaspora

diff --git a/include/notifier.php b/include/notifier.php
index 24dc63d69648281a0d24645b842d150e4a0e6eab..67d5cdbbd869b7181a2b4f4b97913a7159cb2d27 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -406,9 +406,13 @@ function notifier_run(&$argv, &$argc){
                                        }
                                }
                        }
-               }
 
-               $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+                       // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
+                       $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
+               } else
+                       $sql_extra = "";
+
+               $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra);
 
                if(count($r))
                        $contacts = $r;