feat: merge excerpt logic into the main template

Author: iamdarkle

extend.php

@@ -14,7 +14,6 @@
 use Flarum\Extend;
 use Flectar\Fancybox\WrapImagesInGallery;
 use Flectar\Fancybox\DefineGalleryTemplate;
-use Flectar\Fancybox\AddExcerptToDiscussion;
 use Flarum\Discussion\Discussion;
 use Flarum\Api\Resource\DiscussionResource;
 use Flarum\Api\Schema;
@@ -26,7 +25,6 @@
 
     (new Extend\Formatter)
         ->configure(DefineGalleryTemplate::class)
-        ->configure(AddExcerptToDiscussion::class)
         ->render(WrapImagesInGallery::class),
 
     (new Extend\ApiResource(DiscussionResource::class))

src/AddExcerptToDiscussion.php

@@ -16,39 +16,48 @@ public function __invoke(Configurator $config)
 
         if ($config->tags->exists('IMG')) {
             $tag = $config->tags->get('IMG');
-            $newTemplate = $tag->template;
-            $tag->template = <<<XML
+            $tag->template = <<<'XML'
                 <xsl:choose>
-                    <xsl:when test="parent::FANCYBOX-GALLERY-ITEM">
+                    <xsl:when test="ancestor::FANCYBOX-GALLERY-ITEM">
                         <a data-fancybox="gallery" href="{@src}">
                             <img data-lazy-src="{@src}" alt="{@alt}" loading="lazy"/>
                         </a>
                     </xsl:when>
+                    <xsl:when test="ancestor::DISCUSSION-EXCERPT">
+                        <a data-fancybox="excerpt-gallery" href="{@src}">
+                            <img data-lazy-src="{@src}" alt="{@alt}" class="excerpt-image"/>
+                        </a>
+                    </xsl:when>
                     <xsl:otherwise>
                         <a data-fancybox="single" href="{@src}">
                             <img src="{@src}" alt="{@alt}" loading="lazy"/>
                         </a>
                     </xsl:otherwise>
                 </xsl:choose>
-            XML;
+XML;
         }
 
         if ($config->tags->exists('UPL-IMAGE-PREVIEW')) {
             $tag = $config->tags->get('UPL-IMAGE-PREVIEW');
-            $tag->template = <<<XML
+            $tag->template = <<<'XML'
                 <xsl:choose>
-                    <xsl:when test="parent::FANCYBOX-GALLERY-ITEM">
+                    <xsl:when test="ancestor::FANCYBOX-GALLERY-ITEM">
                         <a data-fancybox="gallery" href="{@url}">
                             <img data-lazy-src="{@url}" alt="" loading="lazy"/>
                         </a>
                     </xsl:when>
+                    <xsl:when test="ancestor::DISCUSSION-EXCERPT">
+                        <a data-fancybox="excerpt-gallery" href="{@url}">
+                            <img data-lazy-src="{@url}" alt="" class="excerpt-image"/>
+                        </a>
+                    </xsl:when>
                     <xsl:otherwise>
                         <a data-fancybox="single" href="{@url}">
                             <img src="{@url}" alt="" loading="lazy"/>
                         </a>
                     </xsl:otherwise>
                 </xsl:choose>
-            XML;
+XML;
         }
     }
-}
+}

src/DefineGalleryTemplate.php

@@ -3,24 +3,37 @@
 namespace Flectar\Fancybox;
 
 use s9e\TextFormatter\Renderer;
-use s9e\TextFormatter\Utils;
 
 class WrapImagesInGallery
 {
-    const MATCH_IMG_TAGS = '((?:<UPL-IMAGE-PREVIEW[^>]*>(?:(?!<\/UPL-IMAGE-PREVIEW>).)*<\/UPL-IMAGE-PREVIEW>)|(?:<IMG[^>]*>(?:(?!<\/IMG>).)*<\/IMG>))';
-    const MATCH_GALLERY_REGEX = '((?:'.self::MATCH_IMG_TAGS.'(?:\s*(?:<br\/>|<br>|\n)\s*)?){2,})';
-
     public function __invoke(Renderer $renderer, $context, string $xml): string
     {
-        return preg_replace_callback('/'.self::MATCH_GALLERY_REGEX.'/m', function ($matches) {
-            $images = array_filter(preg_split('/\s*(?:<br\/>|<br>|\n)\s*/', $matches[0]), function($img) {
-                return !empty($img);
-            });
-            $galleryItems = array_map(function($img) {
-                return '<FANCYBOX-GALLERY-ITEM>' . trim($img) . '</FANCYBOX-GALLERY-ITEM>';
-            }, $images);
+        $pattern = '/' .
+            '(?:<[IPr]\s[^>]*>)*' .
+            '(' .
+                '(?:' .
+                    '(?:<IMG[^>]*>(?:<\/IMG>)?|<UPL-IMAGE-PREVIEW[^>]*>(?:<\/UPL-IMAGE-PREVIEW>)?)' .
+                    '(?:\s*<[br]\s*\/?>\s*)*' .
+                '){2,}' .
+            ')' .
+            '(?:<\/[IPr]>)*' .
+            '/s';
+
+        return preg_replace_callback($pattern, function ($matches) {
+            $imagesBlock = $matches[1];
 
-            return '<FANCYBOX-GALLERY>' . implode('', $galleryItems) . '</FANCYBOX-GALLERY>';
+            $images = preg_split('/<[br]\s*\/?>/', $imagesBlock);
+            $images = array_filter(array_map('trim', $images));
+
+            if (count($images) < 2) {
+                return $matches[0];
+            }
+
+            $wrappedImages = array_map(function($img) {
+                return '<FANCYBOX-GALLERY-ITEM>' . $img . '</FANCYBOX-GALLERY-ITEM>';
+            }, $images);
+
+            return '<FANCYBOX-GALLERY>' . implode('', $wrappedImages) . '</FANCYBOX-GALLERY>';
         }, $xml);
     }
-}
+}