Merge pull request #2986 from annando/1612-spool

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index 457fc86a6d071e5504a2ed7c7e02c762d37c9937..1c73ad37185234328952834fa042bc0f237a8aa3 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -2,7 +2,9 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
+require_once("include/crypto.php");
 require_once("include/diaspora.php");
+require_once("include/xml.php");
 
 function fetch_init($a){
 
@@ -13,76 +15,47 @@ function fetch_init($a){
 
        $guid = $a->argv[2];
 
-       $item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`
-                       FROM `item` WHERE `wall` AND NOT `private`  AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+       // Fetch the item
+       $item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
+                       FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
                dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
        if (!$item) {
+               $r = q("SELECT `author-link`
+                       FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+                       dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+               if ($r) {
+                       $parts = parse_url($r[0]["author-link"]);
+                       $host = $parts["scheme"]."://".$parts["host"];
+
+                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                               $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
+
+                               header("HTTP/1.1 301 Moved Permanently");
+                               header("Location:".$location);
+                               killme();
+                       }
+               }
+
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
-       $post = array();
-
-       $reshared = diaspora::is_reshare($item[0]["body"]);
-
-       if ($reshared) {
-               $nodename = "reshare";
-               $post["root_diaspora_id"] = $reshared["root_handle"];
-               $post["root_guid"] = $reshared["root_guid"];
-               $post["guid"] = $item[0]["guid"];
-               $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-               $post["public"] = (!$item[0]["private"] ? 'true':'false');
-               $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-       } else {
-               $body = bb2diaspora($item[0]["body"]);
-
-               if(strlen($item[0]["title"]))
-                       $body = "## ".html_entity_decode($item[0]["title"])."\n\n".$body;
-
-               $nodename = "status_message";
-               $post["raw_message"] = str_replace("&", "&", $body);
-               $post["location"] = $item[0]["location"];
-               $post["guid"] = $item[0]["guid"];
-               $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-               $post["public"] = (!$item[0]["private"] ? 'true':'false');
-               $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-               $post["provider_display_name"] = $item[0]["app"];
-       }
 
-       $data = array("XML" => array("post" => array($nodename => $post)));
-       $xml = xml::from_array($data, $xmlobj);
-
-       $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d", intval($item[0]["uid"]));
+       // Fetch some data from the author (We could combine both queries - but I think this is more readable)
+       $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
+               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+               WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
        if (!$r) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
-
        $user = $r[0];
 
-       $key_id = "";
-
-       $b64url_data = base64url_encode($xml);
-       $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
-
-       $type = "application/xml";
-       $encoding = "base64url";
-       $alg = "RSA-SHA256";
-       $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
-       $signature = rsa_sign($signable_data, $user["prvkey"]);
-       $sig = base64url_encode($signature);
-
-       $xmldata = array("me:env" => array("me:data" => $data,
-                                                       "@attributes" => array("type" => $type),
-                                                       "me:encoding" => $encoding,
-                                                       "me:alg" => $alg,
-                                                       "me:sig" => $sig,
-                                                       "@attributes2" => array("key_id" => $key_id)));
-
-       $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
+       $status = diaspora::build_status($item[0], $user);
+       $xml = diaspora::build_post_xml($status["type"], $status["message"]);
 
-       $envelope = xml::from_array($xmldata, $xml, false, $namespaces);
-       header("Content-Type: application/xml; charset=utf-8");
-       echo $envelope;
+       // Send the envelope
+       header("Content-Type: application/magic-envelope+xml; charset=utf-8");
+       echo diaspora::build_magic_envelope($xml, $user);
 
        killme();
 }