Browse Source

diaspora function dispatcher

pull/1/head
Friendika 10 years ago
parent
commit
72873cd827
2 changed files with 56 additions and 37 deletions
  1. +20
    -14
      include/diaspora.php
  2. +36
    -23
      mod/receive.php

+ 20
- 14
include/diaspora.php View File

@ -2,20 +2,6 @@
require_once('include/crypto.php');
function receive_return($val) {
if($val >= 400)
$err = 'Error';
if($val >= 200 && $val < 300)
$err = 'OK';
logger('mod-diaspora returns ' . $val);
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
killme();
}
function get_diaspora_key($uri) {
$key = '';
@ -256,3 +242,23 @@ function diaspora_decode($importer,$xml) {
function diaspora_request($importer,$contact,$xml) {
}
function diaspora_post($importer,$contact,$xml) {
}
function diaspora_comment($importer,$contact,$xml) {
}
function diaspora_like($importer,$contact,$xml) {
}
function diaspora_retraction($importer,$contact,$xml) {
}

+ 36
- 23
mod/receive.php View File

@ -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
}

Loading…
Cancel
Save