Issue 11875: Fetch post on activity

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index ff4791a7cca866f23d49b733dae2286c969fa646..d9bd72d7c783d981de2d8338e5773494d698911b 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1629,7 +1629,7 @@ class Item
 
                if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
                        DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
-                       !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
+                       !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) {
                        Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
                        return 0;
                }
@@ -2034,9 +2034,10 @@ class Item
         * Posts that are created on this system are using System::createUUID.
         * Received ActivityPub posts are using Processor::getGUIDByURL.
         *
-        * @param string      $uri uri of an item entry
+        * @param string      $uri  uri of an item entry
         * @param string|null $host hostname for the GUID prefix
         * @return string Unique guid
+        * @throws \Exception
         */
        public static function guidFromUri(string $uri, string $host = null): string
        {
@@ -2047,11 +2048,16 @@ class Item
                // Remove the scheme to make sure that "https" and "http" doesn't make a difference
                unset($parsed['scheme']);
 
+               $hostPart = $host ?? $parsed['host'] ?? '';
+               if (!$hostPart) {
+                       Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed, 'callstack' => System::callstack(10)]);
+               }
+
                // Glue it together to be able to make a hash from it
                $host_id = implode('/', $parsed);
 
                // Use a mixture of several hashes to provide some GUID like experience
-               return hash('crc32', $host) . '-'. hash('joaat', $host_id) . '-'. hash('fnv164', $host_id);
+               return hash('crc32', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id);
        }
 
        /**