mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
Replace split attachment code with PostMedia objects
This commit is contained in:
parent
1052f6fde0
commit
4462ad6bf0
4 changed files with 127 additions and 212 deletions
|
@ -731,4 +731,9 @@ abstract class DI
|
||||||
{
|
{
|
||||||
return self::$dice->create(Util\Emailer::class);
|
return self::$dice->create(Util\Emailer::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function postMediaRepository(): Content\Post\Repository\PostMedia
|
||||||
|
{
|
||||||
|
return self::$dice->create(Content\Post\Repository\PostMedia::class);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
namespace Friendica\Model;
|
namespace Friendica\Model;
|
||||||
|
|
||||||
use Friendica\Contact\LocalRelationship\Entity\LocalRelationship;
|
use Friendica\Contact\LocalRelationship\Entity\LocalRelationship;
|
||||||
|
use Friendica\Content\Post\Collection\PostMedias;
|
||||||
|
use Friendica\Content\Post\Entity\PostMedia;
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use Friendica\Content\Text\HTML;
|
use Friendica\Content\Text\HTML;
|
||||||
use Friendica\Core\Hook;
|
use Friendica\Core\Hook;
|
||||||
|
@ -34,6 +36,7 @@ use Friendica\Database\DBA;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
use Friendica\Model\Post\Category;
|
use Friendica\Model\Post\Category;
|
||||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||||
|
use Friendica\Network\HTTPException\ServiceUnavailableException;
|
||||||
use Friendica\Protocol\Activity;
|
use Friendica\Protocol\Activity;
|
||||||
use Friendica\Protocol\ActivityPub;
|
use Friendica\Protocol\ActivityPub;
|
||||||
use Friendica\Protocol\Delivery;
|
use Friendica\Protocol\Delivery;
|
||||||
|
@ -3175,15 +3178,15 @@ class Item
|
||||||
if (!empty($shared_item['uri-id'])) {
|
if (!empty($shared_item['uri-id'])) {
|
||||||
$shared_uri_id = $shared_item['uri-id'];
|
$shared_uri_id = $shared_item['uri-id'];
|
||||||
$shared_links[] = strtolower($shared_item['plink']);
|
$shared_links[] = strtolower($shared_item['plink']);
|
||||||
$shared_attachments = Post\Media::splitAttachments($shared_uri_id, [], $shared_item['has-media']);
|
$sharedSplitAttachments = DI::postMediaRepository()->splitAttachments($shared_uri_id, [], $shared_item['has-media']);
|
||||||
$shared_links = array_merge($shared_links, array_column($shared_attachments['visual'], 'url'));
|
$shared_links = array_merge($shared_links, $sharedSplitAttachments['visual']->column('url'));
|
||||||
$shared_links = array_merge($shared_links, array_column($shared_attachments['link'], 'url'));
|
$shared_links = array_merge($shared_links, $sharedSplitAttachments['link']->column('url'));
|
||||||
$shared_links = array_merge($shared_links, array_column($shared_attachments['additional'], 'url'));
|
$shared_links = array_merge($shared_links, $sharedSplitAttachments['additional']->column('url'));
|
||||||
$item['body'] = self::replaceVisualAttachments($shared_attachments, $item['body']);
|
$item['body'] = self::replaceVisualAttachments($sharedSplitAttachments['visual'], $item['body']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$attachments = Post\Media::splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false);
|
$itemSplitAttachments = DI::postMediaRepository()->splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false);
|
||||||
$item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
|
$item['body'] = self::replaceVisualAttachments($itemSplitAttachments['visual'], $item['body'] ?? '');
|
||||||
|
|
||||||
self::putInCache($item);
|
self::putInCache($item);
|
||||||
$item['body'] = $body;
|
$item['body'] = $body;
|
||||||
|
@ -3208,7 +3211,7 @@ class Item
|
||||||
$filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
|
$filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$item['attachments'] = $attachments;
|
$item['attachments'] = $itemSplitAttachments;
|
||||||
|
|
||||||
$hook_data = [
|
$hook_data = [
|
||||||
'item' => $item,
|
'item' => $item,
|
||||||
|
@ -3237,11 +3240,11 @@ class Item
|
||||||
return $s;
|
return $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($shared_attachments)) {
|
if (!empty($sharedSplitAttachments)) {
|
||||||
$s = self::addGallery($s, $shared_attachments, $item['uri-id']);
|
$s = self::addGallery($s, $sharedSplitAttachments['visual'], $item['uri-id']);
|
||||||
$s = self::addVisualAttachments($shared_attachments, $shared_item, $s, true);
|
$s = self::addVisualAttachments($sharedSplitAttachments['visual'], $shared_item, $s, true);
|
||||||
$s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, $quote_shared_links);
|
$s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $sharedSplitAttachments, $body, $s, true, $quote_shared_links);
|
||||||
$s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
|
$s = self::addNonVisualAttachments($sharedSplitAttachments['additional'], $item, $s, true);
|
||||||
$body = BBCode::removeSharedData($body);
|
$body = BBCode::removeSharedData($body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3251,10 +3254,10 @@ class Item
|
||||||
$s = substr($s, 0, $pos);
|
$s = substr($s, 0, $pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
$s = self::addGallery($s, $attachments, $item['uri-id']);
|
$s = self::addGallery($s, $itemSplitAttachments['visual'], $item['uri-id']);
|
||||||
$s = self::addVisualAttachments($attachments, $item, $s, false);
|
$s = self::addVisualAttachments($itemSplitAttachments['visual'], $item, $s, false);
|
||||||
$s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
|
$s = self::addLinkAttachment($item['uri-id'], $itemSplitAttachments, $body, $s, false, $shared_links);
|
||||||
$s = self::addNonVisualAttachments($attachments, $item, $s, false);
|
$s = self::addNonVisualAttachments($itemSplitAttachments['additional'], $item, $s, false);
|
||||||
$s = self::addQuestions($item, $s);
|
$s = self::addQuestions($item, $s);
|
||||||
|
|
||||||
// Map.
|
// Map.
|
||||||
|
@ -3308,19 +3311,21 @@ class Item
|
||||||
/**
|
/**
|
||||||
* Modify links to pictures to links for the "Fancybox" gallery
|
* Modify links to pictures to links for the "Fancybox" gallery
|
||||||
*
|
*
|
||||||
* @param string $s
|
* @param string $s
|
||||||
* @param array $attachments
|
* @param PostMedias $PostMedias
|
||||||
* @param integer $uri_id
|
* @param int $uri_id
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private static function addGallery(string $s, array $attachments, int $uri_id): string
|
private static function addGallery(string $s, PostMedias $PostMedias, int $uri_id): string
|
||||||
{
|
{
|
||||||
foreach ($attachments['visual'] as $attachment) {
|
foreach ($PostMedias as $PostMedia) {
|
||||||
if (empty($attachment['preview']) || ($attachment['type'] != Post\Media::IMAGE)) {
|
if (!$PostMedia->preview || ($PostMedia->type !== Post\Media::IMAGE)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$s = str_replace('<a href="' . $attachment['url'] . '"', '<a data-fancybox="' . $uri_id . '" href="' . $attachment['url'] . '"', $s);
|
|
||||||
|
$s = str_replace('<a href="' . $PostMedia->url . '"', '<a data-fancybox="' . $uri_id . '" href="' . $PostMedia->url . '"', $s);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $s;
|
return $s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3378,30 +3383,30 @@ class Item
|
||||||
/**
|
/**
|
||||||
* Replace visual attachments in the body
|
* Replace visual attachments in the body
|
||||||
*
|
*
|
||||||
* @param array $attachments
|
* @param PostMedias $PostMedias
|
||||||
* @param string $body
|
* @param string $body
|
||||||
* @return string modified body
|
* @return string modified body
|
||||||
*/
|
*/
|
||||||
private static function replaceVisualAttachments(array $attachments, string $body): string
|
private static function replaceVisualAttachments(PostMedias $PostMedias, string $body): string
|
||||||
{
|
{
|
||||||
DI::profiler()->startRecording('rendering');
|
DI::profiler()->startRecording('rendering');
|
||||||
|
|
||||||
foreach ($attachments['visual'] as $attachment) {
|
foreach ($PostMedias as $PostMedia) {
|
||||||
if (!empty($attachment['preview'])) {
|
if ($PostMedia->preview) {
|
||||||
if (Network::isLocalLink($attachment['preview'])) {
|
if (DI::baseUrl()->isLocalUri($PostMedia->preview)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$proxy = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
|
$proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE);
|
||||||
$search = ['[img=' . $attachment['preview'] . ']', ']' . $attachment['preview'] . '[/img]'];
|
$search = ['[img=' . $PostMedia->preview . ']', ']' . $PostMedia->preview . '[/img]'];
|
||||||
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
|
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
|
||||||
|
|
||||||
$body = str_replace($search, $replace, $body);
|
$body = str_replace($search, $replace, $body);
|
||||||
} elseif ($attachment['filetype'] == 'image') {
|
} elseif ($PostMedia->mimetype->type == 'image') {
|
||||||
if (Network::isLocalLink($attachment['url'])) {
|
if (DI::baseUrl()->isLocalUri($PostMedia->url)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$proxy = Post\Media::getUrlForId($attachment['id']);
|
$proxy = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE);
|
||||||
$search = ['[img=' . $attachment['url'] . ']', ']' . $attachment['url'] . '[/img]'];
|
$search = ['[img=' . $PostMedia->url . ']', ']' . $PostMedia->url . '[/img]'];
|
||||||
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
|
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
|
||||||
|
|
||||||
$body = str_replace($search, $replace, $body);
|
$body = str_replace($search, $replace, $body);
|
||||||
|
@ -3414,12 +3419,14 @@ class Item
|
||||||
/**
|
/**
|
||||||
* Add visual attachments to the content
|
* Add visual attachments to the content
|
||||||
*
|
*
|
||||||
* @param array $attachments
|
* @param PostMedias $PostMedias
|
||||||
* @param array $item
|
* @param array $item
|
||||||
* @param string $content
|
* @param string $content
|
||||||
|
* @param bool $shared
|
||||||
* @return string modified content
|
* @return string modified content
|
||||||
|
* @throws ServiceUnavailableException
|
||||||
*/
|
*/
|
||||||
private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string
|
private static function addVisualAttachments(PostMedias $PostMedias, array $item, string $content, bool $shared): string
|
||||||
{
|
{
|
||||||
DI::profiler()->startRecording('rendering');
|
DI::profiler()->startRecording('rendering');
|
||||||
$leading = '';
|
$leading = '';
|
||||||
|
@ -3427,15 +3434,15 @@ class Item
|
||||||
$images = [];
|
$images = [];
|
||||||
|
|
||||||
// @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty.
|
// @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty.
|
||||||
foreach ($attachments['visual'] as $attachment) {
|
foreach ($PostMedias as $PostMedia) {
|
||||||
if (self::containsLink($item['body'], $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
|
if (self::containsLink($item['body'], $PostMedia->preview ?? $PostMedia->url, $PostMedia->type)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($attachment['filetype'] == 'image') {
|
if ($PostMedia->mimetype->type == 'image') {
|
||||||
$preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
|
$preview_url = DI::baseUrl() . $PostMedia->getPreviewPath($PostMedia->width > $PostMedia->height ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
|
||||||
} elseif (!empty($attachment['preview'])) {
|
} elseif ($PostMedia->preview) {
|
||||||
$preview_url = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
|
$preview_url = DI::baseUrl() . $PostMedia->getPreviewPath(Proxy::SIZE_LARGE);
|
||||||
} else {
|
} else {
|
||||||
$preview_url = '';
|
$preview_url = '';
|
||||||
}
|
}
|
||||||
|
@ -3444,15 +3451,15 @@ class Item
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($attachment['filetype'] == 'video')) {
|
if ($PostMedia->mimetype->type == 'video') {
|
||||||
/// @todo Move the template to /content as well
|
/// @todo Move the template to /content as well
|
||||||
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
|
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
|
||||||
'$video' => [
|
'$video' => [
|
||||||
'id' => $attachment['id'],
|
'id' => $PostMedia->id,
|
||||||
'src' => $attachment['url'],
|
'src' => (string)$PostMedia->url,
|
||||||
'name' => $attachment['name'] ?: $attachment['url'],
|
'name' => $PostMedia->name ?: $PostMedia->url,
|
||||||
'preview' => $preview_url,
|
'preview' => $preview_url,
|
||||||
'mime' => $attachment['mimetype'],
|
'mime' => (string)$PostMedia->mimetype,
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
|
if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
|
||||||
|
@ -3460,13 +3467,13 @@ class Item
|
||||||
} else {
|
} else {
|
||||||
$trailing .= $media;
|
$trailing .= $media;
|
||||||
}
|
}
|
||||||
} elseif ($attachment['filetype'] == 'audio') {
|
} elseif ($PostMedia->mimetype->type == 'audio') {
|
||||||
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/audio.tpl'), [
|
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/audio.tpl'), [
|
||||||
'$audio' => [
|
'$audio' => [
|
||||||
'id' => $attachment['id'],
|
'id' => $PostMedia->id,
|
||||||
'src' => $attachment['url'],
|
'src' => (string)$PostMedia->url,
|
||||||
'name' => $attachment['name'] ?: $attachment['url'],
|
'name' => $PostMedia->name ?: $PostMedia->url,
|
||||||
'mime' => $attachment['mimetype'],
|
'mime' => (string)$PostMedia->mimetype,
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
if (($item['post-type'] ?? null) == Item::PT_AUDIO) {
|
if (($item['post-type'] ?? null) == Item::PT_AUDIO) {
|
||||||
|
@ -3474,12 +3481,17 @@ class Item
|
||||||
} else {
|
} else {
|
||||||
$trailing .= $media;
|
$trailing .= $media;
|
||||||
}
|
}
|
||||||
} elseif ($attachment['filetype'] == 'image') {
|
} elseif ($PostMedia->mimetype->type == 'image') {
|
||||||
$src_url = Post\Media::getUrlForId($attachment['id']);
|
$src_url = DI::baseUrl() . $PostMedia->getPhotoPath();
|
||||||
if (self::containsLink($item['body'], $src_url)) {
|
if (self::containsLink($item['body'], $src_url)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment, 'uri_id' => $item['uri-id']];
|
|
||||||
|
$images[] = [
|
||||||
|
'src' => $src_url,
|
||||||
|
'preview' => $preview_url,
|
||||||
|
'attachment' => $PostMedia,
|
||||||
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3519,59 +3531,62 @@ class Item
|
||||||
/**
|
/**
|
||||||
* Add link attachment to the content
|
* Add link attachment to the content
|
||||||
*
|
*
|
||||||
* @param array $attachments
|
* @param int $uriid
|
||||||
* @param string $body
|
* @param PostMedias[] $attachments
|
||||||
* @param string $content
|
* @param string $body
|
||||||
* @param bool $shared
|
* @param string $content
|
||||||
* @param array $ignore_links A list of URLs to ignore
|
* @param bool $shared
|
||||||
|
* @param array $ignore_links A list of URLs to ignore
|
||||||
* @return string modified content
|
* @return string modified content
|
||||||
|
* @throws InternalServerErrorException
|
||||||
|
* @throws ServiceUnavailableException
|
||||||
*/
|
*/
|
||||||
private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links): string
|
private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links): string
|
||||||
{
|
{
|
||||||
DI::profiler()->startRecording('rendering');
|
DI::profiler()->startRecording('rendering');
|
||||||
// Don't show a preview when there is a visual attachment (audio or video)
|
// Don't show a preview when there is a visual attachment (audio or video)
|
||||||
$types = array_column($attachments['visual'], 'type');
|
$types = $attachments['visual']->column('type');
|
||||||
$preview = !in_array(Post\Media::IMAGE, $types) && !in_array(Post\Media::VIDEO, $types);
|
$preview = !in_array(PostMedia::TYPE_IMAGE, $types) && !in_array(PostMedia::TYPE_VIDEO, $types);
|
||||||
|
|
||||||
if (!empty($attachments['link'])) {
|
/** @var ?PostMedia $attachment */
|
||||||
foreach ($attachments['link'] as $link) {
|
$attachment = null;
|
||||||
$found = false;
|
foreach ($attachments['link'] as $PostMedia) {
|
||||||
foreach ($ignore_links as $ignore_link) {
|
$found = false;
|
||||||
if (Strings::compareLink($link['url'], $ignore_link)) {
|
foreach ($ignore_links as $ignore_link) {
|
||||||
$found = true;
|
if (Strings::compareLink($PostMedia->url, $ignore_link)) {
|
||||||
}
|
$found = true;
|
||||||
}
|
|
||||||
// @todo Judge between the links to use the one with most information
|
|
||||||
if (!$found && (empty($attachment) || !empty($link['author-name']) ||
|
|
||||||
(empty($attachment['name']) && !empty($link['name'])) ||
|
|
||||||
(empty($attachment['description']) && !empty($link['description'])) ||
|
|
||||||
(empty($attachment['preview']) && !empty($link['preview'])))) {
|
|
||||||
$attachment = $link;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// @todo Judge between the links to use the one with most information
|
||||||
|
if (!$found && (empty($attachment) || $PostMedia->authorName ||
|
||||||
|
(!$attachment->name && $PostMedia->name) ||
|
||||||
|
(!$attachment->description && $PostMedia->description) ||
|
||||||
|
(!$attachment->preview && $PostMedia->preview))) {
|
||||||
|
$attachment = $PostMedia;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($attachment)) {
|
if (!empty($attachment)) {
|
||||||
$data = [
|
$data = [
|
||||||
'after' => '',
|
'after' => '',
|
||||||
'author_name' => $attachment['author-name'] ?? '',
|
'author_name' => $attachment->authorName ?? '',
|
||||||
'author_url' => $attachment['author-url'] ?? '',
|
'author_url' => (string)($attachment->authorUrl ?? ''),
|
||||||
'description' => $attachment['description'] ?? '',
|
'description' => $attachment->description ?? '',
|
||||||
'image' => '',
|
'image' => '',
|
||||||
'preview' => '',
|
'preview' => '',
|
||||||
'provider_name' => $attachment['publisher-name'] ?? '',
|
'provider_name' => $attachment->publisherName ?? '',
|
||||||
'provider_url' => $attachment['publisher-url'] ?? '',
|
'provider_url' => (string)($attachment->publisherUrl ?? ''),
|
||||||
'text' => '',
|
'text' => '',
|
||||||
'title' => $attachment['name'] ?? '',
|
'title' => $attachment->name ?? '',
|
||||||
'type' => 'link',
|
'type' => 'link',
|
||||||
'url' => $attachment['url']
|
'url' => (string)$attachment->url,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($preview && !empty($attachment['preview'])) {
|
if ($preview && $attachment->preview) {
|
||||||
if ($attachment['preview-width'] >= 500) {
|
if ($attachment->previewWidth >= 500) {
|
||||||
$data['image'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
|
$data['image'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM);
|
||||||
} else {
|
} else {
|
||||||
$data['preview'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
|
$data['preview'] = DI::baseUrl() . $attachment->getPreviewPath(Proxy::SIZE_MEDIUM);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3639,19 +3654,21 @@ class Item
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add non visual attachments to the content
|
* Add non-visual attachments to the content
|
||||||
*
|
*
|
||||||
* @param array $attachments
|
* @param PostMedias $PostMedias
|
||||||
* @param array $item
|
* @param array $item
|
||||||
* @param string $content
|
* @param string $content
|
||||||
* @return string modified content
|
* @return string modified content
|
||||||
|
* @throws InternalServerErrorException
|
||||||
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
private static function addNonVisualAttachments(array $attachments, array $item, string $content): string
|
private static function addNonVisualAttachments(PostMedias $PostMedias, array $item, string $content): string
|
||||||
{
|
{
|
||||||
DI::profiler()->startRecording('rendering');
|
DI::profiler()->startRecording('rendering');
|
||||||
$trailing = '';
|
$trailing = '';
|
||||||
foreach ($attachments['additional'] as $attachment) {
|
foreach ($PostMedias as $PostMedia) {
|
||||||
if (strpos($item['body'], $attachment['url'])) {
|
if (strpos($item['body'], $PostMedia->url)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3662,16 +3679,16 @@ class Item
|
||||||
'url' => $item['author-link'],
|
'url' => $item['author-link'],
|
||||||
'alias' => $item['author-alias']
|
'alias' => $item['author-alias']
|
||||||
];
|
];
|
||||||
$the_url = Contact::magicLinkByContact($author, $attachment['url']);
|
$the_url = Contact::magicLinkByContact($author, $PostMedia->url);
|
||||||
|
|
||||||
$title = Strings::escapeHtml(trim(($attachment['description'] ?? '') ?: $attachment['url']));
|
$title = Strings::escapeHtml(trim($PostMedia->description ?? '' ?: $PostMedia->url));
|
||||||
|
|
||||||
if (!empty($attachment['size'])) {
|
if ($PostMedia->size) {
|
||||||
$title .= ' ' . $attachment['size'] . ' ' . DI::l10n()->t('bytes');
|
$title .= ' ' . $PostMedia->size . ' ' . DI::l10n()->t('bytes');
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @todo Use a template
|
/// @todo Use a template
|
||||||
$icon = '<div class="attachtype icon s22 type-' . $attachment['filetype'] . ' subtype-' . $attachment['subtype'] . '"></div>';
|
$icon = '<div class="attachtype icon s22 type-' . $PostMedia->mimetype->type . ' subtype-' . $PostMedia->mimetype->subtype . '"></div>';
|
||||||
$trailing .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';
|
$trailing .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -874,113 +874,6 @@ class Media
|
||||||
return DBA::delete('post-media', ['id' => $id]);
|
return DBA::delete('post-media', ['id' => $id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Split the attachment media in the three segments "visual", "link" and "additional"
|
|
||||||
*
|
|
||||||
* @param int $uri_id URI id
|
|
||||||
* @param array $links list of links that shouldn't be added
|
|
||||||
* @param bool $has_media
|
|
||||||
* @return array attachments
|
|
||||||
*/
|
|
||||||
public static function splitAttachments(int $uri_id, array $links = [], bool $has_media = true): array
|
|
||||||
{
|
|
||||||
$attachments = ['visual' => [], 'link' => [], 'additional' => []];
|
|
||||||
|
|
||||||
if (!$has_media) {
|
|
||||||
return $attachments;
|
|
||||||
}
|
|
||||||
|
|
||||||
$media = self::getByURIId($uri_id);
|
|
||||||
if (empty($media)) {
|
|
||||||
return $attachments;
|
|
||||||
}
|
|
||||||
|
|
||||||
$heights = [];
|
|
||||||
$selected = '';
|
|
||||||
$previews = [];
|
|
||||||
|
|
||||||
foreach ($media as $medium) {
|
|
||||||
foreach ($links as $link) {
|
|
||||||
if (Strings::compareLink($link, $medium['url'])) {
|
|
||||||
continue 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Avoid adding separate media entries for previews
|
|
||||||
foreach ($previews as $preview) {
|
|
||||||
if (Strings::compareLink($preview, $medium['url'])) {
|
|
||||||
continue 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Currently these two types are ignored here.
|
|
||||||
// Posts are added differently and contacts are not displayed as attachments.
|
|
||||||
if (in_array($medium['type'], [self::ACCOUNT, self::ACTIVITY])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($medium['preview'])) {
|
|
||||||
$previews[] = $medium['preview'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$type = explode('/', explode(';', $medium['mimetype'] ?? '')[0]);
|
|
||||||
if (count($type) < 2) {
|
|
||||||
Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]);
|
|
||||||
$filetype = 'unkn';
|
|
||||||
$subtype = 'unkn';
|
|
||||||
} else {
|
|
||||||
$filetype = strtolower($type[0]);
|
|
||||||
$subtype = strtolower($type[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$medium['filetype'] = $filetype;
|
|
||||||
$medium['subtype'] = $subtype;
|
|
||||||
|
|
||||||
if ($medium['type'] == self::HTML || (($filetype == 'text') && ($subtype == 'html'))) {
|
|
||||||
$attachments['link'][] = $medium;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
in_array($medium['type'], [self::AUDIO, self::IMAGE]) ||
|
|
||||||
in_array($filetype, ['audio', 'image'])
|
|
||||||
) {
|
|
||||||
$attachments['visual'][] = $medium;
|
|
||||||
} elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) {
|
|
||||||
if (!empty($medium['height'])) {
|
|
||||||
// Peertube videos are delivered in many different resolutions. We pick a moderate one.
|
|
||||||
// Since only Peertube provides a "height" parameter, this wouldn't be executed
|
|
||||||
// when someone for example on Mastodon was sharing multiple videos in a single post.
|
|
||||||
$heights[$medium['height']] = $medium['url'];
|
|
||||||
$video[$medium['url']] = $medium;
|
|
||||||
} else {
|
|
||||||
$attachments['visual'][] = $medium;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$attachments['additional'][] = $medium;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($heights)) {
|
|
||||||
ksort($heights);
|
|
||||||
foreach ($heights as $height => $url) {
|
|
||||||
if (empty($selected) || $height <= 480) {
|
|
||||||
$selected = $url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($selected)) {
|
|
||||||
$attachments['visual'][] = $video[$selected];
|
|
||||||
unset($video[$selected]);
|
|
||||||
foreach ($video as $element) {
|
|
||||||
$attachments['additional'][] = $element;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $attachments;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add media attachments to the body
|
* Add media attachments to the body
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{{if $image.preview}}
|
{{if $image.preview}}
|
||||||
<a data-fancybox="{{$image.uri_id}}" href="{{$image.attachment.url}}"><img src="{{$image.preview}}" alt="{{$image.attachment.description}}" title="{{$image.attachment.description}}" loading="lazy"></a>
|
<a data-fancybox="{{$image.attachment->uriId}}" href="{{$image.attachment->url}}"><img src="{{$image.preview}}" alt="{{$image.attachment->description}}" title="{{$image.attachment->description}}" loading="lazy"></a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<img src="{{$image.src}}" alt="{{$image.attachment.description}}" title="{{$image.attachment.description}}" loading="lazy">
|
<img src="{{$image.src}}" alt="{{$image.attachment->description}}" title="{{$image.attachment->description}}" loading="lazy">
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
Loading…
Reference in a new issue