X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FItem.php;h=f7dda6c65f4030c24de79e24e645009a90ae3e1b;hb=8bb33dccd1d945c849c7006ee56a73fc9404323c;hp=49193627f63b37f8e8a38d0951c0f65a1f5890a6;hpb=8a50101eea4b6794d0f113b7aa6ad51d60cea13d;p=friendica.git diff --git a/src/Content/Item.php b/src/Content/Item.php index 49193627f6..f7dda6c65f 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -309,7 +309,7 @@ class Item 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link'], - 'alias' => $item['author-lias'], + 'alias' => $item['author-alias'], ]; $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]'; @@ -537,6 +537,14 @@ class Item $item['private'] = $private_group ? ItemModel::PRIVATE : ItemModel::UNLISTED; if ($only_to_group) { + $cdata = Contact::getPublicAndUserContactID($group_contact['id'], $item['uid']); + if (!empty($cdata['user'])) { + $item['owner-id'] = $cdata['user']; + unset($item['owner-link']); + unset($item['owner-name']); + unset($item['owner-avatar']); + } + $item['postopts'] = ''; } @@ -661,14 +669,15 @@ class Item * Add a share block for the given item array * * @param array $item - * @param bool $add_media + * @param bool $add_media true = Media is added to the body + * @param bool $for_display true = The share block is used for display purposes, false = used for connectors, transport to other systems, ... * @return string */ - public function createSharedBlockByArray(array $item, bool $add_media = false): string + public function createSharedBlockByArray(array $item, bool $add_media = false, bool $for_display = false): string { if ($item['network'] == Protocol::FEED) { return PageInfo::getFooterFromUrl($item['plink']); - } elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED)) { + } elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED) && !$for_display) { $item['guid'] = ''; $item['uri'] = ''; } @@ -687,7 +696,7 @@ 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']) && ($encapsulated_share = $this->createSharedPostByGuid($shared['guid'], true))) { + if (($item['network'] != Protocol::BLUESKY) && !empty($shared['guid']) && ($encapsulated_share = $this->createSharedPostByGuid($shared['guid'], true))) { if (!empty(BBCode::fetchShareAttributes($item['body']))) { $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encapsulated_share, $item['body']); } else {