Merge pull request #3034 from annando/1612-no-archive

Only distribute items to active contacts

diff --git a/include/notifier.php b/include/notifier.php
index 2f9599d07255934c9c9792182b7a043c5ef62eb5..7221fa376db154eba4656d2e4f1049cade18ab36 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -575,7 +575,7 @@ function notifier_run(&$argv, &$argc){
                        $r0 = array();
 
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)