<?php
-require_once("boot.php");
-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');
+
+use Friendica\App;
+use Friendica\Core\Config;
+
+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
function notifier_run(&$argv, &$argc){
- global $a, $db;
-
- if(is_null($a)){
- $a = new App;
- }
-
- if(is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- }
+ global $a;
- require_once("include/session.php");
- require_once("include/datetime.php");
- require_once('include/items.php');
- require_once('include/bbcode.php');
- require_once('include/email.php');
- load_config('config');
- load_config('system');
+ require_once 'include/datetime.php';
+ require_once 'include/items.php';
+ require_once 'include/bbcode.php';
+ require_once 'include/email.php';
- load_hooks();
-
- if($argc < 3)
+ if ($argc < 3) {
return;
-
- $a->set_baseurl(get_config('system','url'));
+ }
logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
case 'mail':
default:
$item_id = intval($argv[2]);
- if(! $item_id){
+ if (! $item_id) {
return;
}
break;
$normal_mode = true;
- if($cmd === 'mail') {
+ if ($cmd === 'mail') {
$normal_mode = false;
$mail = true;
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
- if(! count($message)){
+ if (! count($message)) {
return;
}
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
- }
- elseif($cmd === 'expire') {
+ } elseif ($cmd === 'expire') {
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
);
$uid = $item_id;
$item_id = 0;
- if(! count($items))
+ if (! count($items)) {
return;
- }
- elseif($cmd === 'suggest') {
+ }
+ } elseif ($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
- if(! count($suggest))
+ if (! count($suggest)) {
return;
+ }
$uid = $suggest[0]['uid'];
$recipients[] = $suggest[0]['cid'];
$item = $suggest[0];
- } elseif($cmd === 'removeme') {
+ } elseif ($cmd === 'removeme') {
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`, `user`.`guid`
+ `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
intval($item_id));
$self = $r[0];
$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
- if(!$r)
+ if (!$r) {
return;
-
- require_once('include/Contact.php');
- foreach($r as $contact) {
+ }
+ require_once 'include/Contact.php';
+ foreach ($r as $contact) {
terminate_friendship($user, $self, $contact);
}
return;
- } elseif($cmd === 'relocate') {
+ } elseif ($cmd === 'relocate') {
$normal_mode = false;
$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",
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
intval($item_id)
);
- if((! count($r)) || (! intval($r[0]['parent']))) {
+ if ((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
return;
}
$updated = $r[0]['edited'];
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+ FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
intval($parent_id)
);
- if(! count($items)) {
+ if (! count($items)) {
return;
}
// avoid race condition with deleting entries
- if($items[0]['deleted']) {
- foreach($items as $item)
+ if ($items[0]['deleted']) {
+ foreach ($items as $item) {
$item['deleted'] = 1;
+ }
}
- if((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($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;
}
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`
+ `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
return;
+ }
$owner = $r[0];
$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 this is a public conversation, notify the feed hub
$public_message = true;
// fill this in with a single salmon slap if applicable
$slap = '';
- if(! ($mail || $fsuggest || $relocate)) {
+ if (! ($mail || $fsuggest || $relocate)) {
$slap = ostatus::salmon($target_item,$owner);
- require_once('include/group.php');
+ require_once 'include/group.php';
$parent = $items[0];
$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
- logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
+ logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
// This is IMPORTANT!!!!
$localhost = str_replace('www.','',$a->get_hostname());
- if(strpos($localhost,':'))
+ if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
-
+ }
/**
*
* Be VERY CAREFUL if you make any changes to the following several lines. Seemingly innocuous changes
$relay_to_owner = false;
- if(!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
+ if (!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
$relay_to_owner = true;
}
- if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
+ if (($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
$relay_to_owner = true;
}
// 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'])
+ if (! $target_item['origin']) {
$relay_to_owner = false;
-
- if($parent['origin'])
+ }
+ if ($parent['origin']) {
$relay_to_owner = false;
+ }
- if($relay_to_owner) {
+ // 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
$followup = true;
$recipients = array($parent['contact-id']);
$recipients_followup = array($parent['contact-id']);
- //if (!$target_item['private'] AND $target_item['wall'] AND
- if (!$target_item['private'] AND
+ //if (!$target_item['private'] && $target_item['wall'] &&
+ if (!$target_item['private'] &&
(strlen($target_item['allow_cid'].$target_item['allow_gid'].
$target_item['deny_cid'].$target_item['deny_gid']) == 0))
$push_notify = true;
- if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+ if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
$push_notify = true;
intval($uid),
dbesc(NETWORK_DFRN)
);
- if(count($r))
- foreach($r as $rr)
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
$recipients_followup[] = $rr['id'];
+ }
+ }
}
}
logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
// don't send deletions onward for other people's stuff
- if($target_item['deleted'] && (! intval($target_item['wall']))) {
+ if ($target_item['deleted'] && (! intval($target_item['wall']))) {
logger('notifier: ignoring delete notification for non-wall item');
return;
}
- if((strlen($parent['allow_cid']))
+ if ((strlen($parent['allow_cid']))
|| (strlen($parent['allow_gid']))
|| (strlen($parent['deny_cid']))
|| (strlen($parent['deny_gid']))) {
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
// 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);
+ if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
+ proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
}
$conversants = array();
- foreach($items as $item) {
+ foreach ($items as $item) {
$recipients[] = $item['contact-id'];
$conversants[] = $item['contact-id'];
// pull out additional tagged people to notify (if public message)
- if($public_message && strlen($item['inform'])) {
+ if ($public_message && strlen($item['inform'])) {
$people = explode(',',$item['inform']);
- foreach($people as $person) {
- if(substr($person,0,4) === 'cid:') {
+ foreach ($people as $person) {
+ if (substr($person,0,4) === 'cid:') {
$recipients[] = intval(substr($person,4));
$conversants[] = intval(substr($person,4));
- }
- else {
+ } else {
$url_recipients[] = substr($person,4);
}
}
// If the thread parent is OStatus then do some magic to distribute the messages.
// We have not only to look at the parent, since it could be a Friendica thread.
- if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+ if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+
+ $diaspora_delivery = false;
logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
// Send a salmon to the parent author
- $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
+ $r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
dbesc(normalise_link($thr_parent[0]['author-link'])),
intval($uid));
- if ($r)
+ if (dbm::is_result($r)) {
$probed_contact = $r[0];
- else
+ } else {
$probed_contact = probe_url($thr_parent[0]['author-link']);
+ }
if ($probed_contact["notify"] != "") {
logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
}
// Send a salmon to the parent owner
- $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
+ $r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
dbesc(normalise_link($thr_parent[0]['owner-link'])),
intval($uid));
- if ($r)
+ if (dbm::is_result($r)) {
$probed_contact = $r[0];
- else
+ } else {
$probed_contact = probe_url($thr_parent[0]['owner-link']);
+ }
+
if ($probed_contact["notify"] != "") {
logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
// Send a salmon notification to every person we mentioned in the post
$arr = explode(',',$target_item['tag']);
- foreach($arr as $x) {
+ foreach ($arr as $x) {
//logger('Checking tag '.$x, LOGGER_DEBUG);
$matches = null;
- if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
+ if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
$probed_contact = probe_url($matches[1]);
if ($probed_contact["notify"] != "") {
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
- } else
+ } else {
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
-
- $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
-
- if(count($r))
- $contacts = $r;
-
- } else
+ }
+ } else {
$public_message = false;
+ }
// If this is a public message and pubmail is set on the parent, include all your email contacts
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
- if(! $mail_disabled) {
- if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
+ if (! $mail_disabled) {
+ if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
&& (intval($target_item['pubmail']))) {
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
intval($uid),
dbesc(NETWORK_MAIL)
);
- if(count($r)) {
- foreach($r as $rr)
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
$recipients[] = $rr['id'];
+ }
}
}
}
- if($followup)
+ if ($followup) {
$recip_str = implode(', ', $recipients_followup);
- else
+ } else {
$recip_str = implode(', ', $recipients);
-
- if ($relocate)
+ }
+ if ($relocate) {
$r = $recipients_relocate;
- else
- $r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
+ } else {
+ $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)
);
-
-
- $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
-
- // If we are using the worker we don't need a delivery interval
- if (get_config("system", "worker"))
- $interval = false;
+ }
// delivery loop
- if(count($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'])
- );
- }
- }
-
-
- // This controls the number of deliveries to execute with each separate delivery process.
- // By default we'll perform one delivery per process. Assuming a hostile shared hosting
- // provider, this provides the greatest chance of deliveries if processes start getting
- // killed. We can also space them out with the delivery_interval to also help avoid them
- // getting whacked.
-
- // If $deliveries_per_process > 1, we will chain this number of multiple deliveries
- // together into a single process. This will reduce the overall number of processes
- // spawned for each delivery, but they will run longer.
-
- // When using the workerqueue, we don't need this functionality.
-
- $deliveries_per_process = intval(get_config('system','delivery_batch_count'));
- if (($deliveries_per_process <= 0) OR get_config("system", "worker"))
- $deliveries_per_process = 1;
-
- $this_batch = array();
-
- for($x = 0; $x < count($r); $x ++) {
- $contact = $r[$x];
-
- if($contact['self'])
+ if (dbm::is_result($r)) {
+ foreach ($r as $contact) {
+ if ($contact['self']) {
continue;
-
+ }
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
- // potentially more than one recipient. Start a new process and space them out a bit.
- // we will deliver single recipient types of message and email recipients here.
-
- $this_batch[] = $contact['id'];
-
- if(count($this_batch) >= $deliveries_per_process) {
- proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
- $this_batch = array();
- if($interval)
- @time_sleep_until(microtime(true) + (float) $interval);
- }
- continue;
+ proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+ 'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
}
-
- // be sure to pick up any stragglers
- if(count($this_batch))
- proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
}
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us.
- if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
- if(!get_config('system','dfrn_only')) {
- foreach($url_recipients as $url) {
- if($url) {
+ if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
+ if (!get_config('system','dfrn_only')) {
+ foreach ($url_recipients as $url) {
+ if ($url) {
logger('notifier: urldelivery: ' . $url);
$deliver_status = slapper($owner,$url,$slap);
/// @TODO Redeliver/queue these items on failure, though there is no contact record
}
- if($public_message) {
+ if ($public_message) {
- if (!$followup)
- $r0 = diaspora::relay_list();
- else
- $r0 = array();
+ $r0 = array();
+ $r1 = array();
- $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
- dbesc(NETWORK_DIASPORA),
- intval($owner['uid']),
- intval(CONTACT_IS_SHARING)
- );
+ if ($diaspora_delivery) {
+ if (!$followup) {
+ $r0 = Diaspora::relay_list();
+ }
+
+ $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 `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']),
$r = array_merge($r2,$r1,$r0);
- if(count($r)) {
+ 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 )",
- dbesc($cmd),
- intval($item_id),
- intval($rr['id'])
- );
- }
- }
-
- foreach($r as $rr) {
+ foreach ($r as $rr) {
// except for Diaspora batch jobs
// Don't deliver to folks who have already been delivered to
- if(($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'],$conversants))) {
+ if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'],$conversants))) {
logger('notifier: already delivered id=' . $rr['id']);
continue;
}
- if((! $mail) && (! $fsuggest) && (! $followup)) {
+ 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']);
- if($interval)
- @time_sleep_until(microtime(true) + (float) $interval);
+ 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 AND 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'", dbesc($owner['nickname']));
-
- logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
+ 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']));
- } else {
-
- $params = 'hub.mode=publish&hub.url=' . urlencode( $a->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(PRIORITY_HIGH,'include/pubsubpublish.php');
+ proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+ 'include/pubsubpublish.php');
}
logger('notifier: calling hooks', LOGGER_DEBUG);
- if($normal_mode)
+ if ($normal_mode) {
call_hooks('notifier_normal',$target_item);
+ }
call_hooks('notifier_end',$target_item);
return;
}
-
-
-if (array_search(__file__,get_included_files())===0){
- notifier_run($_SERVER["argv"],$_SERVER["argc"]);
- killme();
-}
projects / friendica.git / blobdiff