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');
/*
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');
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)
);
}
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;
}
}
$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']),
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