friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

reinstate send slaps but only at the top level (and followup)

This commit is contained in:
Friendika 2011-02-11 03:17:16 -08:00
parent c16e86add8
commit 0bfe63e7d8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/notifier.php
View File

@ -40,6 +40,7 @@ function notifier_run($argv, $argc){
break; break;
} }
$top_level = false;
$recipients = array(); $recipients = array();
$url_recipients = array(); $url_recipients = array();
@ -79,12 +80,16 @@ function notifier_run($argv, $argc){
return; return;
} }
// avoid race condition with deleting entries // avoid race condition with deleting entries
if($items[0]['deleted']) { if($items[0]['deleted']) {
foreach($items as $item) foreach($items as $item)
$item['deleted'] = 1; $item['deleted'] = 1;
} }
if(count($items) == 1 && $items[0]['uri'] === $items[0]['parent-uri'])
$top_level = true;
} }
$r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`
@ -167,9 +172,6 @@ function notifier_run($argv, $argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
// if( ! count($r)){
// return;
// }
if(count($r)) if(count($r))
$contacts = $r; $contacts = $r;
@ -242,12 +244,8 @@ function notifier_run($argv, $argc){
$atom .= atom_entry($item,'text',$contact,$owner,true); $atom .= atom_entry($item,'text',$contact,$owner,true);
// There's a problem here - we *were* going to use salmon to provide semi-authenticated if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']))
// communication to OStatus, but unless we're the item author they won't verify. $slaps[] = atom_entry($item,'html',$contact,$owner,true);
// 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);
} }
} }
} }
@ -255,7 +253,7 @@ function notifier_run($argv, $argc){
logger('notifier: ' . $atom, LOGGER_DATA); 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) if($followup)
$recip_str = $parent['contact-id']; $recip_str = $parent['contact-id'];