"unsharing" is now done different

This commit is contained in:
Michael 2017-06-16 16:39:17 +00:00
parent 5a11ef5b90
commit c031482d7d

View file

@ -3001,9 +3001,15 @@ class Diaspora {
* *
* @return int The result of the transmission * @return int The result of the transmission
*/ */
public static function send_share($owner,$contact) { public static function send_share($owner, $contact) {
/// @todo support the different possible combinations of "following" and "sharing" /// @todo support the different possible combinations of "following" and "sharing"
/*
if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
$new_relation = CONTACT_IS_FRIEND;
$new_relation = CONTACT_IS_SHARING;
$new_relation = CONTACT_IS_FOLLOWER;
*/
$message = array("author" => self::my_handle($owner), $message = array("author" => self::my_handle($owner),
"recipient" => $contact["addr"], "recipient" => $contact["addr"],
"following" => "true", "following" => "true",
@ -3022,15 +3028,16 @@ class Diaspora {
* *
* @return int The result of the transmission * @return int The result of the transmission
*/ */
public static function send_unshare($owner,$contact) { public static function send_unshare($owner, $contact) {
$message = array("author" => self::my_handle($owner), $message = array("author" => self::my_handle($owner),
"target_guid" => $owner["guid"], "recipient" => $contact["addr"],
"target_type" => "Person"); "following" => "false",
"sharing" => "false");
logger("Send unshare ".print_r($message, true), LOGGER_DEBUG); logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
return self::build_and_transmit($owner, $contact, "retraction", $message); return self::build_and_transmit($owner, $contact, "contact", $message);
} }
/** /**