Merge pull request #11289 from tobiasd/20220302-hu

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a307c4d6e683594d3fd61ec4a97502816276bd1a..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
@@ -122,8 +122,7 @@ function unfollow_process(string $url)
 
        $owner = User::getOwnerDataById($uid);
        if (!$owner) {
-               \Friendica\Module\Security\Logout::init();
-               // NOTREACHED
+               throw new \Friendica\Network\HTTPException\NotFoundException();
        }
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
@@ -137,27 +136,13 @@ function unfollow_process(string $url)
                // NOTREACHED
        }
 
-       $dissolve = ($contact['rel'] == Contact::SHARING);
-
-       $notice_message = '';
        $return_path = $base_return_path . '/' . $contact['id'];
 
        try {
-               $result = 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.');
-               }
-
-               if ($result === true) {
-                       $notice_message = DI::l10n()->t('Contact was successfully unfollowed');
-               }
+               Contact::unfollow($contact);
+               $notice_message = DI::l10n()->t('Contact was successfully unfollowed');
        } catch (Exception $e) {
-               DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact, 'dissolve' => $dissolve]);
+               DI::logger()->error($e->getMessage(), ['contact' => $contact]);
                $notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator');
        }