make diaspora person guids for hubzilla folks globally unique. That's what a globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision.

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/features.bb b/doc/features.bb
index 0a9bcee38..cb194966e 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -33,6 +33,10 @@ At this point, the $Projectname [i]Affinity Slider[/i] tool, which usually appea
 

 The Affinity Slider allows instantaneous filtering of large amounts of content, grouped by levels of closeness.

 

+[b]Connection Filtering[/b]

+

+You have the ability to control precisely what appears in your stream using the optional "Connection Filter". When enabled, the Connection Editor provides inputs for selecting criteria which needs to be matched in order to include or exclude a specific post from a specific channel. Once a post has been allowed, all comments to that post are allowed regardless of whether they match the selection criteria. You may select words that if present block the post or ensure it is included in your stream. Regular expressions may be used for even finer control, as well as hashtags or even the detected language of the post.  

+

 [b]Access Control Lists[/b]

 

 When sharing content, members have the option of restricting who sees the content.  By clicking on the padlock underneath the sharing box, one may choose desired recipients of the post, by clicking on their names.

diff --git a/mod/xrd.php b/mod/xrd.php
index 4fa81c7f3..d547194ad 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -24,7 +24,7 @@ function xrd_init(&$a) {
 
 	$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
 		'$baseurl' => $a->get_baseurl(),
-		'$dspr_guid' => $r[0]['channel_guid'],
+		'$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',$a->get_hostname()),
 		'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
 	));