contact edit updates

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 9dc524585d1457b93a4357f7008b3ec634142905..a4fe9b71e083c33ac0ab64bfb77a8db15d2a5bd8 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("boot.php");
+require_once('include/queue_fn.php');
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -142,7 +143,7 @@ function notifier_run($argv, $argc){
                                $item['deleted'] = 1;
                }
 
-               if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
+               if((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
                        logger('notifier: top level post');
                        $top_level = true;
                }
@@ -192,6 +193,8 @@ function notifier_run($argv, $argc){
                // be notified during this run.
                // Other DFRN conversation members will be alerted during polled updates.
 
+
+
                // Diaspora members currently are not notified of expirations, and other networks have
                // either limited or no ability to process deletions. We should at least fix Diaspora 
                // by stringing togther an array of retractions and sending them onward.
@@ -203,13 +206,32 @@ function notifier_run($argv, $argc){
 
                /**
                 *
-                * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes 
+                * Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes 
                 * have been known to cause runaway conditions which affected several servers, along with 
                 * permissions issues. 
                 *
                 */
  
+               $relay_to_owner = false;
+
                if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
+                       $relay_to_owner = true;
+               }
+
+               // until the 'origin' flag has been in use for several months
+               // we will just use it as a fallback test
+               // later we will be able to use it as the primary test of whether or not to relay.
+
+               if(! $target_item['origin'])
+                       $relay_to_owner = false;
+
+               if($parent['origin'])
+                       $relay_to_owner = false;
+
+
+
+               if($relay_to_owner) {
+                       logger('notifier: followup', LOGGER_DEBUG);
                        // local followup to remote post
                        $followup = true;
                        $public_message = false; // not public
@@ -218,6 +240,13 @@ function notifier_run($argv, $argc){
                else {
                        $followup = false;
 
+                       // don't send deletions onward for other people's stuff
+
+                       if($target_item['deleted'] && (! intval($target_item['wall']))) {
+                               logger('notifier: ignoring delete notification for non-wall item');
+                               return;
+                       }
+
                        if((strlen($parent['allow_cid'])) 
                                || (strlen($parent['allow_gid'])) 
                                || (strlen($parent['deny_cid'])) 
@@ -357,6 +386,7 @@ function notifier_run($argv, $argc){
                                if(($public_message) && $item['private'])
                                        continue;
 
+
                                $contact = get_item_contact($item,$contacts);
 
                                if(! $contact)
@@ -501,13 +531,7 @@ function notifier_run($argv, $argc){
                                        if($deliver_status == (-1)) {
                                                logger('notifier: delivery failed: queuing message');
                                                // queue message for redelivery
-                                               q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                                                       VALUES ( %d, '%s', '%s', '%s') ",
-                                                       intval($contact['id']),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($atom)
-                                               );
+                                               add_to_queue($contact['id'],NETWORK_DFRN,$atom);
                                        }
                                        break;
                                case NETWORK_OSTATUS:
@@ -524,14 +548,7 @@ function notifier_run($argv, $argc){
 
                                                if($deliver_status == (-1)) {
                                                        // queue message for redelivery
-                                                       q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                                                               VALUES ( %d, '%s', '%s', '%s') ",
-                                                               intval($contact['id']),
-                                                               dbesc(datetime_convert()),
-                                                               dbesc(datetime_convert()),
-                                                               dbesc($slap)
-                                                       );
-
+                                                       add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
                                                }
                                        }
                                        else {
@@ -546,13 +563,7 @@ function notifier_run($argv, $argc){
                                                                        $deliver_status = slapper($owner,$contact['notify'],$slappy);
                                                                        if($deliver_status == (-1)) {
                                                                                // queue message for redelivery
-                                                                               q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                                                                                       VALUES ( %d, '%s', '%s', '%s') ",
-                                                                                       intval($contact['id']),
-                                                                                       dbesc(datetime_convert()),
-                                                                                       dbesc(datetime_convert()),
-                                                                                       dbesc($slappy)
-                                                                               );                                                              
+                                                                               add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
                                                                        }
                                                                }
                                                        }
@@ -710,7 +721,7 @@ function notifier_run($argv, $argc){
        if($public_message) {
 
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' 
-                       AND `uid` = %d AND `rel` != %d ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)
@@ -784,7 +795,6 @@ function notifier_run($argv, $argc){
 
        call_hooks('notifier_end',$target_item);
 
-
        return;
 }