X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=2dc9180dc940084ec7f558d90e1bbf8b24d32205;hb=2a442952b69987d578288891c064b0fed0369086;hp=6ee45b17d8adfe18932f19931d5c63bc35be6425;hpb=1cf759d4141be270062bcf262214584219902d7a;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 6ee45b17d8..2dc9180dc9 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -120,6 +120,12 @@ function unfollow_process(string $url)
 
 	$uid = local_user();
 
+	$owner = User::getOwnerDataById($uid);
+	if (!$owner) {
+		\Friendica\Module\Security\Logout::init();
+		// NOTREACHED
+	}
+
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		$uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
 		Strings::normaliseLink($url), $url];
@@ -131,27 +137,28 @@ function unfollow_process(string $url)
 		// NOTREACHED
 	}
 
-	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
-		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
-		// NOTREACHED
-	}
+	$notice_message = '';
+	$return_path = $base_return_path . '/' . $contact['id'];
 
-	$dissolve = ($contact['rel'] == Contact::SHARING);
+	try {
+		$result = Contact::terminateFriendship($owner, $contact);
 
-	$owner = User::getOwnerDataById($uid);
-	if ($owner) {
-		Contact::terminateFriendship($owner, $contact, $dissolve);
-	}
+		if ($result === null) {
+			$notice_message = DI::l10n()->t('Unfollowing is currently not supported by this contact\'s network.');
+		}
+
+		if ($result === false) {
+			$notice_message = DI::l10n()->t('Unable to unfollow this contact, please retry in a few minutes or contact your administrator.');
+		}
 
-	// Sharing-only contacts get deleted as there no relationship anymore
-	if ($dissolve) {
-		Contact::remove($contact['id']);
-		$return_path = $base_return_path;
-	} else {
-		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-		$return_path = $base_return_path . '/' . $contact['id'];
+		if ($result === true) {
+			$notice_message = DI::l10n()->t('Contact was successfully unfollowed');
+		}
+	} catch (Exception $e) {
+		DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact]);
+		$notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator');
 	}
 
+	notice($notice_message);
 	DI::baseUrl()->redirect($return_path);
 }