messages.po and and corrected typo in comment

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

diff --git a/src/Content/Item.php b/src/Content/Item.php
index f226867ec8cb211b1d9e64ef84d72ae7c8a001da..4fb1f85d6245f66646e3fc991ef0678ef20a3a6a 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -37,7 +37,6 @@ use Friendica\Model\Photo;
 use Friendica\Model\Tag;
 use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
 use Friendica\Util\Profiler;
 use Friendica\Util\Proxy;
 use Friendica\Util\XML;
@@ -346,7 +345,7 @@ class Item
                        'url' => $item['author-link'],
                ];
                $profile_link = Contact::magicLinkByContact($author, $item['author-link']);
-               $sparkle = (strpos($profile_link, 'redir/') === 0);
+               $sparkle = (strpos($profile_link, 'contact/redir/') === 0);
 
                $cid = 0;
                $pcid = $item['author-id'];
@@ -362,7 +361,7 @@ class Item
 
                if ($sparkle) {
                        $status_link = $profile_link . '/status';
-                       $photos_link = str_replace('/profile/', '/photos/', $profile_link);
+                       $photos_link = $profile_link . '/photos';
                        $profile_link = $profile_link . '/profile';
                }
 
@@ -401,7 +400,7 @@ class Item
 
                        if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
                                in_array($item['network'], Protocol::FEDERATED)) {
-                               $menu[$this->l10n->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']) . '&auto=1';
+                               $menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1';
                        }
                } else {
                        $menu = [$this->l10n->t('View Profile') => $item['author-link']];
@@ -590,14 +589,14 @@ class Item
                        return $body;
                }
 
-               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
+               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'quote-uri-id'];
                $shared_item = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [$item['uid'], 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
                if (!DBA::isResult($shared_item)) {
                        Logger::notice('Post does not exist.', ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid']]);
                        return $body;
                }
 
-               return $body . "\n" . $this->createSharedBlockByArray($shared_item, true);
+               return trim(BBCode::removeSharedData($body) . "\n" . $this->createSharedBlockByArray($shared_item, true));
        }
 
        /**
@@ -651,10 +650,13 @@ class Item
 
                // If it is a reshared post then reformat it to avoid display problems with two share elements
                if (!empty($shared)) {
-                       if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], $add_media))) {
-                               $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+                       if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
+                               if (!empty(BBCode::fetchShareAttributes($item['body']))) {
+                                       $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+                               } else {
+                                       $item['body'] .= $encaspulated_share;
+                               }
                        }
-
                        $item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
                }
 
@@ -727,7 +729,7 @@ class Item
                                        'message_id' => $shared['uri'],
                                        'comment'    => $item['body'],
                                        'shared'     => $shared['body'],
-                               ];                              
+                               ];
                        }
                }
 
@@ -735,7 +737,7 @@ class Item
        }
 
        /**
-        * Add a link to a shared post at the end of the post 
+        * Add a link to a shared post at the end of the post
         *
         * @param string  $body
         * @param integer $quote_uri_id
@@ -748,8 +750,9 @@ class Item
                        return $body;
                }
 
-               $link = $post['plink'] ?: $post['uri'];
-               $body .= "\n♲ " . $link;
+               $body = BBCode::removeSharedData($body);
+
+               $body .= "\n♲ " . ($post['plink'] ?: $post['uri']);
 
                return $body;
        }