From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 13 Dec 2020 17:16:04 +0000 (-0500)
Subject: Simplify Contact::addRelationship call in ActivityPub\Processor::followUser
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8f10cf8e53a8f5583b9c5db0259a204a641d0864;p=friendica.git

Simplify Contact::addRelationship call in ActivityPub\Processor::followUser

- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743382769
---

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 8f89b17f80..088a10e908 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -903,20 +903,15 @@ class Processor
 		if (!empty($cid)) {
 			self::switchContact($cid);
 			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
-			$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
-		} else {
-			$contact = [];
 		}
 
 		$item = ['author-id' => Contact::getIdForURL($activity['actor']),
 			'author-link' => $activity['actor']];
 
-		$note = Strings::escapeTags(trim($activity['content'] ?? ''));
-
 		// Ensure that the contact has got the right network type
 		self::switchContact($item['author-id']);
 
-		$result = Contact::addRelationship($owner, $contact, $item, false, $note);
+		$result = Contact::addRelationship($owner, [], $item, false, $activity['content'] ?? '');
 		if ($result === true) {
 			ActivityPub\Transmitter::sendContactAccept($item['author-link'], $activity['id'], $owner['uid']);
 		}