We now use the new account-user-view (and fixed the function name)

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 558406ddc7d474c890cea3da358cfecdced3f7c0..7669934a650b288b97e2952a0527f73e325e678a 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -111,9 +111,12 @@ class Receiver
                }
 
                $http_signer = HTTPSignature::getSigner($body, $header);
-               if (empty($http_signer)) {
+               if ($http_signer === false) {
                        Logger::warning('Invalid HTTP signature, message will be discarded.');
                        return;
+               } elseif (empty($http_signer)) {
+                       Logger::info('Signer is a tombstone. The message will be discarded, the signer account is deleted.');
+                       return;
                } else {
                        Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
                }
@@ -330,7 +333,8 @@ class Receiver
                $object_type = self::fetchObjectType($activity, $object_id, $uid);
 
                // Fetch the content only on activities where this matters
-               if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) {
+               // We can receive "#emojiReaction" when fetching content from Hubzilla systems
+               if (in_array($type, ['as:Create', 'as:Update', 'as:Announce']) || strpos($type, '#emojiReaction')) {
                        // Always fetch on "Announce"
                        $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source && ($type != 'as:Announce'), $uid);
                        if (empty($object_data)) {
@@ -498,7 +502,7 @@ class Receiver
                if (!empty($activity['from-relay'])) {
                        $object_data['from-relay'] = $activity['from-relay'];
                }
-               
+
                switch ($type) {
                        case 'as:Create':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
@@ -624,7 +628,7 @@ class Receiver
         * @param array   $activity
         * @param string  $actor
         * @param array   $tags
-        * @param boolean $fetch_unlisted 
+        * @param boolean $fetch_unlisted
         *
         * @return array with receivers (user id)
         * @throws \Exception
@@ -660,13 +664,14 @@ class Receiver
                }
 
                if (!empty($actor)) {
-                       $profile = APContact::getByURL($actor);
+                       $profile   = APContact::getByURL($actor);
                        $followers = $profile['followers'] ?? '';
-
-                       Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG);
+                       $is_forum  = ($actor['type'] ?? '') == 'Group';
+                       Logger::info('Got actor and followers', ['actor' => $actor, 'followers' => $followers]);
                } else {
                        Logger::info('Empty actor', ['activity' => $activity]);
                        $followers = '';
+                       $is_forum  = false;
                }
 
                // We have to prevent false follower assumptions upon thread completions
@@ -683,13 +688,13 @@ class Receiver
                                        $receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
                                }
 
-                               // Add receiver "-1" for unlisted posts 
+                               // Add receiver "-1" for unlisted posts
                                if ($fetch_unlisted && ($receiver == self::PUBLIC_COLLECTION) && ($element == 'as:cc')) {
                                        $receivers[-1] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
                                }
 
                                // Fetch the receivers for the public and the followers collection
-                               if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
+                               if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) {
                                        $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target);
                                        continue;
                                }
@@ -946,7 +951,7 @@ class Receiver
                                Logger::info('Empty id');
                                return false;
                        }
-       
+
                        if ($id != $object_id) {
                                Logger::info('Fetched id differs from provided id', ['provided' => $object_id, 'fetched' => $id]);
                                return false;
@@ -1108,14 +1113,6 @@ class Receiver
                                                'image' => $pageImage,
                                        ];
                                        break;
-                               case 'as:Link':
-                                       $attachlist[] = [
-                                               'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
-                                               'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
-                                               'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
-                                               'url' => JsonLD::fetchElement($attachment, 'as:href', '@id')
-                                       ];
-                                       break;
                                case 'as:Image':
                                        $mediaType = JsonLD::fetchElement($attachment, 'as:mediaType', '@value');
                                        $imageFullUrl = JsonLD::fetchElement($attachment, 'as:url', '@id');
@@ -1177,7 +1174,10 @@ class Receiver
                                                'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
                                                'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
                                                'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
-                                               'url' => JsonLD::fetchElement($attachment, 'as:url', '@id')
+                                               'url' => JsonLD::fetchElement($attachment, 'as:url', '@id'),
+                                               'height' => JsonLD::fetchElement($attachment, 'as:height', '@value'),
+                                               'width' => JsonLD::fetchElement($attachment, 'as:width', '@value'),
+                                               'image' => JsonLD::fetchElement($attachment, 'as:image', '@id')
                                        ];
                        }
                }
@@ -1233,7 +1233,7 @@ class Receiver
                if (empty($object['as:url'])) {
                        return $object_data;
                }
-               
+
                $urls = $object['as:url'];
                $keys = array_keys($urls);
                if (!is_numeric(array_pop($keys))) {
@@ -1345,8 +1345,7 @@ class Receiver
                        // Some AP software allow formatted text in post location, so we run all the text converters we have to boil
                        // down to HTML and then finally format to plaintext.
                        $location = Markdown::convert($location);
-                       $location = BBCode::convert($location);
-                       $location = HTML::toPlaintext($location);
+                       $location = BBCode::toPlaintext($location);
                }
 
                $object_data['sc:identifier'] = JsonLD::fetchElement($object, 'sc:identifier', '@value');