diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
| commit | 8b997791819ba419e7e2ceb7861bb0e3e37d87dd (patch) | |
| tree | 78b75c13632e9fcaa32f281fb23dcfcd841cf0e1 /include/notifier.php | |
| parent | b5c9f80919bd8678521c31913eeb08ccc56914dd (diff) | |
| parent | 028460a5c1de4833bb1dcfaa945c1292952bf923 (diff) | |
| download | volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.gz volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.bz2 volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/include/notifier.php b/include/notifier.php index 7791b9bd4..39640e51a 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -181,7 +181,7 @@ '$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']), @@ -207,7 +207,6 @@ )); } else { - if($followup) { foreach($items as $item) { // there is only one item if($item['id'] == $item_id) { @@ -224,7 +223,13 @@ continue; $atom .= atom_entry($item,'text',$contact,$owner,true); - $slaps[] = atom_entry($item,'html',$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); } } } @@ -232,7 +237,7 @@ logger('notifier: ' . $atom, LOGGER_DATA); - logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); +// logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); if($followup) $recip_str = $parent['contact-id']; @@ -324,14 +329,12 @@ // send additional slaps to mentioned remote tags (@foo@example.com) - if(count($slaps) && count($url_recipients) && $notify_hub) { + if($slap && count($url_recipients) && $followup && $notify_hub) { foreach($url_recipients as $url) { - logger('notifier: urldelivery: ' . $url); - foreach($slaps as $slappy) { - if($url) { - $deliver_status = slapper($owner,$url,$slappy); - // TODO: redeliver/queue these items on failure, though there is no contact record - } + 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 } } } |