Summary has to be converted to HTML / Don't use summary when we have the source

[friendica.git] / src / Protocol / ActivityPub / Receiver.php

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 9949577a715846172e7ae7bf7ab77742367a4ad7..5ee81302f2cf0d85a23a3601410635c646d2fa40 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -62,16 +62,16 @@ class Receiver
        {
                $http_signer = HTTPSignature::getSigner($body, $header);
                if (empty($http_signer)) {
-                       Logger::log('Invalid HTTP signature, message will be discarded.', Logger::DEBUG);
+                       Logger::warning('Invalid HTTP signature, message will be discarded.');
                        return;
                } else {
-                       Logger::log('HTTP signature is signed by ' . $http_signer, Logger::DEBUG);
+                       Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
                }
 
                $activity = json_decode($body, true);
 
                if (empty($activity)) {
-                       Logger::log('Invalid body.', Logger::DEBUG);
+                       Logger::warning('Invalid body.');
                        return;
                }
 
@@ -79,7 +79,7 @@ class Receiver
 
                $actor = JsonLD::fetchElement($ldactivity, 'as:actor');
 
-               Logger::log('Message for user ' . $uid . ' is from actor ' . $actor, Logger::DEBUG);
+               Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
 
                if (LDSignature::isSigned($activity)) {
                        $ld_signer = LDSignature::getSigner($activity);
@@ -208,7 +208,8 @@ class Receiver
                        }
                        // We had been able to retrieve the object data - so we can trust the source
                        $trust_source = true;
-               } elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
+               } elseif (in_array($type, ['as:Like', 'as:Dislike']) ||
+                       (($type == 'as:Follow') && in_array($object_type, self::CONTENT_TYPES))) {
                        // Create a mostly empty array out of the activity data (instead of the object).
                        // This way we later don't have to check for the existence of ech individual array element.
                        $object_data = self::processObject($activity);
@@ -379,21 +380,24 @@ class Receiver
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
                                        ActivityPub\Processor::updateItem($object_data);
                                } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
-                                       ActivityPub\Processor::updatePerson($object_data, $body);
+                                       ActivityPub\Processor::updatePerson($object_data);
                                }
                                break;
 
                        case 'as:Delete':
                                if ($object_data['object_type'] == 'as:Tombstone') {
-                                       ActivityPub\Processor::deleteItem($object_data, $body);
+                                       ActivityPub\Processor::deleteItem($object_data);
                                } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
-                                       ActivityPub\Processor::deletePerson($object_data, $body);
+                                       ActivityPub\Processor::deletePerson($object_data);
                                }
                                break;
 
                        case 'as:Follow':
                                if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
                                        ActivityPub\Processor::followUser($object_data);
+                               } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
+                                       $object_data['reply-to-id'] = $object_data['object_id'];
+                                       ActivityPub\Processor::createActivity($object_data, ACTIVITY_FOLLOW);
                                }
                                break;
 
@@ -503,13 +507,13 @@ class Receiver
 
                                // Check if the potential receiver is following the actor
                                // Exception: The receiver is targetted via "to" or this is a comment
-                               if ((($element != 'as:to') && empty($replyto)) || ($contact['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)) {
+                               if ((($element != 'as:to') && empty($replyto)) || ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
                                        $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
                                        $condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
                                                'network' => $networks, 'archive' => false, 'pending' => false, 'uid' => $contact['uid']];
 
                                        // Forum posts are only accepted from forum contacts
-                                       if ($contact['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
+                                       if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
                                                $condition['rel'] = [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER];
                                        }
 
@@ -576,7 +580,7 @@ class Receiver
 
                // When the possible receiver isn't a community, then it is no valid receiver
                $owner = User::getOwnerDataById($contact['uid']);
-               if (empty($owner) || ($owner['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY)) {
+               if (empty($owner) || ($owner['contact-type'] != Contact::TYPE_COMMUNITY)) {
                        return false;
                }