X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FXrd.php;h=d2813cc270ae0d39c479bc79e9cb4cd348651aea;hb=fc283ab92858238a5a55f24b1d1650bb72068b7d;hp=1028bfd531f3054265d677c1eef698d00445d997;hpb=bfbce16d0bd795cb7d48a98c05fd930058445f10;p=friendica.git

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 1028bfd531..d2813cc270 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,11 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
+use Friendica\Core\System;
+use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\ActivityNamespace;
@@ -17,12 +38,10 @@ use Friendica\Util\Strings;
  */
 class Xrd extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
-		$app = self::getApp();
-
 		// @TODO: Replace with parameter from router
-		if ($app->argv[0] == 'xrd') {
+		if (DI::args()->getArgv()[0] == 'xrd') {
 			if (empty($_GET['uri'])) {
 				return;
 			}
@@ -57,29 +76,85 @@ class Xrd extends BaseModule
 			$name = substr($local, 0, strpos($local, '@'));
 		}
 
-		$user = User::getByNickname($name);
-
-		if (empty($user)) {
-			throw new \Friendica\Network\HTTPException\NotFoundException();
-		}
+		if ($name == User::getActorName()) {
+			$owner = User::getSystemAccount();
+			if (empty($owner)) {
+				throw new \Friendica\Network\HTTPException\NotFoundException();
+			}
+			self::printSystemJSON($owner);
+		} else {
+			$user = User::getByNickname($name);
+			if (empty($user)) {
+				throw new \Friendica\Network\HTTPException\NotFoundException();
+			}
 
-		$owner = User::getOwnerDataById($user['uid']);
+			$owner = User::getOwnerDataById($user['uid']);
+			if (empty($owner)) {
+				DI::logger()->warning('No owner data for user id', ['uri' => $uri, 'name' => $name, 'user' => $user]);
+				throw new \Friendica\Network\HTTPException\NotFoundException();
+			}
 
-		$alias = str_replace('/profile/', '/~', $owner['url']);
+			$alias = str_replace('/profile/', '/~', $owner['url']);
 
-		$avatar = Photo::selectFirst(['type'], ['uid' => $owner['uid'], 'profile' => true]);
+			$avatar = Photo::selectFirst(['type'], ['uid' => $owner['uid'], 'profile' => true]);
+		}
 
-		if (!DBA::isResult($avatar)) {
+		if (empty($avatar)) {
 			$avatar = ['type' => 'image/jpeg'];
 		}
 
 		if ($mode == 'xml') {
-			self::printXML($alias, $app->getBaseURL(), $user, $owner, $avatar);
+			self::printXML($alias, DI::baseUrl()->get(), $user, $owner, $avatar);
 		} else {
-			self::printJSON($alias, $app->getBaseURL(), $owner, $avatar);
+			self::printJSON($alias, DI::baseUrl()->get(), $owner, $avatar);
 		}
 	}
 
+	private static function printSystemJSON(array $owner)
+	{
+		$json = [
+			'subject' => 'acct:' . $owner['addr'],
+			'aliases' => [$owner['url']],
+			'links'   => [
+				[
+					'rel'  => 'http://webfinger.net/rel/profile-page',
+					'type' => 'text/html',
+					'href' => $owner['url'],
+				],
+				[
+					'rel'  => 'self',
+					'type' => 'application/activity+json',
+					'href' => $owner['url'],
+				],
+				[
+					'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
+					'template' => DI::baseUrl()->get() . '/follow?url={uri}',
+				],
+				[
+					'rel'  => ActivityNamespace::FEED,
+					'type' => 'application/atom+xml',
+					'href' => $owner['poll'] ?? DI::baseUrl()->get(),
+				],
+				[
+					'rel'  => 'salmon',
+					'href' => DI::baseUrl()->get() . '/salmon/' . $owner['nickname'],
+				],
+				[
+					'rel'  => 'http://microformats.org/profile/hcard',
+					'type' => 'text/html',
+					'href' => DI::baseUrl()->get() . '/hcard/' . $owner['nickname'],
+				],
+				[
+					'rel'  => 'http://joindiaspora.com/seed_location',
+					'type' => 'text/html',
+					'href' => DI::baseUrl()->get(),
+				],
+			]
+		];
+		header('Access-Control-Allow-Origin: *');
+		System::jsonExit($json, 'application/jrd+json; charset=utf-8');
+	}
+
 	private static function printJSON($alias, $baseURL, $owner, $avatar)
 	{
 		$salmon_key = Salmon::salmonKey($owner['spubkey']);
@@ -125,7 +200,7 @@ class Xrd extends BaseModule
 				[
 					'rel'  => 'http://webfinger.net/rel/avatar',
 					'type' => $avatar['type'],
-					'href' => $owner['photo'],
+					'href' => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
 				],
 				[
 					'rel'  => 'http://joindiaspora.com/seed_location',
@@ -181,7 +256,7 @@ class Xrd extends BaseModule
 			'$hcard_url'   => $baseURL . '/hcard/' . $owner['nickname'],
 			'$atom'        => $owner['poll'],
 			'$poco_url'    => $owner['poco'],
-			'$photo'       => $owner['photo'],
+			'$photo'       => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
 			'$type'        => $avatar['type'],
 			'$salmon'      => $baseURL . '/salmon/' . $owner['nickname'],
 			'$salmen'      => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',