Fixed:

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a307c4d6e683594d3fd61ec4a97502816276bd1a..8431d04d06e3ae221637fae141741118d2c4198f 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
  *
@@ -31,13 +31,13 @@ use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+       if (!DI::userSession()->getLocalUserId()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
 
-       $url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
+       $url = trim($_REQUEST['url'] ?? '');
 
        unfollow_process($url);
 }
@@ -46,29 +46,29 @@ function unfollow_content(App $a)
 {
        $base_return_path = 'contact';
 
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+       if (!DI::userSession()->getLocalUserId()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('login');
                // NOTREACHED
        }
 
-       $uid = local_user();
-       $url = Strings::escapeTags(trim($_REQUEST['url']));
+       $uid = DI::userSession()->getLocalUserId();
+       $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),
+               DI::userSession()->getLocalUserId(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
                Strings::normaliseLink($url), $url];
 
        $contact = DBA::selectFirst('contact', ['url', 'id', 'uid', 'network', 'addr', 'name'], $condition);
 
        if (!DBA::isResult($contact)) {
-               notice(DI::l10n()->t("You aren't following this contact."));
+               DI::sysmsg()->addNotice(DI::l10n()->t("You aren't following this contact."));
                DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
 
-       if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-               notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
+       if (!Protocol::supportsFollow($contact['network'])) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
                DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
                // NOTREACHED
        }
@@ -79,7 +79,7 @@ function unfollow_content(App $a)
        $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
        if (!DBA::isResult($self)) {
-               notice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect($base_return_path);
                // NOTREACHED
        }
@@ -118,12 +118,11 @@ function unfollow_process(string $url)
 {
        $base_return_path = 'contact';
 
-       $uid = local_user();
+       $uid = DI::userSession()->getLocalUserId();
 
        $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` = ?)",
@@ -132,35 +131,21 @@ function unfollow_process(string $url)
        $contact = DBA::selectFirst('contact', [], $condition);
 
        if (!DBA::isResult($contact)) {
-               notice(DI::l10n()->t("You aren't following this contact."));
+               DI::sysmsg()->addNotice(DI::l10n()->t("You aren't following this contact."));
                DI::baseUrl()->redirect($base_return_path);
                // 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');
        }
 
-       notice($notice_message);
+       DI::sysmsg()->addNotice($notice_message);
        DI::baseUrl()->redirect($return_path);
 }