/**
* @brief repairs a signature that was double encoded
*
+ * The function is unused at the moment. It was copied from the old implementation.
+ *
* @param string $signature The signature
* @param string $handle The handle of the signature owner
* @param integer $level This value is only set inside this function to avoid endless loops
*
- * @return the repaired signature
+ * @return string the repaired signature
*/
- function repair_signature($signature, $handle = "", $level = 1) {
+ private function repair_signature($signature, $handle = "", $level = 1) {
if ($signature == "")
return ($signature);
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
- function decode($importer, $xml) {
+ public static function decode($importer, $xml) {
$public = false;
$basedom = parse_xml_string($xml);
$decrypted = pkcs5_unpad($decrypted);
- /**
- * $decrypted now contains something like
- *
- * <decrypted_header>
- * <iv>8e+G2+ET8l5BPuW0sVTnQw==</iv>
- * <aes_key>UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU=</aes_key>
- * <author_id>galaxor@diaspora.priateship.org</author_id>
- * </decrypted_header>
- */
-
logger('decrypted: '.$decrypted, LOGGER_DEBUG);
$idom = parse_xml_string($decrypted,false);
*
* @param array $msg The post that will be dispatched
*
- * @return bool Was the message accepted?
+ * @return int The message id of the generated message, "true" or "false" if there was an error
*/
public static function dispatch_public($msg) {
// Use a dummy importer to import the data for the public copy
$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
- $item_id = self::dispatch($importer,$msg);
+ $message_id = self::dispatch($importer,$msg);
// Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
} else
logger("No subscribers for ".$msg["author"]." ".print_r($msg, true));
- return $item_id;
+ return $message_id;
}
/**
* @param array $importer Array of the importer user
* @param array $msg The post that will be dispatched
*
- * @return bool Was the message accepted?
+ * @return int The message id of the generated message, "true" or "false" if there was an error
*/
public static function dispatch($importer, $msg) {
case "comment":
return self::receive_comment($importer, $sender, $fields, $msg["message"]);
+ case "contact":
+ return self::receive_contact_request($importer, $fields);
+
case "conversation":
return self::receive_conversation($importer, $msg, $fields);
case "profile":
return self::receive_profile($importer, $fields);
- case "request":
- return self::receive_request($importer, $fields);
-
case "reshare":
return self::receive_reshare($importer, $fields, $msg["message"]);
if (in_array($type, array("signed_retraction", "relayable_retraction")))
$type = "retraction";
+ if ($type == "request")
+ $type = "contact";
+
$fields = new SimpleXMLElement("<".$type."/>");
$signed_data = "";
if($contact['addr'] != "")
$handle = $contact['addr'];
- elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) {
+ 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);
* @param string $handle The checked handle in the format user@domain.tld
* @param bool $is_comment Is the check for a comment?
*
- * @return bool is posting allowed?
+ * @return array The contact data
*/
private function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
$contact = self::contact_by_handle($importer["uid"], $handle);
* @param int $uid The user id
* @param string $guid The guid of the message
*
- * @return bool "true" if the message already was stored into the system
+ * @return int|bool message id if the message already was stored into the system - or false.
*/
private function message_exists($uid, $guid) {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
if($r) {
logger("message ".$guid." already exists for user ".$uid);
- return true;
+ return $r[0]["id"];
}
return false;
}
/**
- * @brief sub function of "fetch_guid"
+ * @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
}
/**
- * @brief
+ * @brief Fetches a message from a server
*
* @param string $guid message guid
- * @param $server
- * @param $level
+ * @param string $server The url of the server
+ * @param int $level Endless loop prevention
*
- * @return
+ * @return array
+ * 'message' => The message XML
+ * 'author' => The author handle
+ * 'key' => The public key of the author
*/
private function message($guid, $server, $level = 0) {
}
/**
- * @brief
+ * @brief Fetches the item record of a given guid
*
* @param int $uid The user id
* @param string $guid message guid
- * @param $author
- * @param array $contact The contact that is checked
+ * @param string $author The handle of the item
+ * @param array $contact The contact of the item owner
*
- * @return
+ * @return array the item record
*/
private function parent_item($uid, $guid, $author, $contact) {
$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
}
/**
- * @brief
+ * @brief returns contact details
*
- * @param array $contact The contact that is checked
- * @param $person
+ * @param array $contact The default contact if the person isn't found
+ * @param array $person The record of the person
* @param int $uid The user id
*
- * @return
+ * @return array
+ * 'cid' => contact id
+ * 'network' => network type
*/
private function author_contact_by_url($contact, $person, $uid) {
/**
* @brief Generate a post link with a given handle and message guid
*
- * @param $addr
+ * @param string $addr The user handle
* @param string $guid message guid
*
* @return string the post link
}
/**
- * @brief
+ * @brief Processes an account deletion
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool Success
*/
private function receive_account_deletion($importer, $data) {
$author = notags(unxmlify($data->author));
}
/**
- * @brief
+ * @brief Processes an incoming comment
*
* @param array $importer Array of the importer user
* @param string $sender The sender of the message
if (!$contact)
return false;
- if (self::message_exists($importer["uid"], $guid))
- return false;
+ $message_id = self::message_exists($importer["uid"], $guid);
+ if ($message_id)
+ return $message_id;
$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
}
/**
- * @brief
+ * @brief processes and stores private messages
*
* @param array $importer Array of the importer user
- * @param array $contact The contact that is checked
+ * @param array $contact The contact of the message
* @param object $data The message object
- * @param $msg
- * @param $mesg
- * @param $conversation
+ * @param array $msg Array of the processed message, author handle and key
+ * @param object $mesg The private message
+ * @param array $conversation The conversation record to which this message belongs
*
- * @return
+ * @return bool "true" if it was successful
*/
private function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
$guid = notags(unxmlify($data->guid));
"verb" => ACTIVITY_POST,
"otype" => "mail"
));
+ return true;
}
/**
- * @brief
+ * @brief Processes new private messages (answers to private messages are processed elsewhere)
*
* @param array $importer Array of the importer user
- * @param $msg
+ * @param array $msg Array of the processed message, author handle and key
* @param object $data The message object
*
- * @return
+ * @return bool Success
*/
private function receive_conversation($importer, $msg, $data) {
$guid = notags(unxmlify($data->guid));
}
/**
- * @brief
+ * @brief Creates the body for a "like" message
*
- * @param array $contact The contact that is checked
- * @param $parent_item
+ * @param array $contact The contact that send us the "like"
+ * @param array $parent_item The item array of the parent item
* @param string $guid message guid
*
- * @return
+ * @return string the body
*/
private function construct_like_body($contact, $parent_item, $guid) {
$bodyverb = t('%1$s likes %2$s\'s %3$s');
}
/**
- * @brief
+ * @brief Creates a XML object for a "like"
*
* @param array $importer Array of the importer user
- * @param $parent_item
+ * @param array $parent_item The item array of the parent item
*
- * @return
+ * @return string The XML
*/
private function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
}
/**
- * @brief
+ * @brief Processes "like" messages
*
* @param array $importer Array of the importer user
* @param string $sender The sender of the message
if (!$contact)
return false;
- if (self::message_exists($importer["uid"], $guid))
- return false;
+ $message_id = self::message_exists($importer["uid"], $guid);
+ if ($message_id)
+ return $message_id;
$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
- if ($positive === "true")
+ if ($positive == "true")
$verb = ACTIVITY_LIKE;
else
$verb = ACTIVITY_DISLIKE;
}
/**
- * @brief
+ * @brief Processes private messages
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool Success?
*/
private function receive_message($importer, $data) {
$guid = notags(unxmlify($data->guid));
}
/**
- * @brief
+ * @brief Processes participations - unsupported by now
*
* @param array $importer Array of the importer user
* @param object $data The message object
}
/**
- * @brief
+ * @brief Processes photos - unneeded
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool always true
*/
private 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
}
/**
- * @brief
+ * @brief Processes poll participations - unssupported
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool always true
*/
private function receive_poll_participation($importer, $data) {
// We don't support polls by now
}
/**
- * @brief
+ * @brief Processes incoming profile updates
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool Success
*/
private function receive_profile($importer, $data) {
$author = notags(unxmlify($data->author));
}
/**
- * @brief
+ * @brief Processes incoming friend requests
*
* @param array $importer Array of the importer user
- * @param array $contact The contact that is checked
- *
- * @return
+ * @param array $contact The contact that send the request
*/
private function receive_request_make_friend($importer, $contact) {
$BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
$arr["body"] = sprintf(t("%1$s is now friends with %2$s"), $A, $B)."\n\n\n".$Bphoto;
- $arr["object"] = "<object><type>".ACTIVITY_OBJ_PERSON."</type><title>".$contact["name"]."</title>"
- ."<id>".$contact["url"]."/".$contact["name"]."</id>";
- $arr["object"] .= "<link>".xmlify('<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n");
- $arr["object"] .= xmlify('<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n");
- $arr["object"] .= "</link></object>\n";
+ $arr["object"] = self::construct_new_friend_object($contact);
+
$arr["last-child"] = 1;
$arr["allow_cid"] = $user[0]["allow_cid"];
$i = item_store($arr);
if($i)
proc_run("php", "include/notifier.php", "activity", $i);
-
}
-
}
}
/**
- * @brief
+ * @brief Creates a XML object for a "new friend" message
+ *
+ * @param array $contact Array of the contact
+ *
+ * @return string The XML
+ */
+ private function construct_new_friend_object($contact) {
+ $objtype = ACTIVITY_OBJ_PERSON;
+ $link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
+ '<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
+
+ $xmldata = array("object" => array("type" => $objtype,
+ "title" => $contact["name"],
+ "id" => $contact["url"]."/".$contact["name"],
+ "link" => $link));
+
+ return xml::from_array($xmldata, $xml, true);
+ }
+
+ /**
+ * @brief Processes incoming sharing notification
*
* @param array $importer Array of the importer user
* @param object $data The message object
*
- * @return
+ * @return bool Success
*/
- private function receive_request($importer, $data) {
+ private function receive_contact_request($importer, $data) {
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
if (!$author || !$recipient)
- return;
+ return false;
- $contact = self::contact_by_handle($importer["uid"],$author);
+ // the current protocol version doesn't know these fields
+ // That means that we will assume their existance
+ if (isset($data->following))
+ $following = (unxmlify($data->following) == "true");
+ else
+ $following = true;
- if($contact) {
+ if (isset($data->sharing))
+ $sharing = (unxmlify($data->sharing) == "true");
+ else
+ $sharing = true;
- // perhaps we were already sharing with this person. Now they're sharing with us.
- // That makes us friends.
+ $contact = self::contact_by_handle($importer["uid"],$author);
- self::receive_request_make_friend($importer, $contact);
- return true;
+ // perhaps we were already sharing with this person. Now they're sharing with us.
+ // That makes us friends.
+ if ($contact) {
+ if ($following AND $sharing) {
+ self::receive_request_make_friend($importer, $contact);
+ return true;
+ } else /// @todo Handle all possible variations of adding and retracting of permissions
+ return false;
+ }
+
+ if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
+ logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
+ return false;
+ } 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;
}
$ret = self::person_by_handle($author);
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
// we are going to change the relationship and make them a follower.
- if($importer["page-flags"] == PAGE_FREELOVE)
+ if (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing AND $following)
$new_relation = CONTACT_IS_FRIEND;
+ elseif (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing)
+ $new_relation = CONTACT_IS_SHARING;
else
$new_relation = CONTACT_IS_FOLLOWER;
}
/**
- * @brief
+ * @brief Fetches a message with a given guid
*
* @param string $guid message guid
- * @param $orig_author
- * @param $author
+ * @param string $orig_author handle of the original post
+ * @param string $author handle of the sharer
*
- * @return
+ * @return array The fetched item
*/
private function original_item($guid, $orig_author, $author) {
logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
- // Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares
- if (self::is_reshare($r[0]["body"], false))
+ // 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))
$r = array();
- else
+ elseif (self::is_reshare($r[0]["body"], false)) {
+ $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+
+ // 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
return $r[0];
}
}
/**
- * @brief
+ * @brief Processes a reshare message
*
* @param array $importer Array of the importer user
* @param object $data The message object
* @param string $xml The original XML of the message
*
- * @return
+ * @return int the message id
*/
private function receive_reshare($importer, $data, $xml) {
$root_author = notags(unxmlify($data->root_author));
if (!$contact)
return false;
- if (self::message_exists($importer["uid"], $guid))
- return false;
+ $message_id = self::message_exists($importer["uid"], $guid);
+ if ($message_id)
+ return $message_id;
$original_item = self::original_item($root_guid, $root_author, $author);
if (!$original_item)
}
/**
- * @brief
+ * @brief Processes retractions
*
* @param array $importer Array of the importer user
- * @param array $contact The contact that is checked
+ * @param array $contact The contact of the item owner
* @param object $data The message object
*
- * @return
+ * @return bool success
*/
private function item_retraction($importer, $contact, $data) {
$target_type = notags(unxmlify($data->target_type));
// notify others
proc_run("php", "include/notifier.php", "drop", $r[0]["id"]);
}
+
+ return true;
}
/**
- * @brief
+ * @brief Receives retraction messages
*
* @param array $importer Array of the importer user
* @param string $sender The sender of the message
* @param object $data The message object
*
- * @return
+ * @return bool Success
*/
private function receive_retraction($importer, $sender, $data) {
$target_type = notags(unxmlify($data->target_type));
}
/**
- * @brief
+ * @brief Receives status messages
*
* @param array $importer Array of the importer user
* @param object $data The message object
* @param string $xml The original XML of the message
*
- * @return
+ * @return int The message id of the newly created item
*/
private function receive_status_message($importer, $data, $xml) {
if (!$contact)
return false;
- if (self::message_exists($importer["uid"], $guid))
- return false;
+ $message_id = self::message_exists($importer["uid"], $guid);
+ if ($message_id)
+ return $message_id;
$address = array();
if ($data->location)
$datarray = array();
+ // Attach embedded pictures to the body
if ($data->photo) {
foreach ($data->photo AS $photo)
$body = "[img]".unxmlify($photo->remote_photo_path).
return $message_id;
}
- /******************************************************************************************
+ /* ************************************************************************************** *
* Here are all the functions that are needed to transmit data with the Diaspora protocol *
- ******************************************************************************************/
+ * ************************************************************************************** */
/**
- * @brief
+ * @brief returnes the handle of a contact
*
- * @param $me
+ * @param array $me contact array
*
- * @return
+ * @return string the handle in the format user@domain.tld
*/
- private function my_handle($me) {
+ private 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.
- return $me["nickname"]."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
+ if ($contact["nickname"] != "")
+ $nick = $contact["nickname"];
+ else
+ $nick = $contact["nick"];
+
+ return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
}
/**
- * @brief
+ * @brief Creates the envelope for a public message
*
- * @param $msg
- * @param $user
- * @param array $contact The contact that is checked
- * @param $prvkey
- * @param $pubkey
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
+ * @param array $contact Target of the communication
+ * @param string $prvkey The private key of the sender
+ * @param string $pubkey The public key of the receiver
*
- * @return
+ * @return string The envelope
*/
private function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
}
/**
- * @brief
+ * @brief Creates the envelope for a private message
*
- * @param $msg
- * @param $user
- * @param array $contact The contact that is checked
- * @param $prvkey
- * @param $pubkey
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
+ * @param array $contact Target of the communication
+ * @param string $prvkey The private key of the sender
+ * @param string $pubkey The public key of the receiver
*
- * @return
+ * @return string The envelope
*/
private function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
}
/**
- * @brief
+ * @brief Create the envelope for a message
*
- * @param $msg
- * @param $user
- * @param array $contact The contact that is checked
- * @param $prvkey
- * @param $pubkey
- * @param $public
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
+ * @param array $contact Target of the communication
+ * @param string $prvkey The private key of the sender
+ * @param string $pubkey The public key of the receiver
+ * @param bool $public Is the message public?
*
- * @return
+ * @return string The message that will be transmitted to other servers
*/
private function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
}
/**
- * @brief
+ * @brief Creates a signature for a message
*
- * @param array $owner the array of the item owner
- * @param $message
+ * @param array $owner the array of the owner of the message
+ * @param array $message The message that is to be signed
*
- * @return
+ * @return string The signature
*/
private function signature($owner, $message) {
$sigmsg = $message;
}
/**
- * @brief
+ * @brief Transmit a message to a target server
*
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
- * @param $slap
+ * @param array $contact Target of the communication
+ * @param string $slap The message that is to be transmitted
* @param bool $public_batch Is it a public post?
- * @param $queue_run
+ * @param bool $queue_run Is the transmission called from the queue?
* @param string $guid message guid
*
- * @return
+ * @return int Result of the transmission
*/
public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") {
/**
- * @brief
+ * @brief Builds and transmit messages
*
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
- * @param $type
- * @param $message
+ * @param array $contact Target of the communication
+ * @param string $type The message type
+ * @param array $message The message data
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
- * @param $spool
+ * @param bool $spool Should the transmission be spooled or transmitted?
*
- * @return
+ * @return int Result of the transmission
*/
private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
}
/**
- * @brief
+ * @brief Sends a "share" message
*
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
*
* @return int The result of the transmission
*/
}
/**
- * @brief
+ * @brief sends an "unshare"
*
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
*
* @return int The result of the transmission
*/
}
/**
- * @brief
+ * @brief Checks a message body if it is a reshare
*
- * @param $body
- * @param $complete
+ * @param string $body The message body that is to be check
+ * @param bool $complete Should it be a complete check or a simple check?
*
- * @return
+ * @return array|bool Reshare details or "false" if no reshare
*/
public static function is_reshare($body, $complete = true) {
$body = trim($body);
$link = $matches[1];
$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
- if (($ret["root_guid"] == $link) OR ($ret["root_guid"] == ""))
+ if (($ret["root_guid"] == $link) OR (trim($ret["root_guid"]) == ""))
return(false);
+
return($ret);
}
/**
- * @brief
+ * @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 The contact that is checked
+ * @param array $contact Target of the communication
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
}
/**
- * @brief
+ * @brief Creates a "like" object
*
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
- * @return
+ * @return array The data for a "like"
*/
private function construct_like($item, $owner) {
"guid" => $item["guid"],
"target_type" => $target_type,
"parent_guid" => $parent["guid"],
- "author_signature" => $authorsig,
+ "author_signature" => "",
"diaspora_handle" => self::my_handle($owner)));
}
/**
- * @brief
+ * @brief Creates the object for a comment
*
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
- * @return
+ * @return array The data for a comment
*/
private function construct_comment($item, $owner) {
*
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
}
/**
- * @brief
+ * @brief Creates a message from a signature record entry
*
* @param array $item The item that will be exported
- * @param $signature
+ * @param array $signature The entry of the "sign" record
*
- * @return int The result of the transmission
+ * @return string The message
*/
- private function message_from_signatur($item, $signature) {
+ private function message_from_signature($item, $signature) {
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);
}
/**
- * @brief
+ * @brief Relays messages (like, comment, retraction) to other servers if we are the thread owner
*
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
// Old way - is used by the internal Friendica functions
/// @todo Change all signatur storing functions to the new format
if ($signature['signed_text'] AND $signature['signature'] AND $signature['signer'])
- $message = self::message_from_signatur($item, $signature);
+ $message = self::message_from_signature($item, $signature);
else {// New way
$msg = json_decode($signature['signed_text'], true);
}
/**
- * @brief
+ * @brief Sends a retraction (deletion) of a message, like or comment
*
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
* @param bool $public_batch Is it a public post?
- * @param $relay
+ * @param bool $relay Is the retraction transmitted from a relay?
*
* @return int The result of the transmission
*/
}
/**
- * @brief
+ * @brief Sends a mail
*
* @param array $item The item that will be exported
* @param array $owner The owner
- * @param array $contact The contact that is checked
+ * @param array $contact Target of the communication
*
* @return int The result of the transmission
*/
}
/**
- * @brief
+ * @brief Sends profile data
*
* @param int $uid The user id
- *
- * @return int The result of the transmission
*/
public static function send_profile($uid) {
foreach($recips as $recip)
self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
}
+
+ /**
+ * @brief Stores the signature for likes that are created on our system
+ *
+ * @param array $contact The contact array of the "like"
+ * @param int $post_id The post id of the "like"
+ *
+ * @return bool Success
+ */
+ public static function store_like_signature($contact, $post_id) {
+
+ $enabled = intval(get_config('system','diaspora_enabled'));
+ if (!$enabled) {
+ logger('Diaspora support disabled, not storing like signature', LOGGER_DEBUG);
+ return false;
+ }
+
+ // Is the contact the owner? Then fetch the private key
+ if (!$contact['self'] OR ($contact['uid'] == 0)) {
+ logger("No owner post, so not storing signature", LOGGER_DEBUG);
+ return false;
+ }
+
+ $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
+ if(!$r)
+ return false;
+
+ $contact["uprvkey"] = $r[0]['prvkey'];
+
+ $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
+ if (!$r)
+ return false;
+
+ 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"])
+ );
+
+ // 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;
+ }
+
+ /**
+ * @brief Stores the signature for comments that are created on our system
+ *
+ * @param array $item The item array of the comment
+ * @param array $contact The contact array of the item owner
+ * @param string $uprvkey The private key of the sender
+ * @param int $message_id The message id of the comment
+ *
+ * @return bool Success
+ */
+ public static function store_comment_signature($item, $contact, $uprvkey, $message_id) {
+
+ if ($uprvkey == "") {
+ logger('No private key, so not storing comment signature', LOGGER_DEBUG);
+ return false;
+ }
+
+ $enabled = intval(get_config('system','diaspora_enabled'));
+ if (!$enabled) {
+ logger('Diaspora support disabled, not storing comment signature', LOGGER_DEBUG);
+ return false;
+ }
+
+ $contact["uprvkey"] = $uprvkey;
+
+ $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')",
+ intval($message_id),
+ dbesc($signed_text),
+ dbesc($message["author_signature"]),
+ dbesc($message["diaspora_handle"])
+ );
+
+ // 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;
+ }
}
?>
projects / friendica.git / blobdiff