refactor the diaspora contact logic

include/diaspora.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/crypto.php');
+require_once('include/items.php');
 
 function get_diaspora_key($uri) {
 	$key = '';
@@ -242,24 +243,37 @@ function diaspora_decode($importer,$xml) {
 
 }
 
+function diaspora_get_contact_by_handle($uid,$handle) {
+	$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1",
+		dbesc(NETWORK_DIASPORA),
+		intval($uid),
+		dbesc($handle)
+	);
+	if($r && count($r))
+		return $r[0];
+	return false;
+}
 
 
-
+function diaspora_request($importer,$xml) {
-function diaspora_request($importer,$contact,$xml) {
 
 	$sender_handle = $xml->sender_handle;
 	$recipient_handle = $xml->recipient_handle;
 
 	if(! $sender_handle || ! $recipient_handle)
 		return;
-	
+	 
-	if($contact && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) {
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
-		q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+
-			intval(CONTACT_IS_FRIEND),
+	if($contact) {
-			intval($contact['id']),
+		if($contact['rel'] == CONTACT_IS_FOLLOWER) {
-			intval($importer['uid'])
+			q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		);
+				intval(CONTACT_IS_FRIEND),
-		// send notification
+				intval($contact['id']),
+				intval($importer['uid'])
+			);
+		}
+		// send notification?
 		return;
 	}
 	
@@ -320,10 +334,21 @@ function diaspora_request($importer,$contact,$xml) {
 
 }
 
-function diaspora_post($importer,$contact,$xml) {
+function diaspora_post($importer,$xml) {
 
 	$guid = notags(unxmlify($xml->guid));
 	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
+
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
+	if(! $contact)
+		return;
+
+	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
+		logger('diaspora_post: Ignoring this author.');
+		http_status_exit(202);
+		// NOTREACHED
+	}
+
 	$message_id = $diaspora_handle . ':' . $guid;
 	$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
 		intval($importer['uid']),
@@ -400,9 +425,23 @@ function diaspora_post($importer,$contact,$xml) {
 
 }
 
-function diaspora_comment($importer,$contact,$xml) {
+function diaspora_comment($importer,$xml) {
 	$guid = notags(unxmlify($xml->guid));
 	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
+
+
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
+	if(! $contact)
+		return;
+
+	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
+		logger('diaspora_comment: Ignoring this author.');
+		http_status_exit(202);
+		// NOTREACHED
+	}
+
+
+
 	$message_id = $diaspora_handle . ':' . $guid;
 	$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
 		intval($importer['uid']),
@@ -423,10 +462,23 @@ function diaspora_comment($importer,$contact,$xml) {
 
 }
 
-function diaspora_like($importer,$contact,$xml) {
+function diaspora_like($importer,$xml) {
 
 	$guid = notags(unxmlify($xml->guid));
 	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
+
+
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
+	if(! $contact)
+		return;
+
+	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
+		logger('diaspora_like: Ignoring this author.');
+		http_status_exit(202);
+		// NOTREACHED
+	}
+
+
 	$message_id = $diaspora_handle . ':' . $guid;
 	$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
 		intval($importer['uid']),
@@ -519,7 +571,22 @@ EOT;
 
 }
 
-function diaspora_retraction($importer,$contact,$xml) {
+function diaspora_retraction($importer,$xml) {
+
+	$guid = notags(unxmlify($xml->guid));
+	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
+
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
+	if(! $contact)
+		return;
+
+//	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
+//		logger('diaspora_retraction: Ignoring this author.');
+//		http_status_exit(202);
+//		// NOTREACHED
+//	}
+
+
 
 }
 

mod/receive.php

@@ -9,7 +9,6 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
-
 	
 function receive_post(&$a) {
 
@@ -26,7 +25,6 @@ function receive_post(&$a) {
 
 	$importer = $r[0];
 
-	// I really don't know why we need urldecode - PHP should be doing this for us.
 	// It is an application/x-www-form-urlencoded
 
 	$xml = urldecode($_POST['xml']);
@@ -48,53 +46,20 @@ function receive_post(&$a) {
 
 	$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.
-
-	$r = q("SELECT * FROM `contact` WHERE `network` = 'dspr' AND ( `url` = '%s' OR `alias` = '%s') 
-		AND `uid` = %d LIMIT 1",
-		dbesc($author_link),
-		dbesc($author_link),
-		intval($importer['uid'])
-	);
-	if(! count($r)) {
-		logger('mod-diaspora: Author unknown to us.');
-	}	
-
-	// 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
-	// or a retraction of same.
-
-
-	$allow_blocked = (($xmlbase->request || ($xmlbase->retraction && $xmlbase->retraction->type == 'Person')) ? true : false);
-
-	if((count($r)) 
-		&& (($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']) || ($r[0]['readonly'])) 
-		&& (! $allow_blocked)) {
-			logger('mod-diaspora: Ignoring this author.');
-			http_status_exit(202);
-			// NOTREACHED
-	}
-
-	require_once('include/items.php');
-
-	$contact = ((count($r)) ? $r[0] : null);
-
 	if($xmlbase->request) {
-		diaspora_request($importer,$contact,$xmlbase->request);
+		diaspora_request($importer,$xmlbase->request);
 	}
 	elseif($xmlbase->status_message) {
-		diaspora_post($importer,$contact,$xmlbase->status_message);
+		diaspora_post($importer,$xmlbase->status_message);
 	}
 	elseif($xmlbase->comment) {
-		diaspora_comment($importer,$contact,$xmlbase->comment);
+		diaspora_comment($importer,$xmlbase->comment);
 	}
 	elseif($xmlbase->like) {
-		diaspora_like($importer,$contact,$xmlbase->like);
+		diaspora_like($importer,$xmlbase->like);
 	}
 	elseif($xmlbase->retraction) {
-		diaspora_retraction($importer,$contact,$xmlbase->retraction);
+		diaspora_retraction($importer,$xmlbase->retraction);
 	}
 	else {
 		logger('mod-diaspora: unknown message type: ' . print_r($xmlbase,true));