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.

This commit is contained in:
friendica 2014-08-21 20:42:55 -07:00
parent e524835463
commit 05515e3b10

View File

@ -4,8 +4,6 @@
* Diaspora endpoint * Diaspora endpoint
*/ */
//require_once('include/salmon.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/diaspora.php'); require_once('include/diaspora.php');
@ -31,8 +29,11 @@ function receive_post(&$a) {
$guid = argv(2); $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", // Diaspora sites *may* provide a truncated guid.
dbesc($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) if(! $r)
http_status_exit(500); http_status_exit(500);