X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FContact.php;h=a80b88349a157bc99bfca55bbc720be1fbb74061;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=ae0a9b11ad23cc58bfb7e93a9248caeaa802e339;hpb=5028258c3b7485cced4405b8a80f0754854a5606;p=friendica.git

diff --git a/src/Console/Contact.php b/src/Console/Contact.php
index ae0a9b11ad..a80b88349a 100644
--- 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-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -76,7 +76,7 @@ HELP;
 		$this->appMode = $appMode;
 	}
 
-	protected function doExecute()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Class: ' . __CLASS__);
@@ -157,7 +157,7 @@ HELP;
 
 		$url = Probe::cleanURI($url);
 
-		$contact = ContactModel::getByURLForUser($url, $user['uid']);
+		$contact = ContactModel::getByURL($url, null, [], $user['uid']);
 		if (!empty($contact)) {
 			throw new RuntimeException('Contact already exists');
 		}
@@ -199,19 +199,18 @@ HELP;
 			throw new RuntimeException('Contact not found');
 		}
 
-		$user = UserModel::getById($contact['uid']);
+		if (empty($contact['uid'])) {
+			throw new RuntimeException('Contact must be user-specific (uid != 0)');
+		}
 
 		try {
-			$result = ContactModel::terminateFriendship($user, $contact);
-			if ($result === false) {
-				throw new RuntimeException('Unable to unfollow this contact, please retry in a few minutes or check the logs.');
-			}
+			ContactModel::unfollow($contact);
 
 			$this->out('Contact was successfully unfollowed');
 
 			return true;
 		} catch (\Exception $e) {
-			DI::logger()->error($e->getMessage(), ['owner' => $user, 'contact' => $contact]);
+			DI::logger()->error($e->getMessage(), ['contact' => $contact]);
 			throw new RuntimeException('Unable to unfollow this contact, please check the log');
 		}
 	}