aboutsummaryrefslogtreecommitdiffstats
path: root/mod/receive.php
diff options
context:
space:
mode:
Diffstat (limited to 'mod/receive.php')
-rw-r--r--mod/receive.php59
1 files changed, 36 insertions, 23 deletions
diff --git a/mod/receive.php b/mod/receive.php
index e2c110202..1dfbe59bd 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -14,7 +14,7 @@ require_once('include/diaspora.php');
function receive_post(&$a) {
if($a->argc != 3 || $a->argv[1] !== 'users')
- receive_return(500);
+ http_status_exit(500);
$guid = $a->argv[2];
@@ -22,7 +22,7 @@ function receive_post(&$a) {
dbesc($guid)
);
if(! count($r))
- receive_return(500);
+ http_status_exit(500);
$importer = $r[0];
@@ -31,11 +31,16 @@ function receive_post(&$a) {
logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
if(! $xml)
- receive_return(500);
+ http_status_exit(500);
$msg = diaspora_decode($importer,$xml);
if(! $msg)
- receive_return(500);
+ http_status_exit(500);
+
+
+ $parsed_xml = parse_xml_string($msg);
+
+ $xmlbase = $parsed_xml->post;
// If we reached this point, the message is good.
// Now let's figure out if the author is allowed to send us stuff.
@@ -52,34 +57,42 @@ function receive_post(&$a) {
// is this a follower? Or have we ignored the person?
// If so we can not accept this post.
+ // However we will accept a sharing e.g. friend request
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
- logger('mod-diaspora: Ignoring this author.');
- receive_return(202);
- // NOTREACHED
+ if(! $xmlbase->request) {
+ logger('mod-diaspora: Ignoring this author.');
+ http_status_exit(202);
+ // NOTREACHED
+ }
}
require_once('include/items.php');
- // Placeholder for hub discovery. We shouldn't find any hubs
- // since we supplied the fake feed header - and it doesn't have any.
-
- $hub = '';
-
- /**
- *
- * anti-spam measure: consume_feed will accept a follow activity from
- * this person (and nothing else) if there is no existing contact record.
- *
- */
-
- $contact_rec = ((count($r)) ? $r[0] : null);
-
-
- receive_return(200);
+ $contact = ((count($r)) ? $r[0] : null);
+ if($xmlbase->request) {
+ diaspora_request($importer,$contact,$xmlbase->request);
+ }
+ elseif($xmlbase->status_message) {
+ diaspora_post($importer,$contact,$xmlbase->status_message);
+ }
+ elseif($xmlbase->comment) {
+ diaspora_comment($importer,$contact,$xmlbase->comment);
+ }
+ elseif($xmlbase->like) {
+ diaspora_like($importer,$contact,$xmlbase->like);
+ }
+ elseif($xmlbase->retraction) {
+ diaspora_retraction($importer,$contact,$xmlbase->retraction);
+ }
+ else {
+ logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));
+ }
+ http_status_exit(200);
+ // NOTREACHED
}