From e8fd2c1d613644df885b9d2b44449a3952d59844 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 1 Feb 2019 09:21:22 -0100
Subject: [PATCH] getUrlSocial would work on custom apps folder

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Service/ConfigService.php | 11 ++++++++---
 lib/webfinger.php             |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 7e4c04e1..4236b9de 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -242,6 +242,7 @@ class ConfigService {
 		return $this->config->getSystemValue($key, '');
 	}
 
+
 	/**
 	 * @param string $cloudAddress
 	 */
@@ -277,13 +278,17 @@ class ConfigService {
 
 
 	/**
-	 * // TODO - check the Apps folder
+	 * @param string $path
 	 *
 	 * @return string
 	 * @throws SocialAppConfigException
 	 */
-	public function getUrlSocial(): string {
-		return $this->getCloudAddress() . '/apps/social/';
+	public function getUrlSocial(string $path = ''): string {
+		if ($path === '') {
+			$path = $this->urlGenerator->linkToRoute('social.Navigation.navigate');
+		}
+
+		return 'https://' . $this->getCloudAddress(true) . $path;
 	}
 
 
diff --git a/lib/webfinger.php b/lib/webfinger.php
index 7d8f1fe0..8a50b82c 100644
--- a/lib/webfinger.php
+++ b/lib/webfinger.php
@@ -68,8 +68,9 @@ try {
 	exit;
 }
 
-$href =
-	$urlGenerator->linkToRouteAbsolute('social.ActivityPub.actorAlias', ['username' => $username]);
+$href = $configService->getUrlSocial(
+	$urlGenerator->linkToRoute('social.ActivityPub.actorAlias', ['username' => $username])
+);
 
 if (substr($href, -1) === '/') {
 	$href = substr($href, 0, -1);
@@ -79,7 +80,7 @@ $finger = [
 	'subject' => $subject,
 	'links'   => [
 		[
-			'rel'  => 'self',
+			'rel' => 'self',
 			'type' => 'application/activity+json',
 			'href' => $href
 		]