Improved fetching of attached activities

diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
index c331590b55047a28cd1ff9b9b730e9dbff6c7df4..3973690c006ec0db1f145feb00e4877d4e615bba 100644 (file)
--- a/src/Factory/Api/Mastodon/Status.php
+++ b/src/Factory/Api/Mastodon/Status.php
@@ -323,8 +323,13 @@ class Status extends BaseFactory
        {
                if (empty($item['quote-uri-id'])) {
                        $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
-                       if (!empty($media) && $shared_item = Post::selectFirst(['uri-id'], ['plink' => $media[0]['url'], 'uid' => [$uid, 0]])) {
-                               $quote_id = $shared_item['uri-id'];
+                       if (!empty($media)) {
+                               if (!empty($media['media-uri-id'])) {
+                                       $quote_id = $media['media-uri-id'];
+                               } else {
+                                       $shared_item = Post::selectFirst(['uri-id'], ['plink' => $media[0]['url'], 'uid' => [$uid, 0]]);
+                                       $quote_id = $shared_item['uri-id'] ?? 0;
+                               }
                        }
                } else {
                        $quote_id = $item['quote-uri-id'];

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8479c1a6d266cf46667ea7e071167e15713c7d26..a730404ed4f40a05e7b1d9fe4dcb9b0fd8592e9b 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3044,7 +3044,12 @@ class Item
                } elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id']) && ($item['network'] != Protocol::DIASPORA)) {
                        $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
                        if (!empty($media)) {
-                               $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+                               $shared_item = Post::selectFirst($fields, ['uri-id' => $media[0]['media-uri-id'], 'uid' => [$item['uid'], 0]]);
+                               if (empty($shared_item['uri-id'])) {
+                                       $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+                               } elseif (strtolower($shared['post']['uri']) != strtolower($media[0]['url'])) {
+                                       $shared_links[] = strtolower($media[0]['url']);
+                               }
 
                                if (empty($shared_item['uri-id'])) {
                                        $shared_item = Post::selectFirst($fields, ['uri' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);

diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index 1283b7cf342d90afe84ce29fce38be93bc466faa..988fd652e4e828c51590eb53b3f8d917d30a61be 100644 (file)
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -222,7 +222,7 @@ class Upload extends \Friendica\BaseModule
                }
 
                $this->logger->info('upload done');
-               $this->return(200, "\n\n" . '[url=' . $this->baseUrl . '/photos/' . $owner['nickname'] . '/image/' . $resource_id . '][img]' . $this->baseUrl . "/photo/$resource_id-$smallest." . $image->getExt() . "[/img][/url]\n\n");
+               $this->return(200, "\n\n" . '[url=' . $this->baseUrl . '/photos/' . $owner['nickname'] . '/image/' . $resource_id . '][img=' . $this->baseUrl . "/photo/$resource_id-$smallest." . $image->getExt() . "][/img][/url]\n\n");
        }
 
        /**