X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=4efdad4ce4fd480b864932b7c7ee0f2f083ad35e;hb=2fc89deaeae0341aa12b6b811927e793011055d1;hp=bef46677c44a6566130147075123e6b30671670a;hpb=35a9b49ed06c58b53f81cf5ef476191807157925;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index bef46677c4..4efdad4ce4 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -10,18 +10,18 @@ unset($db_host, $db_user, $db_pass, $db_data); - $debugging = get_config('system','debugging'); - require_once("session.php"); require_once("datetime.php"); require_once('include/items.php'); - + require_once('include/bbcode.php'); if($argc < 3) exit; $a->set_baseurl(get_config('system','url')); + logger('notifier: invoked: ' . print_r($argv,true)); + $cmd = $argv[1]; switch($cmd) { @@ -34,10 +34,8 @@ break; } - if($debugging) - dbg(3); - $recipients = array(); + $url_recipients = array(); if($cmd === 'mail') { @@ -72,7 +70,7 @@ killme(); } - $r = q("SELECT `contact`.*, `user`.`nickname` + $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) @@ -84,9 +82,13 @@ killme(); $hub = get_config('system','huburl'); + // If this is a public conversation, notify the feed hub $notify_hub = true; + // fill this in with a single salmon slap if applicable + $slap = ''; + if($cmd != 'mail') { require_once('include/group.php'); @@ -105,8 +107,9 @@ if((strlen($parent['allow_cid'])) || (strlen($parent['allow_gid'])) || (strlen($parent['deny_cid'])) - || (strlen($parent['deny_gid']))) + || (strlen($parent['deny_gid']))) { $notify_hub = false; // private recipients, not public + } $allow_people = expand_acl($parent['allow_cid']); $allow_groups = expand_groups(expand_acl($parent['allow_gid'])); @@ -118,18 +121,31 @@ foreach($items as $item) { $recipients[] = $item['contact-id']; $conversants[] = $item['contact-id']; + // pull out additional tagged people to notify (if public message) + if($notify_hub && strlen($item['inform'])) { + $people = explode(',',$item['inform']); + foreach($people as $person) { + if(substr($person,0,4) === 'cid:') { + $recipients[] = intval(substr($person,4)); + $conversants[] = intval(substr($person,4)); + } + else { + $url_recipients[] = substr($person,4); + } + } + } } - $conversants = array_unique($conversants,SORT_NUMERIC); + logger('notifier: url_recipients' . print_r($url_recipients,true)); + $conversants = array_unique($conversants); - $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups),SORT_NUMERIC); - $deny = array_unique(array_merge($deny_people,$deny_groups),SORT_NUMERIC); + + $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups)); + $deny = array_unique(array_merge($deny_people,$deny_groups)); $recipients = array_diff($recipients,$deny); $conversant_str = dbesc(implode(', ',$conversants)); - - } $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); @@ -138,18 +154,15 @@ killme(); $contacts = $r; - - $tomb_template = load_view_file('view/atom_tomb.tpl'); - $item_template = load_view_file('view/atom_item.tpl'); - $cmnt_template = load_view_file('view/atom_cmnt.tpl'); } $feed_template = load_view_file('view/atom_feed.tpl'); $mail_template = load_view_file('view/atom_mail.tpl'); $atom = ''; - $hubxml = ''; + $slaps = array(); + if(strlen($hub)) { $hubs = explode(',', $hub); if(count($hubs)) { @@ -163,22 +176,25 @@ } $atom .= replace_macros($feed_template, array( + '$version' => xmlify(FRIENDIKA_VERSION), '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ), '$feed_title' => xmlify($owner['name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) , '$hub' => $hubxml, - '$salmon' => '', // private feed, we don't use salmon here + '$salmon' => '', // private feed, we don't use salmon here '$name' => xmlify($owner['name']), '$profile_page' => xmlify($owner['url']), '$photo' => xmlify($owner['photo']), '$thumb' => xmlify($owner['thumb']), '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) , '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) , - '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) + '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) , + '$birthday' => '' )); if($cmd === 'mail') { $notify_hub = false; // mail is not public + $atom .= replace_macros($mail_template, array( '$name' => xmlify($owner['name']), '$profile_page' => xmlify($owner['url']), @@ -191,102 +207,37 @@ )); } else { - if($followup) { foreach($items as $item) { // there is only one item - - $verb = construct_verb($item); - $actobj = construct_activity($item); - if($item['id'] == $item_id) { - $atom .= replace_macros($cmnt_template, array( - '$name' => xmlify($owner['name']), - '$profile_page' => xmlify($owner['url']), - '$thumb' => xmlify($owner['thumb']), - '$owner_name' => xmlify($item['owner-name']), - '$owner_profile_page' => xmlify($item['owner-link']), - '$owner_thumb' => xmlify($item['owner-avatar']), - '$item_id' => xmlify($item['uri']), - '$title' => xmlify($item['title']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)), - '$location' => xmlify($item['location']), - '$type' => 'text', - '$verb' => xmlify($verb), - '$actobj' => $actobj, - '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), - '$content' => xmlify($item['body']), - '$parent_id' => xmlify($item['parent-uri']), - '$comment_allow' => 0 - )); + logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA); + $slap = atom_entry($item,'html',$owner,$owner,false); + $atom .= atom_entry($item,'text',$owner,$owner,false); } } } else { foreach($items as $item) { - if($item['deleted']) { - $atom .= replace_macros($tomb_template, array( - '$id' => xmlify($item['uri']), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)) - )); - } - else { - $contact = get_item_contact($item,$contacts); - if(! $contact) - continue; - - $verb = construct_verb($item); - $actobj = construct_activity($item); - - if($item['parent'] == $item['id']) { - $atom .= replace_macros($item_template, array( - '$name' => xmlify($contact['name']), - '$profile_page' => xmlify($contact['url']), - '$thumb' => xmlify($contact['thumb']), - '$owner_name' => xmlify($item['owner-name']), - '$owner_profile_page' => xmlify($item['owner-link']), - '$owner_thumb' => xmlify($item['owner-avatar']), - '$item_id' => xmlify($item['uri']), - '$title' => xmlify($item['title']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)), - '$location' => xmlify($item['location']), - '$type' => 'text', - '$verb' => xmlify($verb), - '$actobj' => $actobj, - '$content' => xmlify($item['body']), - '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), - '$comment_allow' => (($item['last-child']) ? 1 : 0) - )); - } - else { - $atom .= replace_macros($cmnt_template, array( - '$name' => xmlify($contact['name']), - '$profile_page' => xmlify($contact['url']), - '$thumb' => xmlify($contact['thumb']), - '$item_id' => xmlify($item['uri']), - '$title' => xmlify($item['title']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)), - '$content' => xmlify($item['body']), - '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), - '$location' => xmlify($item['location']), - '$type' => 'text', - '$verb' => xmlify($verb), - '$actobj' => $actobj, - '$parent_id' => xmlify($item['parent-uri']), - '$comment_allow' => (($item['last-child']) ? 1 : 0) - )); - } - } + $contact = get_item_contact($item,$contacts); + if(! $contact) + continue; + + $atom .= atom_entry($item,'text',$contact,$owner,true); + + // There's a problem here - we *were* going to use salmon to provide semi-authenticated + // communication to OStatus, but unless we're the item author they won't verify. + // commented out for now, though we'll still send local replies (and any mentions + // that they contain) upstream. Rethinking the problem space. + +// $slaps[] = atom_entry($item,'html',$contact,$owner,true); } } } $atom .= '' . "\r\n"; - if($debugging) - echo $atom; + logger('notifier: ' . $atom, LOGGER_DATA); +// logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); if($followup) $recip_str = $parent['contact-id']; @@ -294,7 +245,7 @@ $recip_str = implode(', ', $recipients); - $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) ", + $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ", dbesc($recip_str) ); if(! count($r)) @@ -302,6 +253,8 @@ // delivery loop + require_once('include/salmon.php'); + foreach($r as $contact) { if($contact['self']) continue; @@ -310,16 +263,84 @@ switch($contact['network']) { case 'dfrn': - $deliver_status = dfrn_deliver($contact,$atom,$debugging); + logger('notifier: dfrndelivery: ' . $contact['name']); + $deliver_status = dfrn_deliver($owner,$contact,$atom); + + logger('notifier: dfrn_delivery returns ' . $deliver_status); + + if($deliver_status == (-1)) { + logger('notifier: delivery failed: queuing message'); + // queue message for redelivery + q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) + VALUES ( %d, '%s', '%s', '%s') ", + intval($contact['id']), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($atom) + ); + } + break; + case 'stat': + if($followup && $contact['notify']) { + logger('notifier: slapdelivery: ' . $contact['name']); + $deliver_status = slapper($owner,$contact['notify'],$slap); + + if($deliver_status == (-1)) { + // queue message for redelivery + q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) + VALUES ( %d, '%s', '%s', '%s') ", + intval($contact['id']), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($slap) + ); + + } + + + } + 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) { + logger('notifier: slapdelivery: ' . $contact['name']); + foreach($slaps as $slappy) { + if($contact['notify']) { + $deliver_status = slapper($owner,$contact['notify'],$slappy); + if($deliver_status == (-1)) { + // queue message for redelivery + q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) + VALUES ( %d, '%s', '%s', '%s') ", + intval($contact['id']), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($slappy) + ); + } + } + } + } + } break; + case 'mail': + case 'dspr': + case 'feed': default: break; } - - if(($cmd === 'mail') && ($deliver_status == 0)) { - $r = q("UPDATE `mail` SET `delivered` = 1 WHERE `id` = %d LIMIT 1", - intval($item_id) - ); + } + + // send additional slaps to mentioned remote tags (@foo@example.com) + + if($slap && count($url_recipients) && $followup && $notify_hub) { + 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 + } } } @@ -332,10 +353,7 @@ continue; $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] ); post_url($h,$params); - if($debugging) { - file_put_contents('pubsub.out', "\n\n" . "Pinged hub " . $h . ' at ' - . datetime_convert() . "\n" . "Hub returned " . $a->get_curl_code() . "\n\n" , FILE_APPEND); - } + logger('pubsub: publish: ' . $h . ' returned ' . $a->get_curl_code()); if(count($hubs) > 1) sleep(7); // try and avoid multiple hubs responding at precisely the same time }