Issue 10651: remote comments appeared as own posts

diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index 17f664baf8c8a1c29ff743439ff64430541de541..ff4a3ac8da92333b364467d18dfe8ff3fed89b31 100644 (file)
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -51,7 +51,8 @@ class Fetch extends BaseModule
                        'uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'received', 'app', 'location', 'coord', 'network',
                        'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'uri-id'
                ];
-               $condition = ['wall' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+               $condition = ['origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid,
+                       'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
                $item = Post::selectFirst($fields, $condition);
                if (empty($item)) {
                        $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
@@ -78,7 +79,12 @@ class Fetch extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               $status = Diaspora::buildStatus($item, $user);
+               if ($item['gravity'] == GRAVITY_PARENT) {
+                       $status = Diaspora::buildStatus($item, $user);
+               } else {
+                       $status = Diaspora::constructComment($item, $user);
+               }
+
                $xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
                // Send the envelope

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 48d7a3371cbfd49c62700b2da5fd30701f940213..f4dc997e6276266300d52621c13ff0a77df089f2 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3614,7 +3614,7 @@ class Diaspora
         * @return array|false The data for a comment
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function constructComment(array $item, array $owner)
+       public static function constructComment(array $item, array $owner)
        {
                $cachekey = "diaspora:constructComment:".$item['guid'];