]> git.mxchange.org Git - friendica.git/blobdiff - include/diaspora.php
Merge pull request #2685 from annando/1607-poller-information
[friendica.git] / include / diaspora.php
index 3a211302460a866f483ac5e26f4331f7e5acc455..bd4f8676378bb473b6960c84546ef6c1170e3aad 100644 (file)
@@ -2,11 +2,12 @@
 /**
  * @file include/diaspora.php
  * @brief The implementation of the diaspora protocol
+ *
+ * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html
+ * Currently this implementation here interprets the old and the new protocol and sends the old one.
+ * This will change in the future.
  */
 
-/// @todo reshare of some reshare doesn't work well, see guid c1d534b0ed19013358694860008dbc6c
-// 14f571c0f244013358694860008dbc6c
-
 require_once("include/items.php");
 require_once("include/bb2diaspora.php");
 require_once("include/Scrape.php");
@@ -103,6 +104,59 @@ class diaspora {
                return($signature);
        }
 
+       /**
+        * @brief verify the envelope and return the verified data
+        *
+        * @param string $envelope The magic envelope
+        *
+        * @return string verified data
+        */
+       private function verify_magic_envelope($envelope) {
+
+               $basedom = parse_xml_string($envelope, false);
+
+               if (!is_object($basedom)) {
+                       logger("Envelope is no XML file");
+                       return false;
+               }
+
+               $children = $basedom->children('http://salmon-protocol.org/ns/magic-env');
+
+               if (sizeof($children) == 0) {
+                       logger("XML has no children");
+                       return false;
+               }
+
+               $handle = "";
+
+               $data = base64url_decode($children->data);
+               $type = $children->data->attributes()->type[0];
+
+               $encoding = $children->encoding;
+
+               $alg = $children->alg;
+
+               $sig = base64url_decode($children->sig);
+               $key_id = $children->sig->attributes()->key_id[0];
+               if ($key_id != "")
+                       $handle = base64url_decode($key_id);
+
+               $b64url_data = base64url_encode($data);
+               $msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+
+               $signable_data = $msg.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
+
+               $key = self::key($handle);
+
+               $verify = rsa_verify($signable_data, $sig, $key);
+               if (!$verify) {
+                       logger('Message did not verify. Discarding.');
+                       return false;
+               }
+
+               return $data;
+       }
+
        /**
         * @brief: Decodes incoming Diaspora message
         *
@@ -236,7 +290,6 @@ class diaspora {
                return array('message' => (string)$inner_decrypted,
                                'author' => unxmlify($author_link),
                                'key' => (string)$key);
-
        }
 
 
@@ -363,8 +416,10 @@ class diaspora {
 
                $data = parse_xml_string($msg["message"], false);
 
-               if (!is_object($data))
+               if (!is_object($data)) {
+                       logger("No valid XML ".$msg["message"], LOGGER_DEBUG);
                        return false;
+               }
 
                $first_child = $data->getName();
 
@@ -381,6 +436,8 @@ class diaspora {
                $type = $element->getName();
                $orig_type = $type;
 
+               logger("Got message type ".$type.": ".$msg["message"], LOGGER_DATA);
+
                // All retractions are handled identically from now on.
                // In the new version there will only be "retraction".
                if (in_array($type, array("signed_retraction", "relayable_retraction")))
@@ -425,11 +482,11 @@ class diaspora {
                                }
                        }
 
-                       if ($fieldname == "author_signature")
+                       if (($fieldname == "author_signature") AND ($entry != ""))
                                $author_signature = base64_decode($entry);
-                       elseif ($fieldname == "parent_author_signature")
+                       elseif (($fieldname == "parent_author_signature") AND ($entry != ""))
                                $parent_author_signature = base64_decode($entry);
-                       elseif ($fieldname != "target_author_signature") {
+                       elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
                                if ($signed_data != "") {
                                        $signed_data .= ";";
                                        $signed_data_parent .= ";";
@@ -454,19 +511,27 @@ class diaspora {
                        return true;
 
                // No author_signature? This is a must, so we quit.
-               if (!isset($author_signature))
+               if (!isset($author_signature)) {
+                       logger("No author signature for type ".$type." - Message: ".$msg["message"], LOGGER_DEBUG);
                        return false;
+               }
 
                if (isset($parent_author_signature)) {
                        $key = self::key($msg["author"]);
 
-                       if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256"))
+                       if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
+                               logger("No valid parent author signature for author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
                                return false;
+                       }
                }
 
                $key = self::key($fields->author);
 
-               return rsa_verify($signed_data, $author_signature, $key, "sha256");
+               if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
+                       logger("No valid author signature for author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
+                       return false;
+               } else
+                       return true;
        }
 
        /**
@@ -509,6 +574,9 @@ class diaspora {
                        $d = strtotime($person["updated"]." +00:00");
                        if ($d < strtotime("now - 14 days"))
                                $update = true;
+
+                       if ($person["guid"] == "")
+                               $update = true;
                }
 
                if (!$person OR $update) {
@@ -542,6 +610,7 @@ class diaspora {
                                        `request` = '%s',
                                        `nick` = '%s',
                                        `addr` = '%s',
+                                       `guid` = '%s',
                                        `batch` = '%s',
                                        `notify` = '%s',
                                        `poll` = '%s',
@@ -555,6 +624,7 @@ class diaspora {
                                        dbesc($arr["request"]),
                                        dbesc($arr["nick"]),
                                        dbesc($arr["addr"]),
+                                       dbesc($arr["guid"]),
                                        dbesc($arr["batch"]),
                                        dbesc($arr["notify"]),
                                        dbesc($arr["poll"]),
@@ -566,15 +636,16 @@ class diaspora {
                                        dbesc($arr["network"])
                                );
                } else {
-                       $r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`,
+                       $r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
                                        `batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
-                               VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+                               VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                                        dbesc($arr["url"]),
                                        dbesc($arr["name"]),
                                        dbesc($arr["photo"]),
                                        dbesc($arr["request"]),
                                        dbesc($arr["nick"]),
                                        dbesc($arr["addr"]),
+                                       dbesc($arr["guid"]),
                                        dbesc($arr["batch"]),
                                        dbesc($arr["notify"]),
                                        dbesc($arr["poll"]),
@@ -809,11 +880,30 @@ class diaspora {
                if ($level > 5)
                        return false;
 
-               // This will work for Diaspora and newer Friendica servers
-               $source_url = $server."/p/".$guid.".xml";
-               $x = fetch_url($source_url);
-               if(!$x)
-                       return false;
+               // This will work for new Diaspora servers and Friendica servers from 3.5
+               $source_url = $server."/fetch/post/".$guid;
+               logger("Fetch post from ".$source_url, LOGGER_DEBUG);
+
+               $envelope = fetch_url($source_url);
+               if($envelope) {
+                       logger("Envelope was fetched.", LOGGER_DEBUG);
+                       $x = self::verify_magic_envelope($envelope);
+                       if (!$x)
+                               logger("Envelope could not be verified.", LOGGER_DEBUG);
+                       else
+                               logger("Envelope was verified.", LOGGER_DEBUG);
+               } else
+                       $x = false;
+
+               // This will work for older Diaspora and Friendica servers
+               if (!$x) {
+                       $source_url = $server."/p/".$guid.".xml";
+                       logger("Fetch post from ".$source_url, LOGGER_DEBUG);
+
+                       $x = fetch_url($source_url);
+                       if(!$x)
+                               return false;
+               }
 
                $source_xml = parse_xml_string($x, false);
 
@@ -822,9 +912,11 @@ class diaspora {
 
                if ($source_xml->post->reshare) {
                        // Reshare of a reshare - old Diaspora version
+                       logger("Message is a reshare", LOGGER_DEBUG);
                        return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
                } elseif ($source_xml->getName() == "reshare") {
                        // Reshare of a reshare - new Diaspora version
+                       logger("Message is a new reshare", LOGGER_DEBUG);
                        return self::message($source_xml->root_guid, $server, ++$level);
                }
 
@@ -837,8 +929,10 @@ class diaspora {
                        $author = (string)$source_xml->author;
 
                // If this isn't a "status_message" then quit
-               if (!$author)
+               if (!$author) {
+                       logger("Message doesn't seem to be a status message", LOGGER_DEBUG);
                        return false;
+               }
 
                $msg = array("message" => $x, "author" => $author);
 
@@ -984,6 +1078,23 @@ class diaspora {
                return true;
        }
 
+       /**
+        * @brief Fetch the uri from our database if we already have this item (maybe from ourselves)
+        *
+        * @param string $author Author handle
+        * @param string $guid Message guid
+        *
+        * @return string The constructed uri or the one from our database
+        */
+       private function get_uri_from_guid($author, $guid) {
+
+               $r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
+               if ($r)
+                       return $r[0]["uri"];
+               else
+                       return $author.":".$guid;
+       }
+
        /**
         * @brief Processes an incoming comment
         *
@@ -1000,6 +1111,11 @@ class diaspora {
                $text = unxmlify($data->text);
                $author = notags(unxmlify($data->author));
 
+               if (isset($data->created_at))
+                       $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+               else
+                       $created_at = datetime_convert();
+
                $contact = self::allowed_contact_by_handle($importer, $sender, true);
                if (!$contact)
                        return false;
@@ -1036,7 +1152,7 @@ class diaspora {
                $datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
 
                $datarray["guid"] = $guid;
-               $datarray["uri"] = $author.":".$guid;
+               $datarray["uri"] = self::get_uri_from_guid($author, $guid);
 
                $datarray["type"] = "remote-comment";
                $datarray["verb"] = ACTIVITY_POST;
@@ -1046,6 +1162,8 @@ class diaspora {
                $datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
                $datarray["object"] = $xml;
 
+               $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+
                $datarray["body"] = diaspora2bb($text);
 
                self::fetch_guid($datarray);
@@ -1242,7 +1360,7 @@ class diaspora {
                                intval($importer["uid"]),
                                dbesc($guid),
                                dbesc($author),
-                               dbesc(datetime_convert("UTC", "UTC", $created_at)),
+                               dbesc($created_at),
                                dbesc(datetime_convert()),
                                dbesc($subject),
                                dbesc($participants)
@@ -1373,7 +1491,7 @@ class diaspora {
                $datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
 
                $datarray["guid"] = $guid;
-               $datarray["uri"] = $author.":".$guid;
+               $datarray["uri"] = self::get_uri_from_guid($author, $guid);
 
                $datarray["type"] = "activity";
                $datarray["verb"] = $verb;
@@ -1739,10 +1857,26 @@ class diaspora {
                // That makes us friends.
                if ($contact) {
                        if ($following AND $sharing) {
+                               logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
                                self::receive_request_make_friend($importer, $contact);
+
+                               // refetch the contact array
+                               $contact = self::contact_by_handle($importer["uid"],$author);
+
+                               // If we are now friends, we are sending a share message.
+                               // Normally we needn't to do so, but the first message could have been vanished.
+                               if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
+                                       $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
+                                       if($u) {
+                                               logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
+                                               $ret = self::send_share($u[0], $contact);
+                                       }
+                               }
                                return true;
-                       } else /// @todo Handle all possible variations of adding and retracting of permissions
+                       } else { /// @todo Handle all possible variations of adding and retracting of permissions
+                               logger("Author ".$author." (Contact ".$contact["id"].") wants to change the relationship: Following: ".$following." - sharing: ".$sharing. "(By now unsupported)", LOGGER_DEBUG);
                                return false;
+                       }
                }
 
                if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
@@ -1751,6 +1885,12 @@ class diaspora {
                } elseif (!$following AND !$sharing) {
                        logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG);
                        return false;
+               } elseif (!$following AND $sharing) {
+                       logger("Author ".$author." wants to share with us.", LOGGER_DEBUG);
+               } elseif ($following AND $sharing) {
+                       logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG);
+               } elseif ($following AND !$sharing) {
+                       logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
                }
 
                $ret = self::person_by_handle($author);
@@ -1790,13 +1930,19 @@ class diaspora {
                        return;
                }
 
+               logger("Author ".$author." was added as contact number ".$contact_record["id"].".", LOGGER_DEBUG);
+
                $def_gid = get_default_group($importer['uid'], $ret["network"]);
 
                if(intval($def_gid))
                        group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
 
+               update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
+
                if($importer["page-flags"] == PAGE_NORMAL) {
 
+                       logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
+
                        $hash = random_string().(string)time();   // Generate a confirm_key
 
                        $ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
@@ -1813,6 +1959,8 @@ class diaspora {
 
                        // automatic friend approval
 
+                       logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
+
                        update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
 
                        // technically they are sharing with us (CONTACT_IS_SHARING),
@@ -1841,8 +1989,13 @@ class diaspora {
                        );
 
                        $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-                       if($u)
+                       if($u) {
+                               logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
                                $ret = self::send_share($u[0], $contact_record);
+
+                               // Send the profile data, maybe it weren't transmitted before
+                               self::send_profile($importer["uid"], array($contact_record));
+                       }
                }
 
                return true;
@@ -1886,35 +2039,28 @@ class diaspora {
 
                if (!$r) {
                        $server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
-                       logger("1st try: reshared message ".$guid." will be fetched from original server: ".$server);
+                       logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
                        $item_id = self::store_by_guid($guid, $server);
 
                        if (!$item_id) {
                                $server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
-                               logger("2nd try: reshared message ".$guid." will be fetched from original server: ".$server);
+                               logger("2nd try: reshared message ".$guid." will be fetched without SLL from the server ".$server);
                                $item_id = self::store_by_guid($guid, $server);
                        }
 
-                       // Deactivated by now since there is a risk that someone could manipulate postings through this method
-/*                     if (!$item_id) {
-                               $server = "https://".substr($author, strpos($author, "@") + 1);
-                               logger("3rd try: reshared message ".$guid." will be fetched from sharer's server: ".$server);
-                               $item_id = self::store_by_guid($guid, $server);
-                       }
-                       if (!$item_id) {
-                               $server = "http://".substr($author, strpos($author, "@") + 1);
-                               logger("4th try: reshared message ".$guid." will be fetched from sharer's server: ".$server);
-                               $item_id = self::store_by_guid($guid, $server);
-                       }
-*/
                        if ($item_id) {
                                $r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
                                                `author-name`, `author-link`, `author-avatar`
                                        FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
                                        intval($item_id));
 
