diff --git a/mod/community.php b/mod/community.php index 84fc15debb..1f8adf8907 100644 --- a/mod/community.php +++ b/mod/community.php @@ -84,6 +84,8 @@ function community_content(&$a, $update = 0) { ); // group by `item`.`uri` +// AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` +// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` if(! count($r)) { info( t('No results.') . EOL); diff --git a/mod/receive.php b/mod/receive.php index 0523fd9cc5..ee15ebe8a3 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -42,6 +42,8 @@ function receive_post(&$a) { // It is an application/x-www-form-urlencoded + logger('mod-diaspora: receiving post', LOGGER_DEBUG); + $xml = urldecode($_POST['xml']); logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA); @@ -49,13 +51,19 @@ function receive_post(&$a) { if(! $xml) http_status_exit(500); + logger('mod-diaspora: message is okay', LOGGER_DEBUG); + $msg = diaspora_decode($importer,$xml); + logger('mod-diaspora: decoded', LOGGER_DEBUG); + logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA); if(! is_array($msg)) http_status_exit(500); + logger('mod-diaspora: dispatching', LOGGER_DEBUG); + $ret = 0; if($public) diaspora_dispatch_public($msg);