Merge pull request #11289 from tobiasd/20220302-hu

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index f1117674df8d167ccb514581aa782ed893d41461..10830bd103d29c51fb0d6f0bfb1bfa862e58bc17 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,7 +37,7 @@ function unfollow_post(App $a)
                // NOTREACHED
        }
 
-       $url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
+       $url = trim($_REQUEST['url'] ?? '');
 
        unfollow_process($url);
 }
@@ -53,7 +53,7 @@ function unfollow_content(App $a)
        }
 
        $uid = local_user();
-       $url = Strings::escapeTags(trim($_REQUEST['url']));
+       $url = trim($_REQUEST['url']);
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
                local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
@@ -67,7 +67,7 @@ function unfollow_content(App $a)
                // NOTREACHED
        }
 
-       if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+       if (!Protocol::supportsFollow($contact['network'])) {
                notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
                DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
                // NOTREACHED
@@ -120,6 +120,11 @@ function unfollow_process(string $url)
 
        $uid = local_user();
 
+       $owner = User::getOwnerDataById($uid);
+       if (!$owner) {
+               throw new \Friendica\Network\HTTPException\NotFoundException();
+       }
+
        $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 +136,16 @@ 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
-       }
-
-       $dissolve = ($contact['rel'] == Contact::SHARING);
-
-       $owner = User::getOwnerDataById($uid);
-       if ($owner) {
-               Contact::terminateFriendship($owner, $contact, $dissolve);
-       }
+       $return_path = $base_return_path . '/' . $contact['id'];
 
-       // Sharing-only contacts get deleted as there no relationship any more
-       if ($dissolve) {
-               Contact::remove($contact['id']);
-               $return_path = $base_return_path;
-       } else {
-               Contact::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-               $return_path = $base_return_path . '/' . $contact['id'];
+       try {
+               Contact::unfollow($contact);
+               $notice_message = DI::l10n()->t('Contact was successfully unfollowed');
+       } catch (Exception $e) {
+               DI::logger()->error($e->getMessage(), ['contact' => $contact]);
+               $notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator');
        }
 
+       notice($notice_message);
        DI::baseUrl()->redirect($return_path);
 }