From d6d51e02592d246d6b0e4e23ebfb7b9d030670ff Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 5 Jul 2015 16:27:03 +0200 Subject: [PATCH] Don't deliver answers to OStatus messages to Diaspora --- include/notifier.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 24dc63d69..67d5cdbbd 100644 --- 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;