Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

[friendica.git] / src / Console / Contact.php

diff --git a/src/Console/Contact.php b/src/Console/Contact.php
index cbfd4b6c6dc032a727de00f333ace9da994bec99..11f7f87ced01f35045b1803d7061d826e34981e8 100644 (file)
--- a/src/Console/Contact.php
+++ b/src/Console/Contact.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
  *
@@ -203,10 +203,6 @@ HELP;
 
                try {
                        $result = ContactModel::terminateFriendship($user, $contact);
-                       if ($result === null) {
-                               throw new RuntimeException('Unfollowing is currently not supported by this contact\'s network.');
-                       }
-
                        if ($result === false) {
                                throw new RuntimeException('Unable to unfollow this contact, please retry in a few minutes or check the logs.');
                        }
@@ -222,8 +218,6 @@ HELP;
 
        /**
         * Marks a contact for removal
-        *
-        * @return bool True, if the command was successful
         */
        private function removeContact()
        {
@@ -236,7 +230,7 @@ HELP;
                        }
                }
 
-               $result = ContactModel::remove($cid);
+               ContactModel::remove($cid);
        }
 
        /**