X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fdiaspora.php;h=545edcc4bf11a848726589823fc66906d030850a;hb=81c87885cf61247608a0fa8e738707510e737ace;hp=f2d48486788bf68145cd3dcbb22b07395b4d91f5;hpb=d489ba1510a2dcfaa7851d937d3c37a9541544c9;p=friendica.git
diff --git a/include/diaspora.php b/include/diaspora.php
index f2d4848678..545edcc4bf 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -8,22 +8,26 @@
* This will change in the future.
*/
-require_once("include/items.php");
-require_once("include/bb2diaspora.php");
-require_once("include/Scrape.php");
-require_once("include/Contact.php");
-require_once("include/Photo.php");
-require_once("include/socgraph.php");
-require_once("include/group.php");
-require_once("include/xml.php");
-require_once("include/datetime.php");
-require_once("include/queue_fn.php");
+use Friendica\App;
+use Friendica\Core\Config;
+
+require_once 'include/items.php';
+require_once 'include/bb2diaspora.php';
+require_once 'include/probe.php';
+require_once 'include/Contact.php';
+require_once 'include/Photo.php';
+require_once 'include/socgraph.php';
+require_once 'include/group.php';
+require_once 'include/xml.php';
+require_once 'include/datetime.php';
+require_once 'include/queue_fn.php';
+require_once 'include/cache.php';
/**
* @brief This class contain functions to create and send Diaspora XML files
*
*/
-class diaspora {
+class Diaspora {
/**
* @brief Return a list of relay servers
@@ -42,15 +46,15 @@ class diaspora {
$servers = explode(",", $serverdata);
- foreach($servers AS $server) {
+ foreach ($servers AS $server) {
$server = trim($server);
+ $addr = "relay@".str_replace("http://", "", normalise_link($server));
$batch = $server."/receive/public";
- $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+ $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
+ dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
if (!$relais) {
- $addr = "relay@".str_replace("http://", "", normalise_link($server));
-
$r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
datetime_convert(),
@@ -87,7 +91,7 @@ class diaspora {
*
* @return string the repaired signature
*/
- private function repair_signature($signature, $handle = "", $level = 1) {
+ private static function repair_signature($signature, $handle = "", $level = 1) {
if ($signature == "")
return ($signature);
@@ -111,7 +115,7 @@ class diaspora {
*
* @return string verified data
*/
- private function verify_magic_envelope($envelope) {
+ private static function verify_magic_envelope($envelope) {
$basedom = parse_xml_string($envelope, false);
@@ -158,7 +162,106 @@ class diaspora {
}
/**
- * @brief: Decodes incoming Diaspora message
+ * @brief encrypts data via AES
+ *
+ * @param string $key The AES key
+ * @param string $iv The IV (is used for CBC encoding)
+ * @param string $data The data that is to be encrypted
+ *
+ * @return string encrypted data
+ */
+ private static function aes_encrypt($key, $iv, $data) {
+ return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+ }
+
+ /**
+ * @brief decrypts data via AES
+ *
+ * @param string $key The AES key
+ * @param string $iv The IV (is used for CBC encoding)
+ * @param string $encrypted The encrypted data
+ *
+ * @return string decrypted data
+ */
+ private static function aes_decrypt($key, $iv, $encrypted) {
+ return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
+ }
+
+ /**
+ * @brief: Decodes incoming Diaspora message in the new format
+ *
+ * @param array $importer Array of the importer user
+ * @param string $raw raw post message
+ *
+ * @return array
+ * 'message' -> decoded Diaspora XML message
+ * 'author' -> author diaspora handle
+ * 'key' -> author public key (converted to pkcs#8)
+ */
+ public static function decode_raw($importer, $raw) {
+ $data = json_decode($raw);
+
+ // Is it a private post? Then decrypt the outer Salmon
+ if (is_object($data)) {
+ $encrypted_aes_key_bundle = base64_decode($data->aes_key);
+ $ciphertext = base64_decode($data->encrypted_magic_envelope);
+
+ $outer_key_bundle = '';
+ @openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
+ $j_outer_key_bundle = json_decode($outer_key_bundle);
+
+ if (!is_object($j_outer_key_bundle)) {
+ logger('Outer Salmon did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ $outer_iv = base64_decode($j_outer_key_bundle->iv);
+ $outer_key = base64_decode($j_outer_key_bundle->key);
+
+ $xml = diaspora::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+ } else {
+ $xml = $raw;
+ }
+
+ $basedom = parse_xml_string($xml);
+
+ if (!is_object($basedom)) {
+ logger('Received data does not seem to be an XML. Discarding.');
+ http_status_exit(400);
+ }
+
+ $base = $basedom->children(NAMESPACE_SALMON_ME);
+
+ // Not sure if this cleaning is needed
+ $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+
+ // Build the signed data
+ $type = $base->data[0]->attributes()->type[0];
+ $encoding = $base->encoding;
+ $alg = $base->alg;
+ $signed_data = $data.'.'.base64url_encode($type).'.'.base64url_encode($encoding).'.'.base64url_encode($alg);
+
+ // This is the signature
+ $signature = base64url_decode($base->sig);
+
+ // Get the senders' public key
+ $key_id = $base->sig[0]->attributes()->key_id[0];
+ $author_addr = base64_decode($key_id);
+ $key = diaspora::key($author_addr);
+
+ $verify = rsa_verify($signed_data, $signature, $key);
+ if (!$verify) {
+ logger('Message did not verify. Discarding.');
+ http_status_exit(400);
+ }
+
+ return array('message' => (string)base64url_decode($base->data),
+ 'author' => unxmlify($author_addr),
+ 'key' => (string)$key);
+ }
+
+ /**
+ * @brief: Decodes incoming Diaspora message in the deprecated format
*
* @param array $importer Array of the importer user
* @param string $xml urldecoded Diaspora salmon
@@ -173,12 +276,13 @@ class diaspora {
$public = false;
$basedom = parse_xml_string($xml);
- if (!is_object($basedom))
+ if (!is_object($basedom)) {
+ logger("XML is not parseable.");
return false;
-
+ }
$children = $basedom->children('https://joindiaspora.com/protocol');
- if($children->header) {
+ if ($children->header) {
$public = true;
$author_link = str_replace('acct:','',$children->header->author_id);
} else {
@@ -196,10 +300,7 @@ class diaspora {
$outer_iv = base64_decode($j_outer_key_bundle->iv);
$outer_key = base64_decode($j_outer_key_bundle->key);
- $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $outer_key, $ciphertext, MCRYPT_MODE_CBC, $outer_iv);
-
-
- $decrypted = pkcs5_unpad($decrypted);
+ $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
logger('decrypted: '.$decrypted, LOGGER_DEBUG);
$idom = parse_xml_string($decrypted,false);
@@ -214,11 +315,11 @@ class diaspora {
// figure out where in the DOM tree our data is hiding
- if($dom->provenance->data)
+ if ($dom->provenance->data)
$base = $dom->provenance;
- elseif($dom->env->data)
+ elseif ($dom->env->data)
$base = $dom->env;
- elseif($dom->data)
+ elseif ($dom->data)
$base = $dom;
if (!$base) {
@@ -251,15 +352,14 @@ class diaspora {
$data = base64url_decode($data);
- if($public)
+ if ($public)
$inner_decrypted = $data;
else {
// Decode the encrypted blob
$inner_encrypted = base64_decode($data);
- $inner_decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $inner_encrypted, MCRYPT_MODE_CBC, $inner_iv);
- $inner_decrypted = pkcs5_unpad($inner_decrypted);
+ $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
}
if (!$author_link) {
@@ -308,9 +408,23 @@ class diaspora {
return false;
}
- // Use a dummy importer to import the data for the public copy
- $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
- $message_id = self::dispatch($importer,$msg);
+ if (!($postdata = self::valid_posting($msg))) {
+ logger("Invalid posting");
+ return false;
+ }
+
+ $fields = $postdata['fields'];
+
+ // Is it a an action (comment, like, ...) for our own post?
+ if (isset($fields->parent_guid) AND !$postdata["relayed"]) {
+ $guid = notags(unxmlify($fields->parent_guid));
+ $importer = self::importer_for_guid($guid);
+ if (is_array($importer)) {
+ logger("delivering to origin: ".$importer["name"]);
+ $message_id = self::dispatch($importer, $msg, $fields);
+ return $message_id;
+ }
+ }
// Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
@@ -319,13 +433,19 @@ class diaspora {
dbesc(NETWORK_DIASPORA),
dbesc($msg["author"])
);
- if($r) {
- foreach($r as $rr) {
+
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
logger("delivering to: ".$rr["username"]);
- self::dispatch($rr,$msg);
+ self::dispatch($rr, $msg, $fields);
}
- } else
- logger("No subscribers for ".$msg["author"]." ".print_r($msg, true));
+ } elseif (!Config::get('system', 'relay_subscribe', false)) {
+ logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
+ } else {
+ // Use a dummy importer to import the data for the public copy
+ $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+ $message_id = self::dispatch($importer, $msg, $fields);
+ }
return $message_id;
}
@@ -335,18 +455,23 @@ class diaspora {
*
* @param array $importer Array of the importer user
* @param array $msg The post that will be dispatched
+ * @param object $fields SimpleXML object that contains the message
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
- public static function dispatch($importer, $msg) {
+ public static function dispatch($importer, $msg, $fields = null) {
// The sender is the handle of the contact that sent the message.
// This will often be different with relayed messages (for example "like" and "comment")
$sender = $msg["author"];
- if (!diaspora::valid_posting($msg, $fields)) {
- logger("Invalid posting");
- return false;
+ // This is only needed for private postings since this is already done for public ones before
+ if (is_null($fields)) {
+ if (!($postdata = self::valid_posting($msg))) {
+ logger("Invalid posting");
+ return false;
+ }
+ $fields = $postdata['fields'];
}
$type = $fields->getName();
@@ -408,11 +533,10 @@ class diaspora {
* It also does the conversion between the old and the new diaspora format.
*
* @param array $msg Array with the XML, the sender handle and the sender signature
- * @param object $fields SimpleXML object that contains the posting when it is valid
*
- * @return bool Is the posting valid?
+ * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
*/
- private function valid_posting($msg, &$fields) {
+ private static function valid_posting($msg) {
$data = parse_xml_string($msg["message"], false);
@@ -453,32 +577,38 @@ class diaspora {
foreach ($element->children() AS $fieldname => $entry) {
if ($oldXML) {
// Translation for the old XML structure
- if ($fieldname == "diaspora_handle")
+ if ($fieldname == "diaspora_handle") {
$fieldname = "author";
-
- if ($fieldname == "participant_handles")
+ }
+ if ($fieldname == "participant_handles") {
$fieldname = "participants";
-
+ }
if (in_array($type, array("like", "participation"))) {
- if ($fieldname == "target_type")
+ if ($fieldname == "target_type") {
$fieldname = "parent_type";
+ }
}
-
- if ($fieldname == "sender_handle")
+ if ($fieldname == "sender_handle") {
$fieldname = "author";
-
- if ($fieldname == "recipient_handle")
+ }
+ if ($fieldname == "recipient_handle") {
$fieldname = "recipient";
-
- if ($fieldname == "root_diaspora_id")
+ }
+ if ($fieldname == "root_diaspora_id") {
$fieldname = "root_author";
-
+ }
+ if ($type == "status_message") {
+ if ($fieldname == "raw_message") {
+ $fieldname = "text";
+ }
+ }
if ($type == "retraction") {
- if ($fieldname == "post_guid")
+ if ($fieldname == "post_guid") {
$fieldname = "target_guid";
-
- if ($fieldname == "type")
+ }
+ if ($fieldname == "type") {
$fieldname = "target_type";
+ }
}
}
@@ -507,9 +637,9 @@ class diaspora {
}
// Only some message types have signatures. So we quit here for the other types.
- if (!in_array($type, array("comment", "message", "like")))
- return true;
-
+ if (!in_array($type, array("comment", "like"))) {
+ return array("fields" => $fields, "relayed" => false);
+ }
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
logger("No author signature for type ".$type." - Message: ".$msg["message"], LOGGER_DEBUG);
@@ -517,21 +647,26 @@ class diaspora {
}
if (isset($parent_author_signature)) {
+ $relayed = true;
+
$key = self::key($msg["author"]);
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);
+ logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
return false;
}
+ } else {
+ $relayed = false;
}
$key = self::key($fields->author);
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);
+ logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
return false;
- } else
- return true;
+ } else {
+ return array("fields" => $fields, "relayed" => $relayed);
+ }
}
/**
@@ -541,13 +676,13 @@ class diaspora {
*
* @return string The public key
*/
- private function key($handle) {
+ private static function key($handle) {
$handle = strval($handle);
logger("Fetching diaspora key for: ".$handle);
$r = self::person_by_handle($handle);
- if($r)
+ if ($r)
return $r["pubkey"];
return "";
@@ -560,7 +695,7 @@ class diaspora {
*
* @return array the queried data
*/
- private function person_by_handle($handle) {
+ public static function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
@@ -601,9 +736,9 @@ class diaspora {
*
* @return string The id of the fcontact entry
*/
- private function add_fcontact($arr, $update = false) {
+ private static function add_fcontact($arr, $update = false) {
- if($update) {
+ if ($update) {
$r = q("UPDATE `fcontact` SET
`name` = '%s',
`photo` = '%s',
@@ -669,27 +804,30 @@ class diaspora {
* @return string the handle
*/
public static function handle_from_contact($contact_id, $gcontact_id = 0) {
- $handle = False;
+ $handle = false;
logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
if ($gcontact_id != 0) {
$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
intval($gcontact_id));
- if ($r)
+
+ if (dbm::is_result($r)) {
return strtolower($r[0]["addr"]);
+ }
}
$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
intval($contact_id));
- if ($r) {
+
+ if (dbm::is_result($r)) {
$contact = $r[0];
logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
- if($contact['addr'] != "")
+ if ($contact['addr'] != "") {
$handle = $contact['addr'];
- else {
+ } else {
$baseurl_start = strpos($contact['url'],'://') + 3;
$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
@@ -700,6 +838,29 @@ class diaspora {
return strtolower($handle);
}
+ /**
+ * @brief get a url (scheme://domain.tld/u/user) from a given Diaspora*
+ * fcontact guid
+ *
+ * @param mixed $fcontact_guid Hexadecimal string guid
+ *
+ * @return string the contact url or null
+ */
+ public static function url_from_contact_guid($fcontact_guid) {
+ logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
+
+ $r = q("SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
+ dbesc(NETWORK_DIASPORA),
+ dbesc($fcontact_guid)
+ );
+
+ if (dbm::is_result($r)) {
+ return $r[0]['url'];
+ }
+
+ return null;
+ }
+
/**
* @brief Get a contact id for a given handle
*
@@ -708,14 +869,29 @@ class diaspora {
*
* @return The contact id
*/
- private function contact_by_handle($uid, $handle) {
+ private static function contact_by_handle($uid, $handle) {
+
+ // First do a direct search on the contact table
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
intval($uid),
dbesc($handle)
);
- if ($r)
+ if (dbm::is_result($r)) {
return $r[0];
+ } else {
+ // We haven't found it?
+ // We use another function for it that will possibly create a contact entry
+ $cid = get_contact($handle, $uid);
+
+ if ($cid > 0) {
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
+
+ if (dbm::is_result($r)) {
+ return $r[0];
+ }
+ }
+ }
$handle_parts = explode("@", $handle);
$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
@@ -724,9 +900,11 @@ class diaspora {
intval($uid),
dbesc($nurl_sql)
);
- if($r)
+ if (dbm::is_result($r)) {
return $r[0];
+ }
+ logger("Haven't found contact for user ".$uid." and handle ".$handle, LOGGER_DEBUG);
return false;
}
@@ -739,12 +917,12 @@ class diaspora {
*
* @return bool is the contact allowed to post?
*/
- private function post_allow($importer, $contact, $is_comment = false) {
+ private static function post_allow($importer, $contact, $is_comment = false) {
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
// Normally this should have handled by getting a request - but this could get lost
- if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+ if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
intval(CONTACT_IS_FRIEND),
intval($contact["id"]),
@@ -754,17 +932,20 @@ class diaspora {
logger("defining user ".$contact["nick"]." as friend");
}
- if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"]))
+ // We don't seem to like that person
+ if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
return false;
- if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND)
+ // We are following this person? Then it is okay
+ } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
return true;
- if($contact["rel"] == CONTACT_IS_FOLLOWER)
- if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment)
- return true;
-
- // Messages for the global users are always accepted
- if ($importer["uid"] == 0)
+ // Is it a post to a community? That's good
+ } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+ return true;
+ }
+ // Messages for the global users and comments are always accepted
+ if (($importer["uid"] == 0) || $is_comment) {
return true;
+ }
return false;
}
@@ -778,11 +959,16 @@ class diaspora {
*
* @return array The contact data
*/
- private function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
+ private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
$contact = self::contact_by_handle($importer["uid"], $handle);
if (!$contact) {
logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
- return false;
+ // If a contact isn't found, we accept it anyway if it is a comment
+ if ($is_comment) {
+ return $importer;
+ } else {
+ return false;
+ }
}
if (!self::post_allow($importer, $contact, $is_comment)) {
@@ -800,13 +986,13 @@ class diaspora {
*
* @return int|bool message id if the message already was stored into the system - or false.
*/
- private function message_exists($uid, $guid) {
+ private static function message_exists($uid, $guid) {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid),
dbesc($guid)
);
- if($r) {
+ if (dbm::is_result($r)) {
logger("message ".$guid." already exists for user ".$uid);
return $r[0]["id"];
}
@@ -819,20 +1005,52 @@ class diaspora {
*
* @param array $item The item array
*/
- private function fetch_guid($item) {
+ private static function fetch_guid($item) {
preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item){
return(self::fetch_guid_sub($match, $item));
},$item["body"]);
}
+ /**
+ * @brief Checks for relative /people/* links in an item body to match local
+ * contacts or prepends the remote host taken from the author link.
+ *
+ * @param string $body The item body to replace links from
+ * @param string $author_link The author link for missing local contact fallback
+ *
+ * @return the replaced string
+ */
+ public function replace_people_guid($body, $author_link) {
+ $return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
+ function ($match) use ($author_link) {
+ // $match
+ // 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
+ // 1 => '0123456789abcdef'
+ // 2 => 'Foo Bar'
+ $handle = self::url_from_contact_guid($match[1]);
+
+ if ($handle) {
+ $return = '@[url='.$handle.']'.$match[2].'[/url]';
+ } else {
+ // No local match, restoring absolute remote URL from author scheme and host
+ $author_url = parse_url($author_link);
+ $return = '[url='.$author_url['scheme'].'://'.$author_url['host'].'/people/'.$match[1].']'.$match[2].'[/url]';
+ }
+
+ return $return;
+ }, $body);
+
+ return $return;
+ }
+
/**
* @brief sub function of "fetch_guid" which checks for links in messages
*
* @param array $match array containing a link that has to be checked for a message link
* @param array $item The item array
*/
- private function fetch_guid_sub($match, $item) {
+ private static function fetch_guid_sub($match, $item) {
if (!self::store_by_guid($match[1], $item["author-link"]))
self::store_by_guid($match[1], $item["owner-link"]);
}
@@ -846,7 +1064,7 @@ class diaspora {
*
* @return int the message id of the stored message or false
*/
- private function store_by_guid($guid, $server, $uid = 0) {
+ private static function store_by_guid($guid, $server, $uid = 0) {
$serverparts = parse_url($server);
$server = $serverparts["scheme"]."://".$serverparts["host"];
@@ -875,7 +1093,7 @@ class diaspora {
* 'author' => The author handle
* 'key' => The public key of the author
*/
- private function message($guid, $server, $level = 0) {
+ private static function message($guid, $server, $level = 0) {
if ($level > 5)
return false;
@@ -885,7 +1103,7 @@ class diaspora {
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$envelope = fetch_url($source_url);
- if($envelope) {
+ if ($envelope) {
logger("Envelope was fetched.", LOGGER_DEBUG);
$x = self::verify_magic_envelope($envelope);
if (!$x)
@@ -901,7 +1119,7 @@ class diaspora {
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$x = fetch_url($source_url);
- if(!$x)
+ if (!$x)
return false;
}
@@ -951,14 +1169,14 @@ class diaspora {
*
* @return array the item record
*/
- private function parent_item($uid, $guid, $author, $contact) {
+ private static function parent_item($uid, $guid, $author, $contact) {
$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid), dbesc($guid));
- if(!$r) {
+ if (!$r) {
$result = self::store_by_guid($guid, $contact["url"], $uid);
if (!$result) {
@@ -997,7 +1215,7 @@ class diaspora {
* 'cid' => contact id
* 'network' => network type
*/
- private function author_contact_by_url($contact, $person, $uid) {
+ private static function author_contact_by_url($contact, $person, $uid) {
$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
@@ -1005,9 +1223,9 @@ class diaspora {
$cid = $r[0]["id"];
$network = $r[0]["network"];
- // We are receiving content from a user that is about to be terminated
+ // We are receiving content from a user that possibly is about to be terminated
// This means the user is vital, so we remove a possible termination date.
- unmark_for_death($contact);
+ unmark_for_death($r[0]);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
@@ -1035,7 +1253,7 @@ class diaspora {
*
* @return string the post link
*/
- private function plink($addr, $guid) {
+ private static function plink($addr, $guid) {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
@@ -1065,7 +1283,7 @@ class diaspora {
*
* @return bool Success
*/
- private function receive_account_deletion($importer, $data) {
+ private static function receive_account_deletion($importer, $data) {
/// @todo Account deletion should remove the contact from the global contacts as well
@@ -1087,16 +1305,58 @@ class diaspora {
*
* @param string $author Author handle
* @param string $guid Message guid
+ * @param boolean $onlyfound Only return uri when found in the database
*
* @return string The constructed uri or the one from our database
*/
- private function get_uri_from_guid($author, $guid) {
+ private static function get_uri_from_guid($author, $guid, $onlyfound = false) {
$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
- if ($r)
+ if (dbm::is_result($r)) {
return $r[0]["uri"];
- else
+ } elseif (!$onlyfound) {
return $author.":".$guid;
+ }
+
+ return "";
+ }
+
+ /**
+ * @brief Fetch the guid from our database with a given uri
+ *
+ * @param string $author Author handle
+ * @param string $uri Message uri
+ *
+ * @return string The post guid
+ */
+ private static function get_guid_from_uri($uri, $uid) {
+
+ $r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
+ if (dbm::is_result($r)) {
+ return $r[0]["guid"];
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @brief Find the best importer for a comment, like, ...
+ *
+ * @param string $guid The guid of the item
+ *
+ * @return array|boolean the origin owner of that post - or false
+ */
+ private static function importer_for_guid($guid) {
+ $item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
+
+ if (dbm::is_result($item)) {
+ logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
+ $contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
+ if (dbm::is_result($contact)) {
+ return $contact;
+ }
+ }
+ return false;
}
/**
@@ -1109,28 +1369,39 @@ class diaspora {
*
* @return int The message id of the generated comment or "false" if there was an error
*/
- private function receive_comment($importer, $sender, $data, $xml) {
+ private static function receive_comment($importer, $sender, $data, $xml) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$text = unxmlify($data->text);
- $author = notags(unxmlify($data->author));
- if (isset($data->created_at))
+ if (isset($data->created_at)) {
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
- else
+ } else {
$created_at = datetime_convert();
+ }
+
+ if (isset($data->thread_parent_guid)) {
+ $thread_parent_guid = notags(unxmlify($data->thread_parent_guid));
+ $thr_uri = self::get_uri_from_guid("", $thread_parent_guid, true);
+ } else {
+ $thr_uri = "";
+ }
$contact = self::allowed_contact_by_handle($importer, $sender, true);
- if (!$contact)
+ if (!$contact) {
return false;
+ }
$message_id = self::message_exists($importer["uid"], $guid);
- if ($message_id)
- return $message_id;
+ if ($message_id) {
+ return true;
+ }
$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
- if (!$parent_item)
+ if (!$parent_item) {
return false;
+ }
$person = self::person_by_handle($author);
if (!is_array($person)) {
@@ -1161,24 +1432,38 @@ class diaspora {
$datarray["type"] = "remote-comment";
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_COMMENT;
- $datarray["parent-uri"] = $parent_item["uri"];
+
+ if ($thr_uri != "") {
+ $datarray["parent-uri"] = $thr_uri;
+ } else {
+ $datarray["parent-uri"] = $parent_item["uri"];
+ }
$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
- $datarray["object"] = $xml;
+
+ $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["source"] = $xml;
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
- $datarray["body"] = diaspora2bb($text);
+ $body = diaspora2bb($text);
+
+ $datarray["body"] = self::replace_people_guid($body, $person["url"]);
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- if ($message_id)
+ if ($message_id <= 0) {
+ return false;
+ }
+
+ if ($message_id) {
logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ }
// If we are the origin of the parent we store the original data and notify our followers
- if($message_id AND $parent_item["origin"]) {
+ if ($message_id AND $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
@@ -1191,7 +1476,7 @@ class diaspora {
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
}
- return $message_id;
+ return true;
}
/**
@@ -1206,32 +1491,27 @@ class diaspora {
*
* @return bool "true" if it was successful
*/
- private function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+ private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
- $author = notags(unxmlify($data->author));
-
- $reply = 0;
-
- $msg_guid = notags(unxmlify($mesg->guid));
- $msg_parent_guid = notags(unxmlify($mesg->parent_guid));
- $msg_parent_author_signature = notags(unxmlify($mesg->parent_author_signature));
- $msg_author_signature = notags(unxmlify($mesg->author_signature));
- $msg_text = unxmlify($mesg->text);
- $msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
// "diaspora_handle" is the element name from the old version
// "author" is the element name from the new version
- if ($mesg->author)
+ if ($mesg->author) {
$msg_author = notags(unxmlify($mesg->author));
- elseif ($mesg->diaspora_handle)
+ } elseif ($mesg->diaspora_handle) {
$msg_author = notags(unxmlify($mesg->diaspora_handle));
- else
+ } else {
return false;
+ }
+ $msg_guid = notags(unxmlify($mesg->guid));
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
+ $msg_text = unxmlify($mesg->text);
+ $msg_created_at = datetime_convert("UTC", "UTC", notags(unxmlify($mesg->created_at)));
- if($msg_conversation_guid != $guid) {
+ if ($msg_conversation_guid != $guid) {
logger("message conversation guid does not belong to the current conversation.");
return false;
}
@@ -1239,46 +1519,13 @@ class diaspora {
$body = diaspora2bb($msg_text);
$message_uri = $msg_author.":".$msg_guid;
- $author_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
-
- $author_signature = base64_decode($msg_author_signature);
+ $person = self::person_by_handle($msg_author);
- if(strcasecmp($msg_author,$msg["author"]) == 0) {
- $person = $contact;
- $key = $msg["key"];
- } else {
- $person = self::person_by_handle($msg_author);
-
- if (is_array($person) && x($person, "pubkey"))
- $key = $person["pubkey"];
- else {
- logger("unable to find author details");
- return false;
- }
- }
-
- if (!rsa_verify($author_signed_data, $author_signature, $key, "sha256")) {
- logger("verification failed.");
- return false;
- }
-
- if($msg_parent_author_signature) {
- $owner_signed_data = $msg_guid.";".$msg_parent_guid.";".$msg_text.";".unxmlify($mesg->created_at).";".$msg_author.";".$msg_conversation_guid;
-
- $parent_author_signature = base64_decode($msg_parent_author_signature);
-
- $key = $msg["key"];
-
- if (!rsa_verify($owner_signed_data, $parent_author_signature, $key, "sha256")) {
- logger("owner verification failed.");
- return false;
- }
- }
-
- $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
- dbesc($message_uri)
+ $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($msg_guid),
+ intval($importer["uid"])
);
- if($r) {
+ if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
@@ -1332,11 +1579,11 @@ class diaspora {
*
* @return bool Success
*/
- private function receive_conversation($importer, $msg, $data) {
+ private static function receive_conversation($importer, $msg, $data) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
- $author = notags(unxmlify($data->author));
$participants = notags(unxmlify($data->participants));
$messages = $data->message;
@@ -1356,7 +1603,7 @@ class diaspora {
intval($importer["uid"]),
dbesc($guid)
);
- if($c)
+ if ($c)
$conversation = $c[0];
else {
$r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
@@ -1369,21 +1616,21 @@ class diaspora {
dbesc($subject),
dbesc($participants)
);
- if($r)
+ if ($r)
$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($guid)
);
- if($c)
+ if ($c)
$conversation = $c[0];
}
if (!$conversation) {
logger("unable to create conversation.");
- return;
+ return false;
}
- foreach($messages as $mesg)
+ foreach ($messages as $mesg)
self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
return true;
@@ -1398,7 +1645,7 @@ class diaspora {
*
* @return string the body
*/
- private function construct_like_body($contact, $parent_item, $guid) {
+ private static function construct_like_body($contact, $parent_item, $guid) {
$bodyverb = t('%1$s likes %2$s\'s %3$s');
$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
@@ -1416,7 +1663,7 @@ class diaspora {
*
* @return string The XML
*/
- private function construct_like_object($importer, $parent_item) {
+ private static function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
$link = '';
$parent_body = $parent_item["body"];
@@ -1440,12 +1687,12 @@ class diaspora {
*
* @return int The message id of the generated like or "false" if there was an error
*/
- private function receive_like($importer, $sender, $data) {
- $positive = notags(unxmlify($data->positive));
+ private static function receive_like($importer, $sender, $data) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $parent_type = notags(unxmlify($data->parent_type));
$parent_guid = notags(unxmlify($data->parent_guid));
- $author = notags(unxmlify($data->author));
+ $parent_type = notags(unxmlify($data->parent_type));
+ $positive = notags(unxmlify($data->positive));
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
@@ -1458,7 +1705,7 @@ class diaspora {
$message_id = self::message_exists($importer["uid"], $guid);
if ($message_id)
- return $message_id;
+ return true;
$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
@@ -1482,6 +1729,8 @@ class diaspora {
$datarray = array();
+ $datarray["protocol"] = PROTOCOL_DIASPORA;
+
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $author_contact["cid"];
$datarray["network"] = $author_contact["network"];
@@ -1509,11 +1758,16 @@ class diaspora {
$message_id = item_store($datarray);
- if ($message_id)
+ if ($message_id <= 0) {
+ return false;
+ }
+
+ if ($message_id) {
logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ }
// If we are the origin of the parent we store the original data and notify our followers
- if($message_id AND $parent_item["origin"]) {
+ if ($message_id AND $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
@@ -1526,7 +1780,7 @@ class diaspora {
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
}
- return $message_id;
+ return true;
}
/**
@@ -1537,17 +1791,17 @@ class diaspora {
*
* @return bool Success?
*/
- private function receive_message($importer, $data) {
+ private static function receive_message($importer, $data) {
+ $author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $parent_guid = notags(unxmlify($data->parent_guid));
+ $conversation_guid = notags(unxmlify($data->conversation_guid));
$text = unxmlify($data->text);
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
- $author = notags(unxmlify($data->author));
- $conversation_guid = notags(unxmlify($data->conversation_guid));
$contact = self::allowed_contact_by_handle($importer, $author, true);
- if (!$contact)
+ if (!$contact) {
return false;
+ }
$conversation = null;
@@ -1555,16 +1809,13 @@ class diaspora {
intval($importer["uid"]),
dbesc($conversation_guid)
);
- if($c)
+ if ($c) {
$conversation = $c[0];
- else {
+ } else {
logger("conversation not available.");
return false;
}
- $reply = 0;
-
- $body = diaspora2bb($text);
$message_uri = $author.":".$guid;
$person = self::person_by_handle($author);
@@ -1573,15 +1824,19 @@ class diaspora {
return false;
}
- $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($message_uri),
+ $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($guid),
intval($importer["uid"])
);
- if($r) {
+ if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
+ $body = diaspora2bb($text);
+
+ $body = self::replace_people_guid($body, $person["url"]);
+
q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
@@ -1596,7 +1851,7 @@ class diaspora {
0,
1,
dbesc($message_uri),
- dbesc($author.":".$parent_guid),
+ dbesc($author.":".$conversation["guid"]),
dbesc($created_at)
);
@@ -1616,7 +1871,7 @@ class diaspora {
*
* @return bool always true
*/
- private function receive_participation($importer, $data) {
+ private static function receive_participation($importer, $data) {
// I'm not sure if we can fully support this message type
return true;
}
@@ -1629,7 +1884,7 @@ class diaspora {
*
* @return bool always true
*/
- private function receive_photo($importer, $data) {
+ private static function receive_photo($importer, $data) {
// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
return true;
}
@@ -1642,7 +1897,7 @@ class diaspora {
*
* @return bool always true
*/
- private function receive_poll_participation($importer, $data) {
+ private static function receive_poll_participation($importer, $data) {
// We don't support polls by now
return true;
}
@@ -1655,7 +1910,7 @@ class diaspora {
*
* @return bool Success
*/
- private function receive_profile($importer, $data) {
+ private static function receive_profile($importer, $data) {
$author = strtolower(notags(unxmlify($data->author)));
$contact = self::contact_by_handle($importer["uid"], $author);
@@ -1665,9 +1920,9 @@ class diaspora {
$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
$image_url = unxmlify($data->image_url);
$birthday = unxmlify($data->birthday);
- $location = diaspora2bb(unxmlify($data->location));
- $about = diaspora2bb(unxmlify($data->bio));
$gender = unxmlify($data->gender);
+ $about = diaspora2bb(unxmlify($data->bio));
+ $location = diaspora2bb(unxmlify($data->location));
$searchable = (unxmlify($data->searchable) == "true");
$nsfw = (unxmlify($data->nsfw) == "true");
$tags = unxmlify($data->tag_string);
@@ -1686,10 +1941,10 @@ class diaspora {
$handle_parts = explode("@", $author);
$nick = $handle_parts[0];
- if($name === "")
+ if ($name === "")
$name = $handle_parts[0];
- if( preg_match("|^https?://|", $image_url) === 0)
+ if ( preg_match("|^https?://|", $image_url) === 0)
$image_url = "http://".$handle_parts[1].$image_url;
update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
@@ -1704,7 +1959,7 @@ class diaspora {
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
- if(substr($birthday,5) === substr($contact["bd"],5))
+ if (substr($birthday,5) === substr($contact["bd"],5))
$birthday = $contact["bd"];
$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
@@ -1722,18 +1977,15 @@ class diaspora {
intval($importer["uid"])
);
- if ($searchable) {
- poco_check($contact["url"], $name, NETWORK_DIASPORA, $image_url, $about, $location, $gender, $keywords, "",
- datetime_convert(), 2, $contact["id"], $importer["uid"]);
- }
-
$gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location,
"about" => $about, "birthday" => $birthday, "gender" => $gender,
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
"hide" => !$searchable, "nsfw" => $nsfw);
- update_gcontact($gcontact);
+ $gcid = update_gcontact($gcontact);
+
+ link_gcontact($gcid, $importer["uid"], $contact["id"]);
logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
@@ -1746,11 +1998,11 @@ class diaspora {
* @param array $importer Array of the importer user
* @param array $contact The contact that send the request
*/
- private function receive_request_make_friend($importer, $contact) {
+ private static function receive_request_make_friend($importer, $contact) {
$a = get_app();
- if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+ if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
intval(CONTACT_IS_FRIEND),
intval($contact["id"]),
@@ -1763,7 +2015,7 @@ class diaspora {
intval($importer["uid"])
);
- if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
+ if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
@@ -1771,9 +2023,10 @@ class diaspora {
// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
- if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
+ if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
$arr = array();
+ $arr["protocol"] = PROTOCOL_DIASPORA;
$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
$arr["uid"] = $importer["uid"];
$arr["contact-id"] = $self[0]["id"];
@@ -1802,7 +2055,7 @@ class diaspora {
$arr["deny_gid"] = $user[0]["deny_gid"];
$i = item_store($arr);
- if($i)
+ if ($i)
proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
}
}
@@ -1815,18 +2068,18 @@ class diaspora {
*
* @return string The XML
*/
- private function construct_new_friend_object($contact) {
- $objtype = ACTIVITY_OBJ_PERSON;
- $link = ''."\n".
- ''."\n";
+ private static function construct_new_friend_object($contact) {
+ $objtype = ACTIVITY_OBJ_PERSON;
+ $link = ''."\n".
+ ''."\n";
- $xmldata = array("object" => array("type" => $objtype,
- "title" => $contact["name"],
- "id" => $contact["url"]."/".$contact["name"],
- "link" => $link));
+ $xmldata = array("object" => array("type" => $objtype,
+ "title" => $contact["name"],
+ "id" => $contact["url"]."/".$contact["name"],
+ "link" => $link));
- return xml::from_array($xmldata, $xml, true);
- }
+ return xml::from_array($xmldata, $xml, true);
+ }
/**
* @brief Processes incoming sharing notification
@@ -1836,24 +2089,27 @@ class diaspora {
*
* @return bool Success
*/
- private function receive_contact_request($importer, $data) {
+ private static function receive_contact_request($importer, $data) {
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
- if (!$author || !$recipient)
+ if (!$author || !$recipient) {
return false;
+ }
// the current protocol version doesn't know these fields
// That means that we will assume their existance
- if (isset($data->following))
+ if (isset($data->following)) {
$following = (unxmlify($data->following) == "true");
- else
+ } else {
$following = true;
+ }
- if (isset($data->sharing))
+ if (isset($data->sharing)) {
$sharing = (unxmlify($data->sharing) == "true");
- else
+ } else {
$sharing = true;
+ }
$contact = self::contact_by_handle($importer["uid"],$author);
@@ -1871,7 +2127,7 @@ class diaspora {
// 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) {
+ if ($u) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
$ret = self::send_share($u[0], $contact);
}
@@ -1938,12 +2194,12 @@ class diaspora {
$def_gid = get_default_group($importer['uid'], $ret["network"]);
- if(intval($def_gid))
+ 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) {
+ if ($importer["page-flags"] == PAGE_NORMAL) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
@@ -1993,7 +2249,7 @@ 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);
@@ -2014,7 +2270,7 @@ class diaspora {
*
* @return array The fetched item
*/
- private function original_item($guid, $orig_author, $author) {
+ private static function original_item($guid, $orig_author, $author) {
// Do we already have this item?
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
@@ -2022,26 +2278,29 @@ class diaspora {
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
dbesc($guid));
- if($r) {
+ if (dbm::is_result($r)) {
logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
// Then refetch the content, if it is a reshare from a reshare.
// 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"], true))
+ if (self::is_reshare($r[0]["body"], true)) {
$r = array();
- elseif (self::is_reshare($r[0]["body"], false)) {
+ } elseif (self::is_reshare($r[0]["body"], false)) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+ $r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+
// Add OEmbed and other information to the body
$r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true);
return $r[0];
- } else
+ } else {
return $r[0];
+ }
}
- if (!$r) {
+ if (!dbm::is_result($r)) {
$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
$item_id = self::store_by_guid($guid, $server);
@@ -2058,10 +2317,12 @@ class diaspora {
FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
intval($item_id));
- if ($r) {
+ if (dbm::is_result($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))
+ if (self::is_reshare($r[0]["body"], false)) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+ $r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+ }
return $r[0];
}
@@ -2080,25 +2341,29 @@ class diaspora {
*
* @return int the message id
*/
- private function receive_reshare($importer, $data, $xml) {
+ private static function receive_reshare($importer, $data, $xml) {
+ $author = notags(unxmlify($data->author));
+ $guid = notags(unxmlify($data->guid));
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$root_author = notags(unxmlify($data->root_author));
$root_guid = notags(unxmlify($data->root_guid));
- $guid = notags(unxmlify($data->guid));
- $author = notags(unxmlify($data->author));
+ /// @todo handle unprocessed property "provider_display_name"
$public = notags(unxmlify($data->public));
- $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$contact = self::allowed_contact_by_handle($importer, $author, false);
- if (!$contact)
+ if (!$contact) {
return false;
+ }
$message_id = self::message_exists($importer["uid"], $guid);
- if ($message_id)
- return $message_id;
+ if ($message_id) {
+ return true;
+ }
$original_item = self::original_item($root_guid, $root_author, $author);
- if (!$original_item)
+ if (!$original_item) {
return false;
+ }
$orig_url = App::get_baseurl()."/display/".$original_item["guid"];
@@ -2122,7 +2387,8 @@ class diaspora {
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
- $datarray["object"] = $xml;
+ $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["source"] = $xml;
$prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
$original_item["guid"], $original_item["created"], $orig_url);
@@ -2140,10 +2406,12 @@ class diaspora {
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- if ($message_id)
+ if ($message_id) {
logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
-
- return $message_id;
+ return true;
+ } else {
+ return false;
+ }
}
/**
@@ -2155,10 +2423,10 @@ class diaspora {
*
* @return bool success
*/
- private function item_retraction($importer, $contact, $data) {
- $target_type = notags(unxmlify($data->target_type));
- $target_guid = notags(unxmlify($data->target_guid));
+ private static function item_retraction($importer, $contact, $data) {
$author = notags(unxmlify($data->author));
+ $target_guid = notags(unxmlify($data->target_guid));
+ $target_type = notags(unxmlify($data->target_type));
$person = self::person_by_handle($author);
if (!is_array($person)) {
@@ -2166,12 +2434,18 @@ class diaspora {
return false;
}
+ if (!isset($contact["url"])) {
+ $contact["url"] = $person["url"];
+ }
+
$r = q("SELECT `id`, `parent`, `parent-uri`, `author-link` FROM `item` WHERE `guid` = '%s' AND `uid` = %d AND NOT `file` LIKE '%%[%%' LIMIT 1",
dbesc($target_guid),
intval($importer["uid"])
);
- if (!$r)
+ if (!$r) {
+ logger("Target guid ".$target_guid." was not found for user ".$importer["uid"]);
return false;
+ }
// Check if the sender is the thread owner
$p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
@@ -2194,7 +2468,7 @@ class diaspora {
logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
// Now check if the retraction needs to be relayed by us
- if($p[0]["origin"]) {
+ if ($p[0]["origin"]) {
// notify others
proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
}
@@ -2211,11 +2485,11 @@ class diaspora {
*
* @return bool Success
*/
- private function receive_retraction($importer, $sender, $data) {
+ private static function receive_retraction($importer, $sender, $data) {
$target_type = notags(unxmlify($data->target_type));
$contact = self::contact_by_handle($importer["uid"], $sender);
- if (!$contact) {
+ if (!$contact AND (in_array($target_type, array("Contact", "Person")))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
@@ -2228,7 +2502,7 @@ class diaspora {
case "Post": // "Post" will be supported in a future version
case "Reshare":
case "StatusMessage":
- return self::item_retraction($importer, $contact, $data);;
+ return self::item_retraction($importer, $contact, $data);
case "Contact":
case "Person":
@@ -2253,52 +2527,61 @@ 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));
+ private static function receive_status_message($importer, $data, $xml) {
$author = notags(unxmlify($data->author));
- $public = notags(unxmlify($data->public));
+ $guid = notags(unxmlify($data->guid));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ $public = notags(unxmlify($data->public));
+ $text = unxmlify($data->text);
$provider_display_name = notags(unxmlify($data->provider_display_name));
- /// @todo enable support for polls
- //if ($data->poll) {
- // foreach ($data->poll AS $poll)
- // print_r($poll);
- // die("poll!\n");
- //}
$contact = self::allowed_contact_by_handle($importer, $author, false);
- if (!$contact)
+ if (!$contact) {
return false;
+ }
$message_id = self::message_exists($importer["uid"], $guid);
- if ($message_id)
- return $message_id;
+ if ($message_id) {
+ return true;
+ }
$address = array();
- if ($data->location)
- foreach ($data->location->children() AS $fieldname => $data)
+ if ($data->location) {
+ foreach ($data->location->children() AS $fieldname => $data) {
$address[$fieldname] = notags(unxmlify($data));
+ }
+ }
- $body = diaspora2bb($raw_message);
+ $body = diaspora2bb($text);
$datarray = array();
// Attach embedded pictures to the body
if ($data->photo) {
- foreach ($data->photo AS $photo)
+ foreach ($data->photo AS $photo) {
$body = "[img]".unxmlify($photo->remote_photo_path).
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
+ }
- $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+ $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
} else {
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
// Add OEmbed and other information to the body
- if (!self::is_redmatrix($contact["url"]))
+ if (!self::is_redmatrix($contact["url"])) {
$body = add_page_info_to_body($body, false, true);
+ }
}
+ /// @todo enable support for polls
+ //if ($data->poll) {
+ // foreach ($data->poll AS $poll)
+ // print_r($poll);
+ // die("poll!\n");
+ //}
+
+ /// @todo enable support for events
+
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
$datarray["network"] = NETWORK_DIASPORA;
@@ -2317,30 +2600,36 @@ class diaspora {
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
- $datarray["object"] = $xml;
+ $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["source"] = $xml;
- $datarray["body"] = $body;
+ $datarray["body"] = self::replace_people_guid($body, $contact["url"]);
- if ($provider_display_name != "")
+ if ($provider_display_name != "") {
$datarray["app"] = $provider_display_name;
+ }
$datarray["plink"] = self::plink($author, $guid);
$datarray["private"] = (($public == "false") ? 1 : 0);
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
- if (isset($address["address"]))
+ if (isset($address["address"])) {
$datarray["location"] = $address["address"];
+ }
- if (isset($address["lat"]) AND isset($address["lng"]))
+ if (isset($address["lat"]) AND isset($address["lng"])) {
$datarray["coord"] = $address["lat"]." ".$address["lng"];
+ }
self::fetch_guid($datarray);
$message_id = item_store($datarray);
- if ($message_id)
+ if ($message_id) {
logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
-
- return $message_id;
+ return true;
+ } else {
+ return false;
+ }
}
/* ************************************************************************************** *
@@ -2354,16 +2643,18 @@ class diaspora {
*
* @return string the handle in the format user@domain.tld
*/
- private function my_handle($contact) {
- if ($contact["addr"] != "")
+ private static function my_handle($contact) {
+ if ($contact["addr"] != "") {
return $contact["addr"];
+ }
// Normally we should have a filled "addr" field - but in the past this wasn't the case
// So - just in case - we build the the address here.
- if ($contact["nickname"] != "")
+ if ($contact["nickname"] != "") {
$nick = $contact["nickname"];
- else
+ } else {
$nick = $contact["nick"];
+ }
return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
}
@@ -2382,7 +2673,7 @@ class diaspora {
$b64url_data = base64url_encode($msg);
$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
- $key_id = base64url_encode(diaspora::my_handle($user));
+ $key_id = base64url_encode(self::my_handle($user));
$type = "application/xml";
$encoding = "base64url";
$alg = "RSA-SHA256";
@@ -2413,7 +2704,7 @@ class diaspora {
*
* @return string The envelope
*/
- private function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
+ private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
logger("Message: ".$msg, LOGGER_DATA);
@@ -2459,7 +2750,7 @@ class diaspora {
*
* @return string The envelope
*/
- private function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
+ private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
logger("Message: ".$msg, LOGGER_DATA);
@@ -2470,20 +2761,19 @@ class diaspora {
return false;
}
- $inner_aes_key = random_string(32);
+ $inner_aes_key = openssl_random_pseudo_bytes(32);
$b_inner_aes_key = base64_encode($inner_aes_key);
- $inner_iv = random_string(16);
+ $inner_iv = openssl_random_pseudo_bytes(16);
$b_inner_iv = base64_encode($inner_iv);
- $outer_aes_key = random_string(32);
+ $outer_aes_key = openssl_random_pseudo_bytes(32);
$b_outer_aes_key = base64_encode($outer_aes_key);
- $outer_iv = random_string(16);
+ $outer_iv = openssl_random_pseudo_bytes(16);
$b_outer_iv = base64_encode($outer_iv);
$handle = self::my_handle($user);
- $padded_data = pkcs5_pad($msg,16);
- $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv);
+ $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg);
$b64_data = base64_encode($inner_encrypted);
@@ -2505,9 +2795,8 @@ class diaspora {
"author_id" => $handle));
$decrypted_header = xml::from_array($xmldata, $xml, true);
- $decrypted_header = pkcs5_pad($decrypted_header,16);
- $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
+ $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header);
$outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key));
@@ -2550,7 +2839,7 @@ class diaspora {
*
* @return string The message that will be transmitted to other servers
*/
- private function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
+ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
if ($public)
$magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey);
@@ -2570,7 +2859,7 @@ class diaspora {
*
* @return string The signature
*/
- private function signature($owner, $message) {
+ private static function signature($owner, $message) {
$sigmsg = $message;
unset($sigmsg["author_signature"]);
unset($sigmsg["parent_author_signature"]);
@@ -2597,7 +2886,7 @@ class diaspora {
$a = get_app();
$enabled = intval(get_config("system", "diaspora_enabled"));
- if(!$enabled)
+ if (!$enabled)
return 200;
$logid = random_string(4);
@@ -2623,7 +2912,7 @@ class diaspora {
logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
- if(!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
+ if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
logger("queue message");
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
@@ -2632,7 +2921,7 @@ class diaspora {
dbesc($slap),
intval($public_batch)
);
- if($r) {
+ if ($r) {
logger("add_to_queue ignored - identical item already in queue");
} else {
// queue message for redelivery
@@ -2677,7 +2966,7 @@ class diaspora {
*
* @return int Result of the transmission
*/
- private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
+ private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
$msg = self::build_post_xml($type, $message);
@@ -2818,6 +3107,80 @@ class diaspora {
return($ret);
}
+ /**
+ * @brief Create an event array
+ *
+ * @param integer $event_id The id of the event
+ *
+ * @return array with event data
+ */
+ private static function build_event($event_id) {
+
+ $r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
+ if (!dbm::is_result($r)) {
+ return array();
+ }
+
+ $event = $r[0];
+
+ $eventdata = array();
+
+ $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
+ if (!dbm::is_result($r)) {
+ return array();
+ }
+
+ $user = $r[0];
+
+ $r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
+ if (!dbm::is_result($r)) {
+ return array();
+ }
+
+ $owner = $r[0];
+
+ $eventdata['author'] = self::my_handle($owner);
+
+ if ($event['guid']) {
+ $eventdata['guid'] = $event['guid'];
+ }
+
+ $mask = 'Y-m-d\TH:i:s\Z';
+
+ /// @todo - establish "all day" events in Friendica
+ $eventdata["all_day"] = "false";
+
+ if (!$event['adjust']) {
+ $eventdata['timezone'] = $user['timezone'];
+
+ if ($eventdata['timezone'] == "") {
+ $eventdata['timezone'] = 'UTC';
+ }
+ }
+
+ if ($event['start']) {
+ $eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
+ }
+ if ($event['finish'] AND !$event['nofinish']) {
+ $eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
+ }
+ if ($event['summary']) {
+ $eventdata['summary'] = html_entity_decode(bb2diaspora($event['summary']));
+ }
+ if ($event['desc']) {
+ $eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
+ }
+ if ($event['location']) {
+ $location = array();
+ $location["address"] = html_entity_decode(bb2diaspora($event['location']));
+ $location["lat"] = 0;
+ $location["lng"] = 0;
+ $eventdata['location'] = $location;
+ }
+
+ return $eventdata;
+ }
+
/**
* @brief Create a post (status message or reshare)
*
@@ -2830,11 +3193,18 @@ class diaspora {
*/
public static function build_status($item, $owner) {
+ $cachekey = "diaspora:build_status:".$item['guid'];
+
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ return $result;
+ }
+
$myaddr = self::my_handle($owner);
$public = (($item["private"]) ? "false" : "true");
- $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
+ $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
// Detect a share element and do a reshare
if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) {
@@ -2855,14 +3225,14 @@ class diaspora {
$body = html_entity_decode(bb2diaspora($body));
// Adding the title
- if(strlen($title))
+ if (strlen($title))
$body = "## ".html_entity_decode($title)."\n\n".$body;
if ($item["attach"]) {
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
- if(cnt) {
+ if (cnt) {
$body .= "\n".t("Attachments:")."\n";
- foreach($matches as $mtch)
+ foreach ($matches as $mtch)
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
}
}
@@ -2891,9 +3261,24 @@ class diaspora {
unset($message["location"]);
}
+ if ($item['event-id'] > 0) {
+ $event = self::build_event($item['event-id']);
+ if (count($event)) {
+ $message['event'] = $event;
+
+ /// @todo Once Diaspora supports it, we will remove the body
+ // $message['raw_message'] = '';
+ }
+ }
+
$type = "status_message";
}
- return array("type" => $type, "message" => $message);
+
+ $msg = array("type" => $type, "message" => $message);
+
+ Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+
+ return $msg;
}
/**
@@ -2908,7 +3293,7 @@ class diaspora {
*/
public static function send_status($item, $owner, $contact, $public_batch = false) {
- $status = diaspora::build_status($item, $owner);
+ $status = self::build_status($item, $owner);
return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
}
@@ -2921,17 +3306,21 @@ class diaspora {
*
* @return array The data for a "like"
*/
- private function construct_like($item, $owner) {
+ private static function construct_like($item, $owner) {
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
- if(!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
- $positive = "true";
+ if ($item['verb'] === ACTIVITY_LIKE) {
+ $positive = "true";
+ } elseif ($item['verb'] === ACTIVITY_DISLIKE) {
+ $positive = "false";
+ }
return(array("positive" => $positive,
"guid" => $item["guid"],
@@ -2941,6 +3330,45 @@ class diaspora {
"diaspora_handle" => self::my_handle($owner)));
}
+ /**
+ * @brief Creates an "EventParticipation" object
+ *
+ * @param array $item The item that will be exported
+ * @param array $owner the array of the item owner
+ *
+ * @return array The data for an "EventParticipation"
+ */
+ private static function construct_attend($item, $owner) {
+
+ $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+ dbesc($item["thr-parent"]));
+ if (!dbm::is_result($p))
+ return false;
+
+ $parent = $p[0];
+
+ switch ($item['verb']) {
+ case ACTIVITY_ATTEND:
+ $attend_answer = 'accepted';
+ break;
+ case ACTIVITY_ATTENDNO:
+ $attend_answer = 'declined';
+ break;
+ case ACTIVITY_ATTENDMAYBE:
+ $attend_answer = 'tentative';
+ break;
+ default:
+ logger('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+ return false;
+ }
+
+ return(array("author" => self::my_handle($owner),
+ "guid" => $item["guid"],
+ "parent_guid" => $parent["guid"],
+ "status" => $attend_answer,
+ "author_signature" => ""));
+ }
+
/**
* @brief Creates the object for a comment
*
@@ -2949,25 +3377,43 @@ class diaspora {
*
* @return array The data for a comment
*/
- private function construct_comment($item, $owner) {
+ private static function construct_comment($item, $owner) {
+
+ $cachekey = "diaspora:construct_comment:".$item['guid'];
+
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ return $result;
+ }
$p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
intval($item["parent"]),
intval($item["parent"])
);
- if (!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
$text = html_entity_decode(bb2diaspora($item["body"]));
+ $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
- return(array("guid" => $item["guid"],
+ $comment = array("guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"author_signature" => "",
"text" => $text,
- "diaspora_handle" => self::my_handle($owner)));
+ /// @todo Currently disabled until Diaspora supports it: "created_at" => $created,
+ "diaspora_handle" => self::my_handle($owner));
+
+ // Send the thread parent guid only if it is a threaded comment
+ if ($item['thr-parent'] != $item['parent-uri']) {
+ $comment['thread_parent_guid'] = self::get_guid_from_uri($item['thr-parent'], $item['uid']);
+ }
+
+ Cache::set($cachekey, $comment, CACHE_QUARTER_HOUR);
+
+ return($comment);
}
/**
@@ -2982,7 +3428,10 @@ class diaspora {
*/
public static function send_followup($item,$owner,$contact,$public_batch = false) {
- if($item['verb'] === ACTIVITY_LIKE) {
+ if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
+ $message = self::construct_attend($item, $owner);
+ $type = "event_participation";
+ } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
$message = self::construct_like($item, $owner);
$type = "like";
} else {
@@ -3006,7 +3455,7 @@ class diaspora {
*
* @return string The message
*/
- private function message_from_signature($item, $signature) {
+ private static function message_from_signature($item, $signature) {
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);
@@ -3170,7 +3619,7 @@ class diaspora {
intval($item["uid"])
);
- if (!$r) {
+ if (!dbm::is_result($r)) {
logger("conversation not found.");
return;
}
@@ -3179,13 +3628,13 @@ class diaspora {
$conv = array(
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d H:i:s \U\T\C'),
+ "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
"diaspora_handle" => $cnv["creator"],
"participant_handles" => $cnv["recips"]
);
$body = bb2diaspora($item["body"]);
- $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d H:i:s \U\T\C');
+ $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
$signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid'];
$sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
@@ -3207,7 +3656,7 @@ class diaspora {
} else {
$message = array("guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d H:i:s \U\T\C'),
+ "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
"message" => $msg,
"diaspora_handle" => $cnv["creator"],
"participant_handles" => $cnv["recips"]);
@@ -3263,7 +3712,7 @@ class diaspora {
if ($searchable === 'true') {
$dob = '1000-00-00';
- if (($profile['dob']) && ($profile['dob'] != '0000-00-00'))
+ if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
$about = $profile['about'];
@@ -3276,7 +3725,7 @@ class diaspora {
$kw = str_replace(' ',' ',$kw);
$arr = explode(' ',$profile['pub_keywords']);
if (count($arr)) {
- for($x = 0; $x < 5; $x ++) {
+ for ($x = 0; $x < 5; $x ++) {
if (trim($arr[$x]))
$tags .= '#'. trim($arr[$x]) .' ';
}
@@ -3298,7 +3747,7 @@ 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);
}
@@ -3321,41 +3770,31 @@ class diaspora {
}
$r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
- if(!$r)
+ if (!dbm::is_result($r)) {
return false;
+ }
$contact["uprvkey"] = $r[0]['prvkey'];
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
- if (!$r)
+ if (!dbm::is_result($r)) {
return false;
+ }
- if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE)))
+ if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
return false;
+ }
$message = self::construct_like($r[0], $contact);
$message["author_signature"] = self::signature($contact, $message);
- // In the future we will store the signature more flexible to support new fields.
- // Right now we cannot change this since old Friendica versions (prior to 3.5) can only handle this format.
- // (We are transmitting this data here via DFRN)
-
- $signed_text = $message["positive"].";".$message["guid"].";".$message["target_type"].";".
- $message["parent_guid"].";".$message["diaspora_handle"];
-
- q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) VALUES (%d,'%s','%s','%s')",
- intval($post_id),
- dbesc($signed_text),
- dbesc($message["author_signature"]),
- dbesc($message["diaspora_handle"])
+ // We now store the signature more flexible to dynamically support new fields.
+ // This will break Diaspora compatibility with Friendica versions prior to 3.5.
+ q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
+ intval($message_id),
+ dbesc(json_encode($message))
);
- // This here will replace the lines above, once Diaspora changed its protocol
- //q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- // intval($message_id),
- // dbesc(json_encode($message))
- //);
-
logger('Stored diaspora like signature');
return true;
}
@@ -3382,27 +3821,14 @@ class diaspora {
$message = self::construct_comment($item, $contact);
$message["author_signature"] = self::signature($contact, $message);
- // In the future we will store the signature more flexible to support new fields.
- // Right now we cannot change this since old Friendica versions (prior to 3.5) can only handle this format.
- // (We are transmitting this data here via DFRN)
- $signed_text = $message["guid"].";".$message["parent_guid"].";".
- $message["text"].";".$message["diaspora_handle"];
-
- q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) VALUES (%d,'%s','%s','%s')",
+ // We now store the signature more flexible to dynamically support new fields.
+ // This will break Diaspora compatibility with Friendica versions prior to 3.5.
+ q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
intval($message_id),
- dbesc($signed_text),
- dbesc($message["author_signature"]),
- dbesc($message["diaspora_handle"])
+ dbesc(json_encode($message))
);
- // This here will replace the lines above, once Diaspora changed its protocol
- //q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
- // intval($message_id),
- // dbesc(json_encode($message))
- //);
-
logger('Stored diaspora comment signature');
return true;
}
}
-?>