Merge pull request #3500 from AndyHee/3.5.2rc

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index c05d00e63fdb062860c2358ff07ff87b8cd41c16..74cfabb6cd48c1be400025c67a0eac6f40ca160c 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,13 +1,14 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
-require_once('include/queue_fn.php');
-require_once('include/html2plain.php');
-require_once("include/Scrape.php");
-require_once('include/diaspora.php');
-require_once("include/ostatus.php");
-require_once('include/salmon.php');
+require_once 'include/queue_fn.php';
+require_once 'include/html2plain.php';
+require_once 'include/probe.php';
+require_once 'include/diaspora.php';
+require_once 'include/ostatus.php';
+require_once 'include/salmon.php';
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -45,15 +46,26 @@ require_once('include/salmon.php');
 function notifier_run(&$argv, &$argc){
        global $a;
 
-       require_once("include/datetime.php");
-       require_once('include/items.php');
-       require_once('include/bbcode.php');
-       require_once('include/email.php');
+       require_once 'include/datetime.php';
+       require_once 'include/items.php';
+       require_once 'include/bbcode.php';
+       require_once 'include/email.php';
 
        if ($argc < 3) {
                return;
        }
 
+       // Inherit the priority
+       $queue = dba::select('workerqueue', array('priority'), array('pid' => getmypid()), array('limit' => 1));
+       if (dbm::is_result($queue)) {
+               $priority = (int)$queue['priority'];
+               logger('inherited priority: '.$priority);
+       } else {
+               // Normally this shouldn't happen.
+               $priority = PRIORITY_HIGH;
+               logger('no inherited priority! Something is wrong.');
+       }
+
        logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
        $cmd = $argv[1];
@@ -138,7 +150,7 @@ function notifier_run(&$argv, &$argc){
                if (!$r) {
                        return;
                }
-               require_once('include/Contact.php');
+               require_once 'include/Contact.php';
                foreach ($r as $contact) {
                        terminate_friendship($user, $self, $contact);
                }
@@ -222,7 +234,7 @@ function notifier_run(&$argv, &$argc){
 
                $slap = ostatus::salmon($target_item,$owner);
 
-               require_once('include/group.php');
+               require_once 'include/group.php';
 
                $parent = $items[0];
 
@@ -347,7 +359,7 @@ function notifier_run(&$argv, &$argc){
                        // a delivery fork. private groups (forum_mode == 2) do not uplink
 
                        if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
-                               proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id);
+                               proc_run($priority, 'include/notifier.php', 'uplink', $item_id);
                        }
 
                        $conversants = array();
@@ -471,7 +483,8 @@ function notifier_run(&$argv, &$argc){
        if ($relocate) {
                $r = $recipients_relocate;
        } else {
-               $r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra,
+               $r = q("SELECT `id`, `url`, `network`, `self` FROM `contact`
+                       WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra,
                        dbesc($recip_str)
                );
        }
@@ -480,28 +493,12 @@ function notifier_run(&$argv, &$argc){
 
        if (dbm::is_result($r)) {
                foreach ($r as $contact) {
-                       if (!$contact['self']) {
-                               if (($contact['network'] === NETWORK_DIASPORA) && ($public_message)) {
-                                       continue;
-                               }
-                               q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
-                                       dbesc($cmd),
-                                       intval($item_id),
-                                       intval($contact['id'])
-                               );
-                       }
-               }
-
-               for ($x = 0; $x < count($r); $x ++) {
-                       $contact = $r[$x];
-
                        if ($contact['self']) {
                                continue;
                        }
                        logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
-                       proc_run(PRIORITY_HIGH,'include/delivery.php', $cmd, $item_id, $contact['id']);
-                       continue;
+                       proc_run($priority, 'include/delivery.php', $cmd, $item_id, $contact['id']);
                }
        }
 
@@ -531,7 +528,8 @@ function notifier_run(&$argv, &$argc){
                                $r0 = Diaspora::relay_list();
                        }
 
-                       $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
+                       $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
+                               FROM `contact` WHERE `network` = '%s'
                                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']),
@@ -553,18 +551,6 @@ function notifier_run(&$argv, &$argc){
                if (dbm::is_result($r)) {
                        logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
-                       // throw everything into the queue in case we get killed
-
-                       foreach ($r as $rr) {
-                               if ((! $mail) && (! $fsuggest) && (! $followup)) {
-                                       q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
-                                               ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
-                                               dbesc($cmd), intval($item_id), intval($rr['id']),
-                                               dbesc($cmd), intval($item_id), intval($rr['id'])
-                                       );
-                               }
-                       }
-
                        foreach ($r as $rr) {
 
                                // except for Diaspora batch jobs
@@ -577,7 +563,7 @@ function notifier_run(&$argv, &$argc){
 
                                if ((! $mail) && (! $fsuggest) && (! $followup)) {
                                        logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-                                       proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']);
+                                       proc_run($priority, 'include/delivery.php', $cmd, $item_id, $rr['id']);
                                }
                        }
                }
@@ -617,7 +603,7 @@ function notifier_run(&$argv, &$argc){
                }
 
                // Handling the pubsubhubbub requests
-               proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
+               proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php');
        }
 
        logger('notifier: calling hooks', LOGGER_DEBUG);