Merge pull request #5722 from annando/dissolve

Restore the behaviour to remove the remote contact upon termination

mod/contacts.php

@@ -368,7 +368,7 @@ function _contact_drop($orig_record)
 		return;
 	}
 
-	Contact::terminateFriendship($r[0], $orig_record);
+	Contact::terminateFriendship($r[0], $orig_record, true);
 	Contact::remove($orig_record['id']);
 }
 

mod/dfrn_notify.php

@@ -322,8 +322,8 @@ function dfrn_notify_content(App $a) {
 		$encrypted_id = '';
 		$id_str       = $my_id . '.' . mt_rand(1000,9999);
 
-		$prv_key = trim($importer['prvkey']);
+		$prv_key = trim($importer['cprvkey']);
-		$pub_key = trim($importer['pubkey']);
+		$pub_key = trim($importer['cpubkey']);
 		$dplx    = intval($importer['duplex']);
 
 		if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {

mod/dirfind.php

@@ -44,7 +44,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 	$local = Config::get('system','poco_local_search');
 
-	$search = $prefix.notags(trim($_REQUEST['search']));
+	$search = $prefix.notags(trim(defaults($_REQUEST, 'search', '')));
 
 	$header = '';
 

mod/unfollow.php

@@ -46,13 +46,15 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
+	$dissolve = ($contact['rel'] == Contact::SHARING);
+
 	$owner = User::getOwnerDataById($uid);
 	if ($owner) {
-		Contact::terminateFriendship($owner, $contact);
+		Contact::terminateFriendship($owner, $contact, $dissolve);
 	}
 
 	// Sharing-only contacts get deleted as there no relationship any more
-	if ($contact['rel'] == Contact::SHARING) {
+	if ($dissolve) {
 		Contact::remove($contact['id']);
 		$return_path = 'contacts';
 	} else {

src/Model/Contact.php

@@ -17,6 +17,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
@@ -530,11 +531,14 @@ class Contact extends BaseObject
 	 *
 	 * @param array   $user     User unfriending
 	 * @param array   $contact  Contact unfriended
+	 * @param boolean $dissolve Remove the contact on the remote side
 	 * @return void
 	 */
-	public static function terminateFriendship(array $user, array $contact)
+	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
-		if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+			DFRN::deliver($user, $contact, 'placeholder', true);
+		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
 			// create an unfollow slap
 			$item = [];
 			$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";

src/Protocol/DFRN.php

@@ -82,6 +82,7 @@ class DFRN
 			}
 
 			$user['importer_uid'] = $user['uid'];
+			$user['uprvkey'] = $user['prvkey'];
 		} else {
 			$user = ['importer_uid' => 0, 'uprvkey' => '', 'timezone' => 'UTC',
 				'nickname' => '', 'sprvkey' => '', 'spubkey' => '',
@@ -1168,11 +1169,13 @@ class DFRN
 		$a = get_app();
 
 		// At first try the Diaspora transport layer
+		if (!$dissolve) {
 			$ret = self::transmit($owner, $contact, $atom);
 			if ($ret >= 200) {
 				logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
 				return $ret;
 			}
+		}
 
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 

src/Worker/Notifier.php

@@ -96,7 +96,7 @@ class Notifier
 				return;
 			}
 			foreach ($r as $contact) {
-				Contact::terminateFriendship($user, $contact);
+				Contact::terminateFriendship($user, $contact, true);
 			}
 			return;
 		} elseif ($cmd == Delivery::RELOCATION) {