friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Everything tested, one open to-do

This commit is contained in:
Michael Vogel 2016-03-17 00:37:44 +01:00
parent e058feed28
commit 88fea17cab
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/delivery.php
View File

@ -243,7 +243,8 @@ function delivery_run(&$argv, &$argc){
if ((strlen($parent['allow_cid'])) if ((strlen($parent['allow_cid']))
|| (strlen($parent['allow_gid'])) || (strlen($parent['allow_gid']))
|| (strlen($parent['deny_cid'])) || (strlen($parent['deny_cid']))
|| (strlen($parent['deny_gid']))) { || (strlen($parent['deny_gid']))
|| $parent["private"]) {
$public_message = false; // private recipients, not public $public_message = false; // private recipients, not public
} }

40
include/diaspora.php
View File

@ -10,6 +10,11 @@
* - send comment * - send comment
* - send like * - send like
* - send mail * - send mail
* - send status retraction
* - send comment retraction on own post
* - send comment retraction on diaspora post
* - send like retraction on own post
* - send like retraction on diaspora post
* - receive status * - receive status
* - receive reshare * - receive reshare
* - receive comment * - receive comment
@ -17,21 +22,21 @@
* - receive connect request * - receive connect request
* - receive profile data * - receive profile data
* - receive mail * - receive mail
* - receive comment retraction
* - receive like retraction
* - relay comment * - relay comment
* - relay like * - relay like
* - * - relay comment retraction from diaspora
* - * - relay comment retraction from friendica
* - relay like retraction from diaspora
* - relay like retraction from friendica
* *
* Unchecked: * Should work:
* - receive account deletion * - receive account deletion
* - send share * - send share
* - send unshare * - send unshare
* - send status retraction *
* - send comment retraction * Unchecked:
* - send like retraction
* - relay comment retraction
* - relay like retraction
* -
*/ */
require_once("include/items.php"); require_once("include/items.php");
@ -2394,7 +2399,10 @@ class diaspora {
intval($item["id"])); intval($item["id"]));
if (!$r) { if (!$r) {
logger("Couldn't fetch signatur for contact ".$contact["addr"]." at item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG); if ($item["deleted"])
return self::send_retraction($item, $owner, $contact, $public_batch);
logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
return false; return false;
} }
@ -2436,6 +2444,9 @@ class diaspora {
public static function send_retraction($item, $owner, $contact, $public_batch = false) { public static function send_retraction($item, $owner, $contact, $public_batch = false) {
/// @todo Fetch handle from every contact (via gcontact)
$itemaddr = self::handle_from_contact($item["contact-id"]);
$myaddr = self::my_handle($owner); $myaddr = self::my_handle($owner);
// Check whether the retraction is for a top-level post or whether it's a relayable // Check whether the retraction is for a top-level post or whether it's a relayable
@ -2451,9 +2462,16 @@ class diaspora {
$message = array("target_guid" => $item['guid'], $message = array("target_guid" => $item['guid'],
"target_type" => $target_type, "target_type" => $target_type,
"sender_handle" => $myaddr, "sender_handle" => $itemaddr,
"target_author_signature" => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))); "target_author_signature" => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')));
if ($itemaddr != $myaddr) {
$message["parent_author_signature"] = $message["target_author_signature"];
unset($message["target_author_signature"]);
}
logger("Got message ".print_r($message, true), LOGGER_DEBUG);
return self::build_and_transmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]); return self::build_and_transmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
} }