clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace attachment links in the body

This commit is contained in:
Michael 2021-06-28 04:53:20 +00:00
parent dbf9132ea6
commit 7e200174d6
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Model/Item.php
View File

@ -2742,6 +2742,23 @@ class Item
} }
$body = $item['body'] ?? ''; $body = $item['body'] ?? '';
$shared = BBCode::fetchShareAttributes($body);
if (!empty($shared['guid'])) {
$shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
$shared_uri_id = $shared_item['uri-id'] ?? 0;
$shared_links = [strtolower($shared_item['plink'] ?? '')];
$shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']);
$shared_links = array_merge($shared_links, array_column($shared_attachments['visual'], 'url'));
$shared_links = array_merge($shared_links, array_column($shared_attachments['link'], 'url'));
$shared_links = array_merge($shared_links, array_column($shared_attachments['additional'], 'url'));
$item['body'] = self::replaceVisualAttachments($shared_attachments, $item['body']);
} else {
$shared_uri_id = 0;
$shared_links = [];
}
$attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links);
$item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
$item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']); $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
self::putInCache($item); self::putInCache($item);
$item['body'] = $body; $item['body'] = $body;
@ -2764,25 +2781,13 @@ class Item
return $s; return $s;
} }
$shared = BBCode::fetchShareAttributes($item['body']); if (!empty($shared_attachments)) {
if (!empty($shared['guid'])) { $s = self::addVisualAttachments($shared_attachments, $item, $s, true);
$shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]); $s = self::addLinkAttachment($shared_attachments, $body, $s, true, []);
$shared_uri_id = $shared_item['uri-id'] ?? 0; $s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
$shared_links = [strtolower($shared_item['plink'] ?? '')];
$attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']);
$s = self::addVisualAttachments($attachments, $item, $s, true);
$s = self::addLinkAttachment($attachments, $body, $s, true, []);
$s = self::addNonVisualAttachments($attachments, $item, $s, true);
$shared_links = array_merge($shared_links, array_column($attachments['visual'], 'url'));
$shared_links = array_merge($shared_links, array_column($attachments['link'], 'url'));
$shared_links = array_merge($shared_links, array_column($attachments['additional'], 'url'));
$body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); $body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
} else {
$shared_uri_id = 0;
$shared_links = [];
} }
$attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links);
$s = self::addVisualAttachments($attachments, $item, $s, false); $s = self::addVisualAttachments($attachments, $item, $s, false);
$s = self::addLinkAttachment($attachments, $body, $s, false, $shared_links); $s = self::addLinkAttachment($attachments, $body, $s, false, $shared_links);
$s = self::addNonVisualAttachments($attachments, $item, $s, false); $s = self::addNonVisualAttachments($attachments, $item, $s, false);
@ -2843,6 +2848,28 @@ class Item
return false; return false;
} }
/**
* Replace visual attachments in the body
*
* @param array $attachments
* @param string $body
* @return string modified body
*/
private static function replaceVisualAttachments(array $attachments, string $body)
{
$stamp1 = microtime(true);
foreach ($attachments['visual'] as $attachment) {
if (!empty($attachment['preview'])) {
$body = str_replace($attachment['preview'], Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE), $body);
} elseif ($attachment['filetype'] == 'image') {
$body = str_replace($attachment['url'], Post\Media::getUrlForId($attachment['id']), $body);
}
}
DI::profiler()->saveTimestamp($stamp1, 'rendering');
return $body;
}
/** /**
* Add visual attachments to the content * Add visual attachments to the content
* *

4
src/Module/Photo.php
View File

@ -173,8 +173,8 @@ class Photo extends BaseModule
return MPhoto::createPhotoForExternalResource($url); return MPhoto::createPhotoForExternalResource($url);
case "media": case "media":
$media = DBA::selectFirst('post-media', ['url'], ['id' => $uid, 'type' => Post\Media::IMAGE]); $media = DBA::selectFirst('post-media', ['url', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
if (empty($media['url'])) { if (empty($media)) {
return false; return false;
} }