X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FItem.php;h=69b1595c2059de1c799f81a13c8dc083e804e482;hb=290b14a000e794d0c0805453800b965a65cf26c4;hp=ab8ae337caedebd2b582bfe2300b5c39ec311f02;hpb=75d857c595bf222925653453102ca9b49fe536f9;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index ab8ae337ca..69b1595c20 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -21,8 +21,6 @@ namespace Friendica\Model; -use DOMDocument; -use DOMXPath; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; @@ -30,7 +28,6 @@ use Friendica\Core\Logger; 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; @@ -1631,7 +1628,7 @@ class Item 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; } @@ -2036,9 +2033,10 @@ class Item * 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 { @@ -2049,11 +2047,16 @@ class Item // 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); } /** @@ -2279,7 +2282,12 @@ class Item 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; } @@ -3087,6 +3095,8 @@ class Item 'filter_reasons' => $filter_reasons ]; Hook::callAll('prepare_body', $hook_data); + $s = $hook_data['html']; + unset($hook_data); if (!$attach) { @@ -3124,119 +3134,140 @@ class Item $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 + * @param array $images + * @return string + * @throws \Friendica\Network\HTTPException\ServiceUnavailableException */ - private function cutAttachedImages($rendered_html) + public static function makeImageGrid(array $images): string { - $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]; + $landscapeimages = array(); + $portraitimages = array(); - $lastTextNode = null; - if ($root && $root->childNodes) { - foreach ($root->childNodes as $node) { - if ($node->nodeName == "#text" && strlen(trim($node->nodeValue)) > 0) { - $lastTextNode = $node; + foreach ($images as $image) { + ($image['attachment']['width'] > $image['attachment']['height']) ? ($landscapeimages[] = $image) : ($portraitimages[] = $image); + } + + // Image for first column (fc) and second column (sc) + $images_fc = array(); + $images_sc = array(); + $lcount = count($landscapeimages); + $pcount = count($portraitimages); + if ($lcount == 0 || $pcount == 0) { + if ($lcount == 0) { + // only portrait + for ($i = 0; $i < $pcount; $i++) { + ($i % 2 == 0) ? ($images_fc[] = $portraitimages[$i]) : ($images_sc[] = $portraitimages[$i]); } } - } - - 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]); + if ($pcount == 0) { + // ony landscapes + for ($i = 0; $i < $lcount; $i++) { + ($i % 2 == 0) ? ($images_fc[] = $landscapeimages[$i]) : ($images_sc[] = $landscapeimages[$i]); + } } - $html = ''; - foreach ($root->childNodes as $node) { - $html .= $node->ownerDocument->saveHTML($node); + } else { + // Mix of landscape and portrait images. + if ($lcount == $pcount) { + // equal amount of landscapes and portraits + if ($lcount == 1) { + // one left / one right + $images_fc[] = $landscapeimages[0]; + $images_sc[] = $portraitimages[0]; + } else { + // Distribute equal to both columns + for ($l = 0; $l < $lcount; $l++) { + if ($l % 2 == 0) { + // landscape left and portrait right for even numbers + $images_fc[] = $landscapeimages[$l]; + $images_fc[] = $portraitimages[$l]; + } else { + // portraits left and landscape right for odd numbers + $images_sc[] = $portraitimages[$l]; + $images_sc[] = $landscapeimages[$l]; + } + } + } } - return $html; - } - - return $rendered_html; - } + if ($lcount > $pcount) { + // More landscapes than portraits + $p = 0; + $l = 0; + while ($l < $lcount) { + if (($lcount > $l + 1) && ($pcount > $l)) { + // we have one more landscape that can be used for the l-th portrait + $images_fc[] = $landscapeimages[$l++]; + } + $images_fc[] = $landscapeimages[$l++]; + if ($pcount > $p) { + $images_sc[] = $portraitimages[$p++]; + } - /** - * @param array $data - * @return string|void - * @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_landscape = array(); - $img_tags_portrait = array(); - 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, - ]); - ($attachment['width'] > $attachment['height']) ? ($img_tags_landscape[] = $img_tag) : ($img_tags_portrait[] = $img_tag); } - - $landscapesCount = count($img_tags_landscape); - $portraitsCount = count($img_tags_portrait); - - // @todo add some fany ai to divide images equally on both columns - $img_tags_fc = array(); - $img_tags_sc = array(); - if ($landscapesCount == 0) { - // only portrait - for ($i = 0; $i < $portraitsCount; $i++) { - ($i % 2 == 0) ? ($img_tags_fc[] = $img_tags_portrait[$i]) : ($img_tags_sc[] = $img_tags_portrait[$i]); + } + if ($lcount < $pcount) { + // More portraits than landscapes + if ($lcount % 2 == 0 && $pcount % 2 == 0) { + /* + * even number of landscapes and portraits, but fewer landscapes than portraits. Iterate to the end + * of landscapes array + */ + $i = 0; + while ($i < $lcount) { + if ($i % 2 == 0) { + $images_fc[] = $landscapeimages[$i]; + $images_fc[] = $portraitimages[$i]; + } else { + $images_sc[] = $portraitimages[$i]; + $images_sc[] = $landscapeimages[$i]; + } + $i++; + } + // Rest portraits + while ($i < $pcount) { + if ($i % 2 == 0) { + $images_fc[] = $portraitimages[$i]; + } else { + $images_sc[] = $portraitimages[$i]; + } + $i++; } + } - if ($portraitsCount == 0) { - // ony landscapes - for ($i = 0; $i < $landscapesCount; $i++) { - ($i % 2 == 0) ? ($img_tags_fc[] = $img_tags_landscape[$i]) : ($img_tags_sc[] = $img_tags_landscape[$i]); + if ($lcount % 2 != 0 && $pcount % 2 == 0) { + // uneven landscapes count even portraits count. + for ($p = 0; $p < $pcount; $p++) { + // --> First all portraits until + if ($p % 2 == 0) { + $images_fc[] = $portraitimages[$p]; + } else { + $images_sc[] = $portraitimages[$p]; + } + } + // and now the (uneven) landscapes + for ($l = 0; $l < $lcount; $l++) { + // --> First all portraits until + if ($l % 2 == 0) { + $images_fc[] = $landscapeimages[$l]; + } else { + $images_sc[] = $landscapeimages[$l]; + } } } - - return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [ - 'columns' => [ - 'fc' => $img_tags_fc, - 'sc' => $img_tags_sc, - ], - ]); } } + return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [ + 'columns' => [ + 'fc' => $images_fc, + 'sc' => $images_sc, + ], + ]); } /** @@ -3390,16 +3421,21 @@ class Item } } - foreach ($images as $image) { - $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ - '$image' => $image, + $media = ''; + if (count($images) > 1) { + $media = self::makeImageGrid($images); + } + elseif (count($images) == 1) { + $media = $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; - } + } + + // On Diaspora posts the attached pictures are leading + if ($item['network'] == Protocol::DIASPORA) { + $leading .= $media; + } else { + $trailing .= $media; } if ($shared) {