Meaningful notification message

[friendica.git] / src / Module / Xrd.php

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index be6a3bf9c58519341a917f725d20f19258f91e7c..aa7e04ebcd8097b7e721889d94c4089feb81fa00 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,8 +25,8 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\ActivityNamespace;
@@ -40,16 +40,14 @@ class Xrd extends BaseModule
 {
        public static function rawContent(array $parameters = [])
        {
-               $app = DI::app();
-
                // @TODO: Replace with parameter from router
-               if ($app->argv[0] == 'xrd') {
+               if (DI::args()->getArgv()[0] == 'xrd') {
                        if (empty($_GET['uri'])) {
                                return;
                        }
 
                        $uri = urldecode(Strings::escapeTags(trim($_GET['uri'])));
-                       if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/jrd+json') {
+                       if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/jrd+json') !== false)  {
                                $mode = 'json';
                        } else {
                                $mode = 'xml';
@@ -60,7 +58,7 @@ class Xrd extends BaseModule
                        }
 
                        $uri = urldecode(Strings::escapeTags(trim($_GET['resource'])));
-                       if (($_SERVER['HTTP_ACCEPT'] ?? '') == 'application/xrd+xml') {
+                       if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/xrd+xml') !== false)  {
                                $mode = 'xml';
                        } else {
                                $mode = 'json';
@@ -132,6 +130,25 @@ class Xrd extends BaseModule
                                        '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: *');
@@ -142,9 +159,6 @@ class Xrd extends BaseModule
        {
                $salmon_key = Salmon::salmonKey($owner['spubkey']);
 
-               header('Access-Control-Allow-Origin: *');
-               header('Content-type: application/json; charset=utf-8');
-
                $json = [
                        'subject' => 'acct:' . $owner['addr'],
                        'aliases' => [
@@ -183,7 +197,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',
@@ -218,8 +232,8 @@ class Xrd extends BaseModule
                        ],
                ];
 
-               echo json_encode($json);
-               exit();
+               header('Access-Control-Allow-Origin: *');
+               System::jsonExit($json, 'application/jrd+json; charset=utf-8');
        }
 
        private static function printXML($alias, $baseURL, $user, $owner, $avatar)
@@ -239,7 +253,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',