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 8f89b17f809fffa0ee44ec3c6636a3df2a304242..088a10e90845e34eef8fd9df66a7644adee558e4 100644 (file)
--- 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']);
                }