return;
}
- // Inherit the priority
- $queue = dba::select('workerqueue', array('priority', 'created'), array('pid' => getmypid()), array('limit' => 1));
- if (dbm::is_result($queue)) {
- $priority = (int)$queue['priority'];
- $process_created = $queue['created'];
- logger('inherited priority: '.$priority);
- } else {
- // Normally this shouldn't happen.
- $priority = PRIORITY_HIGH;
- $process_created = datetime_convert();
- logger('no inherited priority! Something is wrong.');
- }
-
logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
$cmd = $argv[1];
$relocate = true;
$uid = $item_id;
- $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
+ $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
+ intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
} else {
// find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
- $hub = get_config('system','huburl');
-
// Should the post be transmitted to Diaspora?
$diaspora_delivery = true;
if ($parent['origin']) {
$relay_to_owner = false;
}
+
+ // Special treatment for forum posts
+ if (($target_item['author-link'] != $target_item['owner-link']) &&
+ ($owner['id'] != $target_item['contact-id']) &&
+ ($target_item['uri'] === $target_item['parent-uri'])) {
+
+ $fields = array('forum', 'prv');
+ $condition = array('id' => $target_item['contact-id']);
+ $contact = dba::select('contact', $fields, $condition, array('limit' => 1));
+ if (!dbm::is_result($contact)) {
+ // Should never happen
+ return false;
+ }
+
+ // Is the post from a forum?
+ if ($contact['forum'] || $contact['prv']) {
+ $relay_to_owner = true;
+ }
+ }
if ($relay_to_owner) {
logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
// local followup to remote post
// a delivery fork. private groups (forum_mode == 2) do not uplink
if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
- proc_run($priority, 'include/notifier.php', 'uplink', $item_id);
+ proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
}
$conversants = array();
}
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
- proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true),
- 'include/delivery.php', $cmd, $item_id, $contact['id']);
+ proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+ 'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
}
}
}
$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()",
+ FROM `contact` WHERE `network` = '%s' AND `batch` != ''
+ AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
dbesc(NETWORK_DIASPORA),
intval($owner['uid']),
intval(CONTACT_IS_SHARING)
}
$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
- WHERE `network` in ( '%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
- AND `rel` != %d order by rand() ",
+ WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
dbesc(NETWORK_DFRN),
dbesc(NETWORK_MAIL2),
intval($owner['uid']),
if ((! $mail) && (! $fsuggest) && (! $followup)) {
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
- proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true),
- 'include/delivery.php', $cmd, $item_id, $rr['id']);
+ proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+ 'include/delivery.php', $cmd, $item_id, (int)$rr['id']);
}
}
}
}
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
- if ($push_notify && strlen($hub)) {
- $hubs = explode(',', $hub);
- if (count($hubs)) {
- foreach ($hubs as $h) {
- $h = trim($h);
- if (! strlen($h)) {
- continue;
- }
-
- if ($h === '[internal]') {
- // Set push flag for PuSH subscribers to this topic,
- // they will be notified in queue.php
- q("UPDATE `push_subscriber` SET `push` = 1 ".
- "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
-
- logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
-
- } else {
+ if ($push_notify) {
+ // Set push flag for PuSH subscribers to this topic,
+ // they will be notified in queue.php
+ q("UPDATE `push_subscriber` SET `push` = 1 ".
+ "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
- $params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
- post_url($h,$params);
- logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
- }
- if (count($hubs) > 1) {
- sleep(7); // try and avoid multiple hubs responding at precisely the same time
- }
- }
- }
+ logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
// Handling the pubsubhubbub requests
- proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true),
+ proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
'include/pubsubpublish.php');
}
projects / friendica.git / blobdiff