Use correct uri-id for attachments

diff --git a/src/Factory/Api/Twitter/Status.php b/src/Factory/Api/Twitter/Status.php
index 4a7c6c741ba722e6b14bda39c70963e29a985bd2..921f878e74524f72462a22b66ce86e184bcdbded 100644 (file)
--- a/src/Factory/Api/Twitter/Status.php
+++ b/src/Factory/Api/Twitter/Status.php
@@ -119,11 +119,9 @@ class Status extends BaseFactory
 
                $friendica_comments = Post::countPosts(['thr-parent-id' => $item['uri-id'], 'deleted' => false, 'gravity' => GRAVITY_COMMENT]);
 
-               if (!$include_entities) {
-                       $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
-               }
+               $text = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
-               $text = trim(HTML::toPlaintext(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::API), 0));
+               $text = trim(HTML::toPlaintext(BBCode::convertForUriId($item['uri-id'], $text, BBCode::API), 0));
 
                $geo = [];
 
@@ -160,7 +158,7 @@ class Status extends BaseFactory
                                $urls     = array_merge($urls, $this->url->createFromUriId($shared_uri_id, $text));
                                $mentions = array_merge($mentions, $this->mention->createFromUriId($shared_uri_id, $text));
                        } else {
-                               $attachments = array_merge($attachments, $this->attachment->createFromUriId($item['uri-id'], $text));
+                               $attachments = array_merge($attachments, $this->attachment->createFromUriId($shared_uri_id, $text));
                        }
                }