]> git.mxchange.org Git - friendica.git/blobdiff - src/Content/Item.php
messages.po and and corrected typo in comment
[friendica.git] / src / Content / Item.php
index f03e42a088c91b69fe87c2b8841d877553845cee..4fb1f85d6245f66646e3fc991ef0678ef20a3a6a 100644 (file)
@@ -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']];
@@ -574,57 +573,30 @@ class Item
        }
 
        /**
-        * Add a share block for the given url
+        * Add a share block for the given uri-id
         *
-        * @param string $url
-        * @param integer $uid
-        * @param bool $add_media
+        * @param array  $item
+        * @param string $body
         * @return string
         */
-       public function createSharedPostByUrl(string $url, int $uid = 0, bool $add_media = false): string
+       public function addSharedPost(array $item, string $body = ''): string
        {
-               if (!empty($uid)) {
-                       $id = ItemModel::searchByLink($url, $uid);
-               }
-
-               if (empty($id)) {
-                       $id = ItemModel::fetchByLink($url);
+               if (empty($body)) {
+                       $body = $item['body'];
                }
 
-               if (!$id) {
-                       Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid, 'callstack' => System::callstack()]);
-                       return '';
+               if (empty($item['quote-uri-id'])) {
+                       return $body;
                }
 
-               Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid, 'callstack' => System::callstack()]);
-
-               $shared_item = Post::selectFirst(['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'], ['id' => $id]);
+               $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::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]);
-                       return '';
+                       Logger::notice('Post does not exist.', ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid']]);
+                       return $body;
                }
 
-               return $this->createSharedBlockByArray($shared_item, $add_media);
-       }
-
-       /**
-        * Add a share block for the given uri-id
-        *
-        * @param integer $UriId
-        * @param integer $uid
-        * @param bool $add_media
-        * @return string
-        */
-       public function createSharedPostByUriId(int $UriId, int $uid = 0, bool $add_media = false): string
-       {
-               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
-               $shared_item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
-               if (!DBA::isResult($shared_item)) {
-                       Logger::notice('Post does not exist.', ['uri-id' => $UriId, 'uid' => $uid]);
-                       return '';
-               }
-
-               return $this->createSharedBlockByArray($shared_item, $add_media);
+               return trim(BBCode::removeSharedData($body) . "\n" . $this->createSharedBlockByArray($shared_item, true));
        }
 
        /**
@@ -635,20 +607,13 @@ class Item
         * @param bool $add_media
         * @return string
         */
-       public function createSharedPostByGuid(string $guid, int $uid = 0, string $host = '', bool $add_media = false): string
+       private function createSharedPostByGuid(string $guid, bool $add_media): string
        {
                $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
-               $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
-
-               if (!DBA::isResult($shared_item) && !empty($host) && Diaspora::storeByGuid($guid, $host, true)) {
-                       Logger::debug('Fetched post', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
-                       $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
-               } elseif (DBA::isResult($shared_item)) {
-                       Logger::debug('Found existing post', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
-               }
+               $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => 0, 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
 
                if (!DBA::isResult($shared_item)) {
-                       Logger::notice('Post does not exist.', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
+                       Logger::notice('Post does not exist.', ['guid' => $guid]);
                        return '';
                }
 
@@ -669,8 +634,9 @@ class Item
                } elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED)) {
                        $item['guid'] = '';
                        $item['uri']  = '';
-                       $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
-               } elseif ($add_media) {
+               }
+
+               if ($add_media) {
                        $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
                }
 
@@ -680,14 +646,17 @@ class Item
                        $shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
                }
 
-               $shared = ItemModel::getShareArray($item);
+               $shared = $this->getShareArray($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 = self::createSharedPostByGuid($shared['guid'], 0, '', $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));
                }
 
@@ -695,4 +664,96 @@ class Item
 
                return $shared_content;
        }
+
+       /**
+        * Return the shared post from an item array (if the item is shared item)
+        *
+        * @param array $item
+        * @param array $fields
+        *
+        * @return array with the shared post
+        */
+       public function getSharedPost(array $item, array $fields = []): array
+       {
+               if (!empty($item['quote-uri-id'])) {
+                       $shared = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [0, $item['uid'] ?? 0]]);
+                       if (is_array($shared)) {
+                               return [
+                                       'comment' => BBCode::removeSharedData($item['body'] ?? ''),
+                                       'post'    => $shared
+                               ];
+                       }
+               }
+
+               $attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
+               if (!empty($attributes)) {
+                       $shared = Post::selectFirst($fields, ['guid' => $attributes['guid'], 'uid' => [0, $item['uid'] ?? 0]]);
+                       if (is_array($shared)) {
+                               return [
+                                       'comment' => $attributes['comment'],
+                                       'post'    => $shared
+                               ];
+                       }
+               }
+
+               return [];
+       }
+
+       /**
+        * Return share data from an item array (if the item is shared item)
+        * We are providing the complete Item array, because at some time in the future
+        * we hopefully will define these values not in the body anymore but in some item fields.
+        * This function is meant to replace all similar functions in the system.
+        *
+        * @param array $item
+        *
+        * @return array with share information
+        */
+       private function getShareArray(array $item): array
+       {
+               $attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
+               if (!empty($attributes)) {
+                       return $attributes;
+               }
+
+               if (!empty($item['quote-uri-id'])) {
+                       $shared = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'body'], ['uri-id' => $item['quote-uri-id']]);
+                       if (!empty($shared)) {
+                               return [
+                                       'author'     => $shared['author-name'],
+                                       'profile'    => $shared['author-link'],
+                                       'avatar'     => $shared['author-avatar'],
+                                       'link'       => $shared['plink'],
+                                       'posted'     => $shared['created'],
+                                       'guid'       => $shared['guid'],
+                                       'message_id' => $shared['uri'],
+                                       'comment'    => $item['body'],
+                                       'shared'     => $shared['body'],
+                               ];
+                       }
+               }
+
+               return [];
+       }
+
+       /**
+        * Add a link to a shared post at the end of the post
+        *
+        * @param string  $body
+        * @param integer $quote_uri_id
+        * @return string
+        */
+       public function addShareLink(string $body, int $quote_uri_id): string
+       {
+               $post = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $quote_uri_id]);
+               if (empty($post)) {
+                       return $body;
+               }
+
+               $body = BBCode::removeSharedData($body);
+
+               $body .= "\n♲ " . ($post['plink'] ?: $post['uri']);
+
+               return $body;
+       }
 }