-                               if ($r)
+                               if ($r) {
+                                       // If it is a reshared post from another network then reformat to avoid display problems with two share elements
+                                       if (self::is_reshare($r[0]["body"], false))
+                                               $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+
                                        return $r[0];
+                               }
 
                        }
                }
@@ -1936,7 +2082,7 @@ class diaspora {
                $guid = notags(unxmlify($data->guid));
                $author = notags(unxmlify($data->author));
                $public = notags(unxmlify($data->public));
-               $created_at = notags(unxmlify($data->created_at));
+               $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
 
                $contact = self::allowed_contact_by_handle($importer, $author, false);
                if (!$contact)
@@ -1967,7 +2113,7 @@ class diaspora {
                $datarray["owner-avatar"] = $datarray["author-avatar"];
 
                $datarray["guid"] = $guid;
-               $datarray["uri"] = $datarray["parent-uri"] = $author.":".$guid;
+               $datarray["uri"] = $datarray["parent-uri"] = self::get_uri_from_guid($author, $guid);
 
                $datarray["verb"] = ACTIVITY_POST;
                $datarray["gravity"] = GRAVITY_PARENT;
@@ -1983,7 +2129,7 @@ class diaspora {
 
                $datarray["plink"] = self::plink($author, $guid);
                $datarray["private"] = (($public == "false") ? 1 : 0);
-               $datarray["changed"] = $datarray["created"] = $datarray["edited"] = datetime_convert("UTC", "UTC", $created_at);
+               $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
                $datarray["object-type"] = $original_item["object-type"];
 
@@ -2023,12 +2169,6 @@ class diaspora {
                if (!$r)
                        return false;
 
-               // Only delete it if the author really fits
-               if (!link_compare($r[0]["author-link"], $person["url"])) {
-                       logger("Item author ".$r[0]["author-link"]." doesn't fit to expected contact ".$person["url"], LOGGER_DEBUG);
-                       return false;
-               }
-
                // Check if the sender is the thread owner
                $p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
                        intval($r[0]["parent"]));
@@ -2110,12 +2250,11 @@ class diaspora {
         * @return int The message id of the newly created item
         */
        private function receive_status_message($importer, $data, $xml) {
-
                $raw_message = unxmlify($data->raw_message);
                $guid = notags(unxmlify($data->guid));
                $author = notags(unxmlify($data->author));
                $public = notags(unxmlify($data->public));
-               $created_at = notags(unxmlify($data->created_at));
+               $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
                $provider_display_name = notags(unxmlify($data->provider_display_name));
 
                /// @todo enable support for polls
@@ -2169,7 +2308,7 @@ class diaspora {
                $datarray["owner-avatar"] = $datarray["author-avatar"];
 
                $datarray["guid"] = $guid;
-               $datarray["uri"] = $datarray["parent-uri"] = $author.":".$guid;
+               $datarray["uri"] = $datarray["parent-uri"] = self::get_uri_from_guid($author, $guid);
 
                $datarray["verb"] = ACTIVITY_POST;
                $datarray["gravity"] = GRAVITY_PARENT;
@@ -2183,7 +2322,7 @@ class diaspora {
 
                $datarray["plink"] = self::plink($author, $guid);
                $datarray["private"] = (($public == "false") ? 1 : 0);
-               $datarray["changed"] = $datarray["created"] = $datarray["edited"] = datetime_convert("UTC", "UTC", $created_at);
+               $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
                if (isset($address["address"]))
                        $datarray["location"] = $address["address"];
@@ -2225,6 +2364,40 @@ class diaspora {
                return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
        }
 
+       /**
+        * @brief Creates the envelope for the "fetch" endpoint
+        *
+        * @param string $msg The message that is to be transmitted
+        * @param array $user The record of the sender
+        *
+        * @return string The envelope
+        */
+
+       public static function build_magic_envelope($msg, $user) {
+
+               $b64url_data = base64url_encode($msg);
+               $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+
+               $key_id = base64url_encode(diaspora::my_handle($user));
+               $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");
+
+               return xml::from_array($xmldata, $xml, false, $namespaces);
+       }
+
        /**
         * @brief Creates the envelope for a public message
         *
@@ -2256,11 +2429,11 @@ class diaspora {
                $sig = base64url_encode($signature);
 
                $xmldata = array("diaspora" => array("header" => array("author_id" => $handle),
-                                               "me:env" => array("me:encoding" => "base64url",
-                                                               "me:alg" => "RSA-SHA256",
-                                                               "me:data" => $data,
-                                                               "@attributes" => array("type" => "application/xml"),
-                                                               "me:sig" => $sig)));
+                                                       "me:env" => array("me:encoding" => $encoding,
+                                                       "me:alg" => $alg,
+                                                       "me:data" => $data,
+                                                       "@attributes" => array("type" => $type),
+                                                       "me:sig" => $sig)));
 
                $namespaces = array("" => "https://joindiaspora.com/protocol",
                                "me" => "http://salmon-protocol.org/ns/magic-env");
@@ -2346,10 +2519,10 @@ class diaspora {
                $cipher_json = base64_encode($encrypted_header_json_object);
 
                $xmldata = array("diaspora" => array("encrypted_header" => $cipher_json,
-                                               "me:env" => array("me:encoding" => "base64url",
-                                                               "me:alg" => "RSA-SHA256",
+                                               "me:env" => array("me:encoding" => $encoding,
+                                                               "me:alg" => $alg,
                                                                "me:data" => $data,
-                                                               "@attributes" => array("type" => "application/xml"),
+                                                               "@attributes" => array("type" => $type),
                                                                "me:sig" => $sig)));
 
                $namespaces = array("" => "https://joindiaspora.com/protocol",
@@ -2467,6 +2640,20 @@ class diaspora {
        }
 
 
+       /**
+        * @brief Build the post xml
+        *
+        * @param string $type The message type
+        * @param array $message The message data
+        *
+        * @return string The post XML
+        */
+       public static function build_post_xml($type, $message) {
+
+               $data = array("XML" => array("post" => array($type => $message)));
+               return xml::from_array($data, $xml);
+       }
+
        /**
         * @brief Builds and transmit messages
         *
@@ -2482,13 +2669,15 @@ class diaspora {
         */
        private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
 
-               $data = array("XML" => array("post" => array($type => $message)));
-
-               $msg = xml::from_array($data, $xml);
+               $msg = self::build_post_xml($type, $message);
 
                logger('message: '.$msg, LOGGER_DATA);
                logger('send guid '.$guid, LOGGER_DEBUG);
 
+               // Fallback if the private key wasn't transmitted in the expected field
+               if ($owner['uprvkey'] == "")
+                       $owner['uprvkey'] = $owner['prvkey'];
+
                $slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
 
                if ($spool) {
@@ -2515,6 +2704,8 @@ class diaspora {
                $message = array("sender_handle" => self::my_handle($owner),
                                "recipient_handle" => $contact["addr"]);
 
+               logger("Send share ".print_r($message, true), LOGGER_DEBUG);
+
                return self::build_and_transmit($owner, $contact, "request", $message);
        }
 
@@ -2532,6 +2723,8 @@ class diaspora {
                                "diaspora_handle" => self::my_handle($owner),
                                "type" => "Person");
 
+               logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
+
                return self::build_and_transmit($owner, $contact, "retraction", $message);
        }
 
@@ -2548,7 +2741,7 @@ class diaspora {
 
                // Skip if it isn't a pure repeated messages
                // Does it start with a share?
-               if (strpos($body, "[share") > 0)
+               if ((strpos($body, "[share") > 0) AND $complete)
                        return(false);
 
                // Does it end with a share?
@@ -2616,16 +2809,16 @@ class diaspora {
        }
 
        /**
-        * @brief Sends a post
+        * @brief Create a post (status message or reshare)
         *
         * @param array $item The item that will be exported
         * @param array $owner the array of the item owner
-        * @param array $contact Target of the communication
-        * @param bool $public_batch Is it a public post?
         *
-        * @return int The result of the transmission
+        * @return array
+        * 'type' -> Message type ("status_message" or "reshare")
+        * 'message' -> Array of XML elements of the status
         */
-       public static function send_status($item, $owner, $contact, $public_batch = false) {
+       public static function build_status($item, $owner) {
 
                $myaddr = self::my_handle($owner);
 
@@ -2688,8 +2881,24 @@ class diaspora {
 
                        $type = "status_message";
                }
+               return array("type" => $type, "message" => $message);
+       }
 
-               return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+       /**
+        * @brief Sends a post
+        *
+        * @param array $item The item that will be exported
+        * @param array $owner the array of the item owner
+        * @param array $contact Target of the communication
+        * @param bool $public_batch Is it a public post?
+        *
+        * @return int The result of the transmission
+        */
+       public static function send_status($item, $owner, $contact, $public_batch = false) {
+
+               $status = diaspora::build_status($item, $owner);
+
+               return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
        }
 
        /**
@@ -3002,17 +3211,18 @@ class diaspora {
         *
         * @param int $uid The user id
         */
-       public static function send_profile($uid) {
+       public static function send_profile($uid, $recips = false) {
 
                if (!$uid)
                        return;
 
-               $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d",
-                       dbesc(NETWORK_DIASPORA),
-                       intval($uid),
-                       intval(CONTACT_IS_SHARING)
-               );
+               if (!$recips)
+                       $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+                               AND `uid` = %d AND `rel` != %d",
+                               dbesc(NETWORK_DIASPORA),
+                               intval($uid),
+                               intval(CONTACT_IS_SHARING)
+                       );
                if (!$recips)
                        return;
 
@@ -3076,8 +3286,10 @@ class diaspora {
                                "searchable" => $searchable,
                                "tag_string" => $tags);
 
-               foreach($recips as $recip)
+               foreach($recips as $recip) {
+                       logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
                        self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
+               }
        }
 
        /**