X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=64fbda289f674145f8abf216eff38f1b6dc1e56a;hb=13b4962531ca3c4f085b385a2c6b8f088abb7d6a;hp=d6e3d378fcbdb7c7af7cb324b7e301e026e8e1c9;hpb=bdf42473a0341f291cd256323d122aa80bb0cb0b;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index d6e3d378fc..64fbda289f 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,33 +44,46 @@ function pubsub_init(&$a) {
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
 			dbesc($nick)
 		);
-		if(! count($r))
+		if(! count($r)) {
+			logger('pubsub: local account not found: ' . $nick);
 			hub_return(false, '');
+		}
 
 
 		$owner = $r[0];
 
 		$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-		$r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d 
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
 			AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
-			dbesc($hub_topic),
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if(! count($r))
+		if(! count($r)) {
+			logger('pubsub: contact not found.');
 			hub_return(false, '');
+		}
+
+		if(! link_compare($hub_topic,$r[0]['poll'])) {
+			logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
+			// should abort but let's humour them. 			
+		}
 
 		$contact = $r[0];
 
 		// We must initiate an unsubscribe request with a verify_token. 
 		// Don't allow outsiders to unsubscribe us.
 
-		if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) 
-			hub_return(false, '');
+		if($hub_mode === 'unsubscribe') {
+			if(! strlen($hub_verify)) {
+				logger('pubsub: bogus unsubscribe'); 
+				hub_return(false, '');
+			}
+			logger('pubsub: unsubscribe success');
+		}
 
 		$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
 			intval($subscribe),
@@ -99,7 +112,7 @@ function pubsub_post(&$a) {
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
 		dbesc($nick)
 	);
 	if(! count($r))
@@ -122,15 +135,21 @@ function pubsub_post(&$a) {
 
 	$contact = $r[0];
 
+	// we have no way to match Diaspora guid's with atom post id's and could get duplicates.
+	// we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
+
+	if($r[0]['network'] === NETWORK_DIASPORA)
+		hub_post_return();
+
 	$feedhub = '';
 
 	require_once('include/items.php');
 
-	consume_feed($xml,$importer,$contact,$feedhub,1);
+	consume_feed($xml,$importer,$contact,$feedhub,1,1);
 
 	// do it a second time so that any children find their parents.
 
-	consume_feed($xml,$importer,$contact,$feedhub,1);
+	consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
 	hub_post_return();