From: Michael <heluecht@pirati.ca>
Date: Fri, 16 Mar 2018 06:58:54 +0000 (+0000)
Subject: We now change relationships not only for OStatus contacts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67fa6aa8094d131b7555456dec585096ea817d1f;p=friendica.git

We now change relationships not only for OStatus contacts
---

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 2f4edafc5d..db96729066 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -18,6 +18,12 @@ require_once 'include/event.php';
 
 function dfrn_notify_post(App $a) {
 	logger(__function__, LOGGER_TRACE);
+
+	if (empty($_POST)) {
+		require_once 'mod/salmon.php';
+		salmon_post($a);
+	}
+
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
 	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f05335cbaa..ae9c40e6ec 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -185,8 +185,6 @@ class Contact extends BaseObject
 			}
 		} elseif ($contact['network'] == NETWORK_DIASPORA) {
 			Diaspora::sendUnshare($user, $contact);
-		//} elseif ($contact['network'] === NETWORK_DFRN) {
-		//	DFRN::deliver($user, $contact, 'placeholder', 1);
 		}
 	}
 
@@ -1377,7 +1375,7 @@ class Contact extends BaseObject
 		}
 
 		if (is_array($contact)) {
-			if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+			if (($contact['rel'] == CONTACT_IS_SHARING)
 				|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
 				dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
 						['id' => $contact['id'], 'uid' => $importer['uid']]);