<?php
+
require_once("boot.php");
+/*
+ * This file was at one time responsible for doing all deliveries, but this caused
+ * big problems on shared hosting systems, where the process might get killed by the
+ * hosting provider and nothing would get delivered.
+ * It now only delivers one message under certain cases, and invokes a queued
+ * delivery mechanism (include/deliver.php) to deliver individual contacts at
+ * controlled intervals.
+ * This has a much better chance of surviving random processes getting killed
+ * by the hosting provider.
+ * A lot of this code is duplicated in include/deliver.php until we have time to go back
+ * and re-structure the delivery procedure based on the obstacles that have been thrown at
+ * us by hosting providers.
+ */
+
function notifier_run($argv, $argc){
global $a, $db;
require_once('include/items.php');
require_once('include/bbcode.php');
+ load_config('config');
+ load_config('system');
+
load_hooks();
if($argc < 3)
$cmd = $argv[1];
switch($cmd) {
-
case 'mail':
default:
$item_id = intval($argv[2]);
}
$expire = false;
+ $mail = false;
+ $fsuggest = false;
$top_level = false;
$recipients = array();
$url_recipients = array();
- if($cmd === 'mail') {
+ $normal_mode = true;
+ if($cmd === 'mail') {
+ $normal_mode = false;
+ $mail = true;
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
}
elseif($cmd === 'expire') {
+ $normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
- AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
+ AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE",
intval($item_id)
);
$uid = $item_id;
if(! count($items))
return;
}
+ elseif($cmd === 'suggest') {
+ $normal_mode = false;
+ $fsuggest = true;
+
+ $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+ intval($item_id)
+ );
+ if(! count($suggest))
+ return;
+ $uid = $suggest[0]['uid'];
+ $recipients[] = $suggest[0]['cid'];
+ $item = $suggest[0];
+ }
else {
// find ancestors
return;
}
- $parent_item = $r[0];
+ $target_item = $r[0];
$parent_id = intval($r[0]['parent']);
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
- $items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id` ASC",
+ if(! $parent_id)
+ return;
+
+ $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
+ FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
intval($parent_id)
);
$item['deleted'] = 1;
}
- if(count($items) == 1 && $items[0]['uri'] === $items[0]['parent-uri'])
+ if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
+ logger('notifier: top level post');
$top_level = true;
+ }
+
}
- $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`
+ $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`
FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
$owner = $r[0];
+ $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+
$hub = get_config('system','huburl');
// If this is a public conversation, notify the feed hub
- $notify_hub = true;
+ $public_message = true;
// fill this in with a single salmon slap if applicable
$slap = '';
- if($cmd != 'mail') {
+ if(! ($mail || $fsuggest)) {
require_once('include/group.php');
$parent = $items[0];
- if($parent['type'] === 'remote' && (! $expire)) {
+ // This is IMPORTANT!!!!
+
+ // We will only send a "notify owner to relay" or followup message if the referenced post
+ // originated on our system by virtue of having our hostname somewhere
+ // in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
+ // if $parent['wall'] == 1 we will already have the parent message in our array
+ // and we will relay the whole lot.
+
+ // expire sends an entire group of expire messages and cannot be forwarded.
+ // However the conversation owner will be a part of the conversation and will
+ // be notified during this run.
+ // Other DFRN conversation members will be alerted during polled updates.
+
+ // Diaspora members currently are not notified of expirations, and other networks have
+ // either limited or no ability to process deletions. We should at least fix Diaspora
+ // by stringing togther an array of retractions and sending them onward.
+
+
+ $localhost = $a->get_hostname();
+ if(strpos($localhost,':'))
+ $localhost = substr($localhost,0,strpos($localhost,':'));
+
+ /**
+ *
+ * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
+ * have been known to cause runaway conditions which affected several servers, along with
+ * permissions issues.
+ *
+ */
+
+ if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
// local followup to remote post
$followup = true;
- $notify_hub = false; // not public
+ $public_message = false; // not public
$conversant_str = dbesc($parent['contact-id']);
}
else {
|| (strlen($parent['allow_gid']))
|| (strlen($parent['deny_cid']))
|| (strlen($parent['deny_gid']))) {
- $notify_hub = false; // private recipients, not public
+ $public_message = false; // private recipients, not public
}
$allow_people = expand_acl($parent['allow_cid']);
$recipients[] = $item['contact-id'];
$conversants[] = $item['contact-id'];
// pull out additional tagged people to notify (if public message)
- if($notify_hub && strlen($item['inform'])) {
+ if($public_message && strlen($item['inform'])) {
$people = explode(',',$item['inform']);
foreach($people as $person) {
if(substr($person,0,4) === 'cid:') {
$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
-
if(count($r))
$contacts = $r;
}
'$birthday' => $birthday
));
- if($cmd === 'mail') {
- $notify_hub = false; // mail is not public
+ if($mail) {
+ $public_message = false; // mail is not public
+
+ $body = fix_private_photos($item['body'],$owner['uid']);
$atom .= replace_macros($mail_template, array(
'$name' => xmlify($owner['name']),
'$item_id' => xmlify($item['uri']),
'$subject' => xmlify($item['title']),
'$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
- '$content' => xmlify($item['body']),
+ '$content' => xmlify($body),
'$parent_id' => xmlify($item['parent-uri'])
));
}
+ elseif($fsuggest) {
+ $public_message = false; // suggestions are not public
+
+ $sugg_template = get_markup_template('atom_suggest.tpl');
+
+ $atom .= replace_macros($sugg_template, array(
+ '$name' => xmlify($item['name']),
+ '$url' => xmlify($item['url']),
+ '$photo' => xmlify($item['photo']),
+ '$request' => xmlify($item['request']),
+ '$note' => xmlify($item['note'])
+ ));
+
+ // We don't need this any more
+
+ q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+ intval($item['id'])
+ );
+
+ }
else {
if($followup) {
foreach($items as $item) { // there is only one item
if(! $item['parent'])
continue;
+ // private emails may be in included in public conversations. Filter them.
+
+ if(($public_message) && $item['private'])
+ continue;
+
$contact = get_item_contact($item,$contacts);
if(! $contact)
continue;
- $atom .= atom_entry($item,'text',$contact,$owner,true);
+ if($normal_mode) {
+ if($item_id == $item['id'] || $item['id'] == $item['parent'])
+ $atom .= atom_entry($item,'text',$contact,$owner,true);
+ }
+ else
+ $atom .= atom_entry($item,'text',$contact,$owner,true);
- if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']) && (! $expire))
+ if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = atom_entry($item,'html',$contact,$owner,true);
}
}
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if(! $mail_disabled) {
- if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid']))
- && (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid']))
- && (intval($parent_item['pubmail']))) {
+ 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 * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
intval($uid),
dbesc(NETWORK_MAIL)
dbesc($recip_str)
);
- // delivery loop
require_once('include/salmon.php');
+ $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+
+ // delivery loop
+
if(count($r)) {
+
+ foreach($r as $contact) {
+ if((! $mail) && (! $fsuggest) && (! $followup) && (! $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'])
+ );
+ }
+ }
+
foreach($r as $contact) {
if($contact['self'])
continue;
+ // 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 receipients here.
+
+ if((! $mail) && (! $fsuggest) && (! $followup)) {
+ proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
+ if($interval)
+ @time_sleep_until(microtime(true) + (float) $interval);
+ continue;
+ }
+
$deliver_status = 0;
+ logger("main delivery by notifier: followup=$followup mail=$mail fsuggest=$fsuggest");
+
switch($contact['network']) {
- case 'dfrn':
+ case NETWORK_DFRN:
logger('notifier: dfrndelivery: ' . $contact['name']);
$deliver_status = dfrn_deliver($owner,$contact,$atom);
);
}
break;
- case 'stat':
+ case NETWORK_OSTATUS:
+
+ // Do not send to otatus if we are not configured to send to public networks
+ if($owner['prvnets'])
+ break;
+ if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+ break;
if($followup && $contact['notify']) {
logger('notifier: slapdelivery: ' . $contact['name']);
);
}
-
-
}
else {
// only send salmon if public - e.g. if it's ok to notify
// a public hub, it's ok to send a salmon
- if((count($slaps)) && ($notify_hub) && (! $expire)) {
+ if((count($slaps)) && ($public_message) && (! $expire)) {
logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
if($contact['notify']) {
}
}
break;
- case 'mail':
+
+ case NETWORK_MAIL:
+ if(get_config('system','dfrn_only'))
+ break;
+
// WARNING: does not currently convert to RFC2047 header encodings, etc.
$addr = $contact['addr'];
mail($addr, $subject, $message, $headers);
}
break;
- case 'dspr':
- case 'feed':
- case 'face':
+ case NETWORK_DIASPORA:
+ require_once('include/diaspora.php');
+
+ if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+ break;
+
+ // special handling for followup to public post
+ // all other public posts processed as public batches further below
+
+ if($public_message) {
+ if($followup)
+ diaspora_send_followup($target_item,$owner,$contact, true);
+ break;
+ }
+
+ if(! $contact['pubkey'])
+ break;
+
+ if($target_item['verb'] === ACTIVITY_DISLIKE) {
+ // unsupported
+ break;
+ }
+ elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
+ // diaspora delete,
+ diaspora_send_retraction($target_item,$owner,$contact);
+ break;
+ }
+ elseif($followup) {
+ // send comments, likes and retractions of likes to owner to relay
+ diaspora_send_followup($target_item,$owner,$contact);
+ break;
+ }
+ elseif($target_item['parent'] != $target_item['id']) {
+ // we are the relay - send comments, likes and unlikes to our conversants
+ diaspora_send_relay($target_item,$owner,$contact);
+ break;
+ }
+ elseif(($top_level) && (! $walltowall)) {
+ // currently no workable solution for sending walltowall
+ diaspora_send_status($target_item,$owner,$contact);
+ break;
+ }
+
+ break;
+
+ case NETWORK_FEED:
+ case NETWORK_FACEBOOK:
+ if(get_config('system','dfrn_only'))
+ break;
default:
break;
}
// send additional slaps to mentioned remote tags (@foo@example.com)
- if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
- 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($slap && count($url_recipients) && ($followup || $top_level) && $public_message && (! $expire)) {
+ 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((strlen($hub)) && ($notify_hub)) {
- $hubs = explode(',', $hub);
- if(count($hubs)) {
- foreach($hubs as $h) {
- $h = trim($h);
- if(! strlen($h))
- continue;
- $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
- post_url($h,$params);
- logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
- if(count($hubs) > 1)
- sleep(7); // try and avoid multiple hubs responding at precisely the same time
- }
- }
- }
- if($notify_hub) {
+ if($public_message) {
- /**
- *
- * If you have less than 150 dfrn friends and it's a public message,
- * we'll just go ahead and push them out securely with dfrn/rino.
- * If you've got more than that, you'll have to rely on PuSH delivery.
- *
- */
-
- $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxpubdeliver')));
-
- /**
- *
- * Only get the bare essentials and go back for the full record.
- * If you've got a lot of friends and we grab all the details at once it could exhaust memory.
- *
- */
-
- $r = q("SELECT `id`, `name` FROM `contact`
- WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
- AND `rel` != %d ",
+ $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
+ AND `uid` = %d AND `rel` != %d ORDER BY rand() ",
+ dbesc(NETWORK_DIASPORA),
intval($owner['uid']),
- intval(REL_FAN)
+ intval(CONTACT_IS_SHARING)
+ );
+
+ $r2 = q("SELECT `id`, `name`,`network` FROM `contact`
+ WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+ AND `rel` != %d order by rand() ",
+ dbesc(NETWORK_DFRN),
+ intval($owner['uid']),
+ intval(CONTACT_IS_SHARING)
);
- if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
+ $r = array_merge($r2,$r1);
- foreach($r as $rr) {
+ if(count($r)) {
+ logger('pubdeliver: ' . print_r($r,true), LOGGER_DEBUG);
- /* Don't deliver to folks who have already been delivered to */
+ // throw everything into the queue in case we get killed
- if(! in_array($rr['id'], $conversants)) {
- $n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($rr['id'])
+ 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'])
);
+ }
+ }
- if(count($n)) {
-
- logger('notifier: dfrnpubdelivery: ' . $n[0]['name']);
- $deliver_status = dfrn_deliver($owner,$n[0],$atom);
- }
+ 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))) {
+ logger('notifier: already delivered id=' . $rr['id']);
+ continue;
+ }
+
+ if((! $mail) && (! $fsuggest) && (! $followup)) {
+ logger('notifier: delivery agent: ' . $rr['name'] . ' ' . $rr['id']);
+ proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']);
+ if($interval)
+ @time_sleep_until(microtime(true) + (float) $interval);
}
- else
- logger('notifier: dfrnpubdelivery: ignoring ' . $rr['name']);
}
}
+
+
+ if(strlen($hub)) {
+ $hubs = explode(',', $hub);
+ if(count($hubs)) {
+ foreach($hubs as $h) {
+ $h = trim($h);
+ if(! strlen($h))
+ continue;
+ $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+ post_url($h,$params);
+ logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
+ if(count($hubs) > 1)
+ sleep(7); // try and avoid multiple hubs responding at precisely the same time
+ }
+ }
+ }
+
}
return;
}
if (array_search(__file__,get_included_files())===0){
- echo "run!";
notifier_run($argv,$argc);
killme();
}