From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 21:53:23 +0000 (-0400)
Subject: Prevent unfollowing contacts from networks not supported natively
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=92c4ca091193e571d76a9db7b2d4078e2b3dc473;p=friendica.git

Prevent unfollowing contacts from networks not supported natively
---

diff --git a/mod/unfollow.php b/mod/unfollow.php
index f82796a6b7..30aca5688e 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -39,20 +39,18 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
-	if ($contact['network'] == Protocol::STATUSNET) {
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
 		goaway($return_url);
 		// NOTREACHED
 	}
 
-	if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
-		$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-			intval($uid)
-		);
-		if (DBA::isResult($r)) {
-			Contact::terminateFriendship($r[0], $contact);
-		}
+	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
+		WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
+		intval($uid)
+	);
+	if (DBA::isResult($r)) {
+		Contact::terminateFriendship($r[0], $contact);
 	}
 
 	// Sharing-only contacts get deleted as there no relationship any more
@@ -92,7 +90,7 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	if ($contact['network'] == Protocol::STATUSNET) {
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
 		goaway('contacts/' . $contact['id']);
 		// NOTREACHED