Changes:

[friendica.git] / src / Module / Diaspora / Fetch.php

diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index 0efe641ba6828310a3494213bd25b5f2407d5504..649c640cab95a3d24cc8ded423135b5145db0f7f 100644 (file)
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -1,12 +1,34 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2024, 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\Diaspora;
 
 use Friendica\BaseModule;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\Strings;
@@ -17,37 +39,30 @@ use Friendica\Util\Strings;
  */
 class Fetch extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               $app = self::getApp();
-
-               // @TODO: Replace with parameter from router
-               if (($app->argc != 3) || (!in_array($app->argv[1], ["post", "status_message", "reshare"]))) {
+               if (empty($this->parameters['guid'])) {
                        throw new HTTPException\NotFoundException();
                }
 
-               // @TODO: Replace with parameter from router
-               $guid = $app->argv[2];
+               $guid = $this->parameters['guid'];
 
                // Fetch the item
-               $fields = [
-                       'uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'received', 'app', 'location', 'coord', 'network',
-                       'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'
-               ];
-               $condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
-               $item = Item::selectFirst($fields, $condition);
+               $condition = ['origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid,
+                       'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+               $item = Post::selectFirst([], $condition);
                if (empty($item)) {
                        $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
-                       $item = Item::selectFirst(['author-link'], $condition);
-                       if (empty($item)) {
+                       $item = Post::selectFirst(['author-link'], $condition);
+                       if (!empty($item["author-link"])) {
                                $parts = parse_url($item["author-link"]);
                                if (empty($parts["scheme"]) || empty($parts["host"])) {
                                        throw new HTTPException\InternalServerErrorException();
                                }
                                $host = $parts["scheme"] . "://" . $parts["host"];
 
-                               if (Strings::normaliseLink($host) != Strings::normaliseLink($app->getBaseURL())) {
-                                       $location = $host . "/fetch/" . $app->argv[1] . "/" . urlencode($guid);
+                               if (Strings::normaliseLink($host) != Strings::normaliseLink(DI::baseUrl())) {
+                                       $location = $host . "/fetch/" . DI::args()->getArgv()[1] . "/" . urlencode($guid);
                                        System::externalRedirect($location, 301);
                                }
                        }
@@ -61,13 +76,15 @@ class Fetch extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               $status = Diaspora::buildStatus($item, $user);
+               if ($item['gravity'] == Item::GRAVITY_PARENT) {
+                       $status = Diaspora::buildStatus($item, $user);
+               } else {
+                       $status = ['type' => 'comment', 'message' => Diaspora::createCommentSignature($item)];
+               }
+
                $xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
                // Send the envelope
-               header("Content-Type: application/magic-envelope+xml; charset=utf-8");
-               echo Diaspora::buildMagicEnvelope($xml, $user);
-
-               exit();
+               $this->httpExit(Diaspora::buildMagicEnvelope($xml, $user), Response::TYPE_XML, 'application/magic-envelope+xml');
        }
 }