namespace Friendica\Model;
-use DOMDocument;
-use DOMXPath;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
-use Friendica\Model\Tag;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
$content_fields['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $content_fields['raw-body']);
$content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']);
- Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']);
+ Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body'], $fields['body'], $item['author-network']);
Post\Content::update($item['uri-id'], $content_fields);
}
$item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
$item['raw-body'] = self::setHashtags($item['raw-body']);
- Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
+ $author = Contact::getById($item['author-id'], ['network']);
+ Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body'], $item['body'], $author['network'] ?? '');
// Check for hashtags in the body and repair or add hashtag links
$item['body'] = self::setHashtags($item['body']);
if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
- !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
+ !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) {
Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
return 0;
}
* Posts that are created on this system are using System::createUUID.
* Received ActivityPub posts are using Processor::getGUIDByURL.
*
- * @param string $uri uri of an item entry
+ * @param string $uri uri of an item entry
* @param string|null $host hostname for the GUID prefix
* @return string Unique guid
+ * @throws \Exception
*/
public static function guidFromUri(string $uri, string $host = null): string
{
// Remove the scheme to make sure that "https" and "http" doesn't make a difference
unset($parsed['scheme']);
+ $hostPart = $host ?? $parsed['host'] ?? '';
+ if (!$hostPart) {
+ Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed, 'callstack' => System::callstack(10)]);
+ }
+
// Glue it together to be able to make a hash from it
$host_id = implode('/', $parsed);
// Use a mixture of several hashes to provide some GUID like experience
- return hash('crc32', $host) . '-'. hash('joaat', $host_id) . '-'. hash('fnv164', $host_id);
+ return hash('crc32', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id);
}
/**
return;
}
- if (!DBA::exists('contact', ['id' => $item['contact-id'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
+ $cdata = Contact::getPublicAndUserContactID($item['author-id'], $item['uid']);
+ if (empty($cdata['user']) || ($cdata['user'] != $item['contact-id'])) {
+ return;
+ }
+
+ if (!DBA::exists('contact', ['id' => $cdata['user'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
return;
}
$item['hashtags'] = $tags['hashtags'];
$item['mentions'] = $tags['mentions'];
- $body = $item['body'] ?? '';
+ if (!$is_preview) {
+ $item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? '');
+ }
+
+ $body = $item['body'];
$fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type'];
'filter_reasons' => $filter_reasons
];
Hook::callAll('prepare_body', $hook_data);
+ $s = $hook_data['html'];
+
unset($hook_data);
if (!$attach) {
$s = HTML::applyContentFilter($s, $filter_reasons);
- if (count($attachments['visual']) > 1) {
- // make imgae grid only for multiple images
- $s = self::cutAttachedImages($s);
- $grid = self::make_image_grid($item, $attachments);
- $s .= $grid;
- }
-
$hook_data = ['item' => $item, 'html' => $s];
Hook::callAll('prepare_body_final', $hook_data);
return $hook_data['html'];
}
/**
- * This function removes images at the very end of a post based on the assumption that this images are interpreted
- * as attachments
- * @param array $rendered_html
- * @return array
- */
- private function cutAttachedImages($rendered_html)
- {
- $doc = new DOMDocument('1.0', 'UTF-8');
- libxml_use_internal_errors(true);
- $doc->loadHTML(mb_convert_encoding($rendered_html, 'html-entities', 'utf-8'));
- libxml_clear_errors();
-
- $root = $doc->getElementsByTagName("p")[0];
-
- $lastTextNode = null;
- if ($root && $root->childNodes) {
- foreach ($root->childNodes as $node) {
- if ($node->nodeName == "#text" && strlen(trim($node->nodeValue)) > 0) {
- $lastTextNode = $node;
- }
- }
- }
-
- if ($lastTextNode == null) {
- // no text at all, return nothing:
- return '';
- }
-
- $toremove = array();
- if ($lastTextNode) {
- $sibling = $lastTextNode->nextSibling;
- while ($sibling) {
- $toremove[] = array($sibling);
- $sibling = $sibling->nextSibling;
- }
- foreach ($toremove as $remove) {
- $root->removeChild($remove[0]);
- }
- $html = '';
- foreach ($root->childNodes as $node) {
- $html .= $node->ownerDocument->saveHTML($node);
- }
- return $html;
- }
-
- return $rendered_html;
- }
-
- /**
- * @param array $data
- * @return string|void
+ * @param array $images
+ * @return string
* @throws \Friendica\Network\HTTPException\ServiceUnavailableException
*/
- private function make_image_grid(array $item, array $attachments)
- {
- if ($item['has-media']) {
- if (count($attachments['visual']) > 1) {
- $img_tags_fc = array();
- $img_tags_sc = array();
- $count = 0;
- foreach ($attachments['visual'] as $attachment) {
- $src_url = Post\Media::getUrlForId($attachment['id']);
- $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
- $img_tag = array(
- '$image' => [
- 'src' => $src_url,
- 'preview' => $preview_url,
- 'attachment' => $attachment,
- ]);
- // @todo add some fany ai to divide images equally on both columns
- if ($count % 2 == 0) {
- $img_tags_fc[] = $img_tag;
- } else {
- $img_tags_sc[] = $img_tag;
- }
- ++$count;
- }
+ private static function makeImageGrid(array $images): string
+ {
+ // Image for first column (fc) and second column (sc)
+ $images_fc = [];
+ $images_sc = [];
- $img_grid = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
- 'columns' => [
- 'fc' => $img_tags_fc,
- 'sc' => $img_tags_sc,
- ],
- ]);
- return $img_grid;
- }
+ for ($i = 0; $i < count($images); $i++) {
+ ($i % 2 == 0) ? ($images_fc[] = $images[$i]) : ($images_sc[] = $images[$i]);
}
+ return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
+ 'columns' => [
+ 'fc' => $images_fc,
+ 'sc' => $images_sc,
+ ],
+ ]);
}
+
/**
* Check if the body contains a link
private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string
{
DI::profiler()->startRecording('rendering');
- $leading = '';
+ $leading = '';
$trailing = '';
+ $images = [];
// @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) {
if (self::containsLink($item['body'], $src_url)) {
continue;
}
- $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
- '$image' => [
- 'src' => $src_url,
- 'preview' => $preview_url,
- 'attachment' => $attachment,
- ],
- ]);
- // On Diaspora posts the attached pictures are leading
- if ($item['network'] == Protocol::DIASPORA) {
- $leading .= $media;
- } else {
- $trailing .= $media;
- }
+ $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment];
}
}
+ $media = '';
+ if (count($images) > 1) {
+ $media = self::makeImageGrid($images);
+ } elseif (count($images) == 1) {
+ $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
+ '$image' => $images[0],
+ ]);
+ }
+
+ // On Diaspora posts the attached pictures are leading
+ if ($item['network'] == Protocol::DIASPORA) {
+ $leading .= $media;
+ } else {
+ $trailing .= $media;
+ }
+
if ($shared) {
- $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::TOP_ANCHOR, $content);
- $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
+ $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '</div>' . BBCode::TOP_ANCHOR, $content);
+ $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '</div>' . BBCode::BOTTOM_ANCHOR, $content);
} else {
if ($leading != '') {
- $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
+ $content = '<div class="body-attach">' . $leading . '</div>' . $content;
}
if ($trailing != '') {
- $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+ $content .= '<div class="body-attach">' . $trailing . '</div>';
}
}
}
// @todo Use a template
- $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid);
+ $preview_mode = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
+ if ($preview_mode != BBCode::PREVIEW_NONE) {
+ $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid, $preview_mode);
+ }
} elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
$rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
'$url' => $data['url'],
}
if ($trailing != '') {
- $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+ $content .= '<div class="body-attach">' . $trailing . '</div>';
}
DI::profiler()->stopRecording();
projects / friendica.git / blobdiff