Normalize quote style in mode/repair_ostatus

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 1c6022a4cb4b31dce2420f33d078dd96a004cb65..6337211648c257f99ca38c71807dd905b7da3093 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -20,12 +20,12 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
 
@@ -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
@@ -84,9 +84,6 @@ function unfollow_content(App $a)
                // NOTREACHED
        }
 
-       // Makes the connection request for friendica contacts easier
-       $_SESSION['fastlane'] = $contact['url'];
-
        if (!empty($_REQUEST['auto'])) {
                unfollow_process($contact['url']);
        }
@@ -107,8 +104,7 @@ function unfollow_content(App $a)
                '$keywords_label'=> ''
        ]);
 
-       DI::page()['aside'] = '';
-       Profile::load($a, '', Contact::getByURL($contact['url'], false));
+       DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false));
 
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);
 
@@ -124,6 +120,12 @@ function unfollow_process(string $url)
 
        $uid = local_user();
 
+       $owner = User::getOwnerDataById($uid);
+       if (!$owner) {
+               (new \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];
@@ -135,27 +137,21 @@ 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);
+       $return_path = $base_return_path . '/' . $contact['id'];
 
-       $owner = User::getOwnerDataById($uid);
-       if ($owner) {
-               Contact::terminateFriendship($owner, $contact, $dissolve);
-       }
+       try {
+               $result = Contact::terminateFriendship($owner, $contact);
 
-       // Sharing-only contacts get deleted as there no relationship any more
-       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 === false) {
+                       $notice_message = DI::l10n()->t('Unable to unfollow this contact, please retry in a few minutes or contact your administrator.');
+               } else {
+                       $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);
-}
\ No newline at end of file
+}