D* receive endpoint is receive/users/$guid - where $guid is really the channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids.

1 files changed, 5 insertions, 4 deletions

diff --git a/mod/receive.php b/mod/receive.php
index c5a2dc4e0..4071b169b 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -4,8 +4,6 @@
  * Diaspora endpoint
  */
 
-
-//require_once('include/salmon.php');
 require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
@@ -31,8 +29,11 @@ function receive_post(&$a) {
 
 		$guid = argv(2);
 
-		$r = q("SELECT * FROM channel left join account on account_id = channel_account_id WHERE channel_guid = '%s' AND account_flags = 0 LIMIT 1",
-			dbesc($guid)
+		// Diaspora sites *may* provide a truncated guid. 
+
+		$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND NOT (channel_pageflags & %d ) LIMIT 1",
+			dbesc($guid . '%'),
+			intval(PAGE_REMOVED)
 		);
 		if(! $r)
 			http_status_exit(500);