$fields['vid'] = Verb::getID($fields['verb']);
}
+ if (!empty($fields['edited'])) {
+ $previous = Post::selectFirst(['edited'], $condition);
+ }
+
$rows = Post::update($fields, $condition);
if (is_bool($rows)) {
return $rows;
}
// We only need to notfiy others when it is an original entry from us.
- // Only call the notifier when the item has some content relevant change.
- if ($item['origin'] && in_array('edited', array_keys($fields))) {
+ // Only call the notifier when the item had been edited and records had been changed.
+ if ($item['origin'] && !empty($fields['edited']) && ($previous['edited'] != $fields['edited'])) {
$notify_items[] = $item['id'];
}
}
// Check for hashtags in the body and repair or add hashtag links
$item['body'] = self::setHashtags($item['body']);
- // Fill the cache field
- self::putInCache($item);
-
if (stristr($item['verb'], Activity::POKE)) {
$notify_type = Delivery::POKE;
} else {
}
$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'] = Post\Link::insertFromBody($item['uri-id'], $item['body']);
+
$item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
self::putInCache($item);
$item['body'] = $body;
return $s;
}
- $shared = BBCode::fetchShareAttributes($item['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'] ?? '')];
- $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'));
+ if (!empty($shared_attachments)) {
+ $s = self::addVisualAttachments($shared_attachments, $item, $s, true);
+ $s = self::addLinkAttachment($shared_uri_id, $shared_attachments, $body, $s, true, []);
+ $s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
$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::addLinkAttachment($attachments, $body, $s, false, $shared_links);
+ $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
$s = self::addNonVisualAttachments($attachments, $item, $s, false);
// Map.
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
*
continue;
}
- $author = ['uid' => 0, 'id' => $item['author-id'],
- 'network' => $item['author-network'], 'url' => $item['author-link']];
- $the_url = Contact::magicLinkByContact($author, $attachment['url']);
-
if (!empty($attachment['preview'])) {
- $preview_url = Proxy::proxifyUrl(Contact::magicLinkByContact($author, $attachment['preview']));
+ $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
} else {
$preview_url = '';
}
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
'$video' => [
'id' => $attachment['id'],
- 'src' => $the_url,
+ 'src' => $attachment['url'],
'name' => $attachment['name'] ?: $attachment['url'],
'preview' => $preview_url,
'mime' => $attachment['mimetype'],
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/audio.tpl'), [
'$audio' => [
'id' => $attachment['id'],
- 'src' => $the_url,
- 'name' => $attachment['name'] ?: $attachment['url'],
+ 'src' => $attachment['url'],
+ 'name' => $attachment['name'] ?: $attachment['url'],
'mime' => $attachment['mimetype'],
],
]);
$trailing .= $media;
}
} elseif ($attachment['filetype'] == 'image') {
- if (empty($preview_url) && (max($attachment['width'], $attachment['height']) > 600)) {
- $preview_url = Proxy::proxifyUrl($the_url, false, ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
- }
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
'$image' => [
- 'src' => Proxy::proxifyUrl($the_url),
- 'preview' => $preview_url,
- 'attachment' => $attachment,
+ 'src' => Post\Media::getUrlForId($attachment['id']),
+ 'preview' => Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE),
+ 'attachment' => $attachment,
],
]);
// On Diaspora posts the attached pictures are leading
* @param array $ignore_links A list of URLs to ignore
* @return string modified content
*/
- private static function addLinkAttachment(array $attachments, string $body, string $content, bool $shared, array $ignore_links)
+ private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links)
{
$stamp1 = microtime(true);
// @ToDo Check only for audio and video
'type' => 'link',
'url' => $attachment['url']];
- if ($preview) {
+ if ($preview && !empty($attachment['preview'])) {
if ($attachment['preview-width'] >= 500) {
- $data['image'] = $attachment['preview'] ?? '';
+ $data['image'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
} else {
- $data['preview'] = $attachment['preview'] ?? '';
+ $data['preview'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
}
}
}
}
+ if (!empty($data['image'])) {
+ $data['image'] = Post\Link::getByLink($uriid, $data['image']);
+ }
+
+ if (!empty($data['preview'])) {
+ $data['preview'] = Post\Link::getByLink($uriid, $data['preview']);
+ }
+
// @todo Use a template
$rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data);
} elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
projects / friendica.git / blobdiff