Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 20:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into api-edit

Browse source
This commit is contained in:
Michael 2023-03-13 05:33:32 +00:00
commit 59c436b442
23 changed files with 485 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

127
src/Model/Post/Media.php
View file

@ -21,6 +21,7 @@
namespace Friendica\Model\Post;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
@ -161,8 +162,10 @@ class Media
*/
public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string
{
$media = self::fetchAdditionalData(['type' => self::DOCUMENT, 'url' => $href,
'size' => $length, 'mimetype' => $type, 'description' => $title]);
$media = self::fetchAdditionalData([
'type' => self::DOCUMENT, 'url' => $href,
'size' => $length, 'mimetype' => $type, 'description' => $title
]);
return '[attach]href="' . $media['url'] . '" length="' . $media['size'] .
'" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]';
@ -262,8 +265,10 @@ class Media
return $media;
}
if (!empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) &&
parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)) {
if (
!empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) &&
parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)
) {
Logger::debug('Not a link to an activity', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]);
return $media;
}
@ -482,8 +487,10 @@ class Media
}
$body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]);
$attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => $picture[3]];
$attachments[$image] = [
'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => $picture[3]
];
}
}
@ -501,8 +508,10 @@ class Media
}
$body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]);
$attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => null];
$attachments[$image] = [
'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => null
];
}
}
@ -630,7 +639,7 @@ class Media
public static function insertFromAttachmentData(int $uriid, string $body)
{
$data = BBCode::getAttachmentData($body);
if (empty($data)) {
if (empty($data)) {
return;
}
@ -838,8 +847,10 @@ class Media
continue;
}
if (in_array($medium['type'], [self::AUDIO, self::IMAGE]) ||
in_array($filetype, ['audio', 'image'])) {
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'])) {
@ -906,15 +917,15 @@ class Media
if ($media['type'] == self::IMAGE) {
if (!empty($media['preview'])) {
if (!empty($media['description'])) {
$body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] .'[/img][/url]';
$body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] . '[/img][/url]';
} else {
$body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] .'[/img][/url]';
$body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] . '[/img][/url]';
}
} else {
if (!empty($media['description'])) {
$body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
$body .= "\n[img=" . $media['url'] . ']' . $media['description'] . '[/img]';
} else {
$body .= "\n[img]" . $media['url'] .'[/img]';
$body .= "\n[img]" . $media['url'] . '[/img]';
}
}
} elseif ($media['type'] == self::AUDIO) {
@ -931,6 +942,92 @@ class Media
return $body;
}
/**
* Add an [attachment] element to the body for a given uri-id with a HTML media element
*
* @param integer $uriid
* @param string $body
* @return string
*/
public static function addHTMLAttachmentToBody(int $uriid, string $body): string
{
if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
return $body;
}
$links = self::getByURIId($uriid, [self::HTML]);
if (empty($links)) {
return $body;
}
$data = [
'type' => 'link',
'url' => $links[0]['url'],
'title' => $links[0]['name'],
'text' => $links[0]['description'],
'publisher_name' => $links[0]['publisher-name'],
'publisher_url' => $links[0]['publisher-url'],
'publisher_img' => $links[0]['publisher-image'],
'author_name' => $links[0]['author-name'],
'author_url' => $links[0]['author-url'],
'author_img' => $links[0]['author-image'],
'images' => [[
'src' => $links[0]['preview'],
'height' => $links[0]['preview-height'],
'width' => $links[0]['preview-width'],
]]
];
$body .= "\n" . PageInfo::getFooterFromData($data);
return $body;
}
/**
* Add a link to the body for a given uri-id with a HTML media element
*
* @param integer $uriid
* @param string $body
* @return string
*/
public static function addHTMLLinkToBody(int $uriid, string $body): string
{
$links = self::getByURIId($uriid, [self::HTML]);
if (empty($links)) {
return $body;
}
if (strpos($body, $links[0]['url'])) {
return $body;
}
if (!empty($links[0]['name']) && ($links[0]['name'] != $links[0]['url'])) {
return $body . "\n[url=" . $links[0]['url'] . ']' . $links[0]['name'] . "[/url]";
} else {
return $body . "\n[url]" . $links[0]['url'] . "[/url]";
}
}
/**
* Add an [attachment] element to the body and a link to raw-body for a given uri-id with a HTML media element
*
* @param array $item
* @return array
*/
public static function addHTMLAttachmentToItem(array $item): array
{
if (($item['gravity'] == Item::GRAVITY_ACTIVITY) || empty($item['uri-id'])) {
return $item;
}
$item['body'] = self::addHTMLAttachmentToBody($item['uri-id'], $item['body']);
if (!empty($item['raw-body'])) {
$item['raw-body'] = self::addHTMLLinkToBody($item['uri-id'], $item['raw-body']);
}
return $item;
}
/**
* Get preview link for given media id
*