Merge pull request #3279 from Hypolite/improvement/add-composer

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index c05d00e63fdb062860c2358ff07ff87b8cd41c16..e3d7d10d6b2a7595e76143eaf60ae4cf4b6e78d3 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -4,9 +4,9 @@ use \Friendica\Core\Config;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
-require_once("include/Scrape.php");
+require_once('include/Scrape.php');
 require_once('include/diaspora.php');
-require_once("include/ostatus.php");
+require_once('include/ostatus.php');
 require_once('include/salmon.php');
 
 /*
@@ -45,7 +45,7 @@ require_once('include/salmon.php');
 function notifier_run(&$argv, &$argc){
        global $a;
 
-       require_once("include/datetime.php");
+       require_once('include/datetime.php');
        require_once('include/items.php');
        require_once('include/bbcode.php');
        require_once('include/email.php');
@@ -471,7 +471,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 +481,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;
                }
        }
 
@@ -553,18 +538,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