From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 19 Jun 2020 11:10:39 +0000 (-0400)
Subject: Use Contact::getDetailsByURL instead of custom query in Protocol\OStatus
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a83681e93adb4162ad0bece6dff8177ae13cccf3;p=friendica.git

Use Contact::getDetailsByURL instead of custom query in Protocol\OStatus

- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-646457104
---

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 411bdd63cb..a2181beeb3 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -2087,10 +2087,9 @@ class OStatus
 		$mentioned = $newmentions;
 
 		foreach ($mentioned as $mention) {
-			$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)];
-			$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
-			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
-				($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) {
+			$contact = Contact::getDetailsByURL($mention, $owner['uid']);
+			if (!empty($contact) && ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
+				($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)))) {
 				XML::addElement($doc, $entry, "link", "",
 					[
 						"rel" => "mentioned",