From 150c74be69f8514cb5200f331a7e038110f43ea0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Feb 2020 22:45:22 +0000
Subject: [PATCH] Issue 8233: Fix remote subscriptions

---
 mod/dfrn_request.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bf1fbe3c90..62a81022fb 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -455,15 +455,9 @@ function dfrn_request_post(App $a)
 			// Diaspora needs the uri in the format user@domain.tld
 			// Diaspora will support the remote subscription in a future version
 			if ($network == Protocol::DIASPORA) {
-				$uri = $nickname . '@' . DI::baseUrl()->getHostname();
-
-				if (DI::baseUrl()->getUrlPath()) {
-					$uri .= '/' . DI::baseUrl()->getUrlPath();
-				}
-
-				$uri = urlencode($uri);
+				$uri = urlencode($a->profile['addr']);
 			} else {
-				$uri = 'profile/' . $nickname;
+				$uri = urlencode($a->profile['url']);
 			}
 
 			$url = str_replace('{uri}', $uri, $url);