From: Michael Vogel <icarus@dabo.de>
Date: Sun, 5 Jul 2015 14:27:03 +0000 (+0200)
Subject: Don't deliver answers to OStatus messages to Diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d6d51e02592d246d6b0e4e23ebfb7b9d030670ff;p=friendica.git

Don't deliver answers to OStatus messages to Diaspora
---

diff --git a/include/notifier.php b/include/notifier.php
index 24dc63d696..67d5cdbbd8 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;