X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fnotifier.php;h=4efdad4ce4fd480b864932b7c7ee0f2f083ad35e;hb=c4ddee005ebcf912c913e12a17e65ab8826650a6;hp=f7c0570d8053766bf84f7773ef2757a065b3bf3c;hpb=059e090b53643cb07a2634b700ada5cf3b6894e8;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index f7c0570d80..4efdad4ce4 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -1,59 +1,78 @@ set_baseurl(get_config('system','url')); - $cmd = $argv[2]; + logger('notifier: invoked: ' . print_r($argv,true)); + + $cmd = $argv[1]; switch($cmd) { + case 'mail': default: - $item_id = intval($argv[3]); + $item_id = intval($argv[2]); if(! $item_id) killme(); break; } - $recipients = array(); + $url_recipients = array(); - // find ancestors + if($cmd === 'mail') { - $r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1", - intval($item_id) - ); - if(! count($r)) - killme(); + $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1", + intval($item_id) + ); + if(! count($message)) + killme(); + $uid = $message[0]['uid']; + $recipients[] = $message[0]['contact-id']; + $item = $message[0]; - $parent = $r[0]['parent']; - $uid = $r[0]['uid']; - $updated = $r[0]['edited']; + } + else { + // find ancestors - $items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id` ASC", - intval($parent) - ); + $r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1", + intval($item_id) + ); + if(! count($r)) + killme(); - if(! count($items)) - killme(); + $parent_id = $r[0]['parent']; + $uid = $r[0]['uid']; + $updated = $r[0]['edited']; - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", + $items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id` ASC", + intval($parent_id) + ); + + if(! count($items)) + killme(); + } + + $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) ); @@ -62,147 +81,171 @@ if($argc < 3) else killme(); + $hub = get_config('system','huburl'); - require_once('include/group.php'); + // If this is a public conversation, notify the feed hub + $notify_hub = true; - $parent = $items[0]; + // fill this in with a single salmon slap if applicable + $slap = ''; - if(strlen($parent['remote-id'])) { - $followup = true; - $conversant_str = dbesc($parent['contact-id']); - } - else { - $followup = false; + if($cmd != 'mail') { - $allow_people = expand_acl($parent['allow_cid']); - $allow_groups = expand_groups(expand_acl($parent['allow_gid'])); - $deny_people = expand_acl($parent['deny_cid']); - $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); + require_once('include/group.php'); - $conversants = array(); + $parent = $items[0]; - foreach($items as $item) { - $recipients[] = $item['contact-id']; - $conversants[] = $item['contact-id']; + if($parent['type'] === 'remote') { + // local followup to remote post + $followup = true; + $notify_hub = false; // not public + $conversant_str = dbesc($parent['contact-id']); } + else { + $followup = false; + + if((strlen($parent['allow_cid'])) + || (strlen($parent['allow_gid'])) + || (strlen($parent['deny_cid'])) + || (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'])); + $deny_people = expand_acl($parent['deny_cid']); + $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); + + $conversants = array(); + + 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_diff($recipients,$deny); - - $conversant_str = dbesc(implode(', ',$conversants)); - } - $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) "); + $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups)); + $deny = array_unique(array_merge($deny_people,$deny_groups)); + $recipients = array_diff($recipients,$deny); - if( ! count($r)) - killme(); + $conversant_str = dbesc(implode(', ',$conversants)); + } - $contacts = $r; + $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); + if( ! count($r)) + killme(); - $feed_template = file_get_contents('view/atom_feed.tpl'); - $tomb_template = file_get_contents('view/atom_tomb.tpl'); - $item_template = file_get_contents('view/atom_item.tpl'); - $cmnt_template = file_get_contents('view/atom_cmnt.tpl'); + $contacts = $r; + } - $atom = ''; + $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)) { + foreach($hubs as $h) { + $h = trim($h); + if(! strlen($h)) + continue; + $hubxml .= '' . "\n" ; + } + } + } $atom .= replace_macros($feed_template, array( - '$feed_id' => xmlify($baseurl), - '$feed_title' => xmlify($owner['name']), - '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , 'Y-m-d\TH:i:s\Z')) , - '$name' => xmlify($owner['name']), + '$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 + '$name' => xmlify($owner['name']), '$profile_page' => xmlify($owner['url']), - '$photo' => xmlify($owner['photo']) + '$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)) , + '$birthday' => '' )); - if($followup) { - $atom .= replace_macros($cmnt_template, array( - '$name' => xmlify($contact['name']), - '$profile_page' => xmlify($contact['url']), - '$thumb' => xmlify($contact['thumb']), - '$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"), - '$title' => xmlify($item['title']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - '$content' =>xmlify($item['body']), - '$parent_id' => xmlify("{$items[0]['remote-id']}"), - '$comment_allow' => 0 + 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']), + '$thumb' => xmlify($owner['thumb']), + '$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']), + '$parent_id' => xmlify($item['parent-uri']) )); } else { - foreach($items as $item) { - if($item['deleted']) { - $atom .= replace_macros($tomb_template, array( - '$id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) - )); - } - else { - foreach($contacts as $contact) { - if($item['contact-id'] == $contact['id']) { - 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($owner['name']), - '$owner_profile_page' => xmlify($owner['url']), - '$owner_thumb' => xmlify($owner['thumb']), - '$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"), - '$title' => xmlify($contact['name']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - '$content' =>xmlify($item['body']), - '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'] && (! $contact['blocked']))) ? 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("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"), - '$title' => xmlify($item['title']), - '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - - '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), - '$content' =>xmlify($item['body']), - '$parent_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$items[0]['hash']}"), - '$comment_allow' => (($item['last-child']) ? 1 : 0) - )); - } - } + if($followup) { + foreach($items as $item) { // there is only one item + if($item['id'] == $item_id) { + 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) { + $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"; - - // create a separate feed with comments disabled and send to those who can't respond. - - $atom_nowrite = str_replace('1','0',$atom); - -print_r($atom); + $atom .= '' . "\r\n"; + logger('notifier: ' . $atom, LOGGER_DATA); -dbg(3); - - - -print_r($recipients); +// logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); if($followup) $recip_str = $parent['contact-id']; else $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)) @@ -210,47 +253,111 @@ print_r($recipients); // delivery loop - foreach($r as $rr) { - if($rr['self']) - continue; - - if(! strlen($rr['dfrn-id'])) - continue; - $url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id']; -print_r($url); - $xml = fetch_url($url); -echo $xml; + require_once('include/salmon.php'); -print_r($xml); - if(! $xml) + foreach($r as $contact) { + if($contact['self']) continue; - $res = simplexml_load_string($xml); -print_r($res); -var_dump($res); - - if((intval($res->status) != 0) || (! strlen($res->challenge)) || ($res->dfrn_id != $rr['dfrn-id'])) - continue; - - $postvars = array(); - - $postvars['dfrn_id'] = $rr['dfrn-id']; - $challenge = hex2bin($res->challenge); -echo "dfrn-id:" . $res->dfrn_id . "\r\n"; -echo "challenge:" . $res->challenge . "\r\n"; -echo "pubkey:" . $rr['pubkey'] . "\r\n"; + $deliver_status = 0; + + switch($contact['network']) { + case 'dfrn': + 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) + ); - openssl_public_decrypt($challenge,$postvars['challenge'],$rr['pubkey']); + } - if(strlen($rr['dfrn-id']) && (! $rr['blocked'])) - $postvars['data'] = $atom; - else - $postvars['data'] = $atom_nowrite; -print_r($postvars); - $xml = post_url($url,$postvars); + } + 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; + } + } + + // 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 + } + } + } -print_r($xml); + 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 . ' returned ' . $a->get_curl_code()); + if(count($hubs) > 1) + sleep(7); // try and avoid multiple hubs responding at precisely the same time + } + } } killme();