add a separate gallery caption for dcr txt cleaning

The GalleryCaptionCleaner used by twirl template is adding a class that
is not needed for dcr, therefore, a separate cleaner is added
to handle the dcr case.

Author: marjisound

common/app/model/dotcomrendering/DotcomBlocksRenderingDataModel.scala

@@ -69,7 +69,7 @@ object DotcomBlocksRenderingDataModel {
       bodyBlocks: Seq[APIBlock],
   ): DotcomBlocksRenderingDataModel = {
     val content = page.item
-    val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content) // TODO:
+    val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)
     val contentDateTimes = DotcomRenderingUtils.contentDateTimes(content)
 
     val edition = Edition(request)

common/app/model/dotcomrendering/DotcomRenderingDataModel.scala

@@ -456,7 +456,7 @@ object DotcomRenderingDataModel {
   ): DotcomRenderingDataModel = {
 
     val edition = Edition.edition(request)
-    val content: ContentType = page.item
+    val content = page.item
     val isImmersive = content.metadata.format.exists(_.display == ImmersiveDisplay)
     val isPaidContent = content.metadata.designType.contains(AdvertisementFeature)
 
@@ -472,7 +472,6 @@ object DotcomRenderingDataModel {
     ): Boolean = {
       content match {
         case gallery: Gallery => gallery.lightbox.containsAffiliateableLinks
-        // TODO: I think the below could be used for galleries too, because the bodyHtml includes all the caption texts as well
         case _ => blocks.exists(block => DotcomRenderingUtils.stringContainsAffiliateableLinks(block.bodyHtml))
       }
     }

common/app/model/dotcomrendering/pageElements/TextCleaner.scala

@@ -5,7 +5,7 @@ import conf.Configuration.{affiliateLinks => affiliateLinksConfig}
 import model.{Tag, Tags}
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
-import views.support.{AffiliateLinksCleaner, GalleryCaptionCleaner, HtmlCleaner}
+import views.support.{AffiliateLinksCleaner, HtmlCleaner}
 
 import scala.jdk.CollectionConverters._
 import scala.util.matching.Regex
@@ -131,6 +131,27 @@ object TagLinker {
   }
 }
 
+object GalleryCaptionCleaner extends HtmlCleaner {
+  override def clean(galleryCaption: Document): Document = {
+    // There is an inconsistent number of <br> tags in gallery captions.
+    // To create some consistency, re will remove them all.
+    galleryCaption.getElementsByTag("br").remove()
+
+    val firstStrong = Option(galleryCaption.getElementsByTag("strong").first())
+    val captionTitle = galleryCaption.createElement("h2")
+    val captionTitleText = firstStrong.map(_.html()).getOrElse("")
+
+    // <strong> is removed in place of having a <h2> element
+    firstStrong.foreach(_.remove())
+
+    captionTitle.html(captionTitleText)
+
+    galleryCaption.body.prependChild(captionTitle)
+
+    galleryCaption
+  }
+}
+
 case class GalleryAffiliateLinksCleaner(
     pageUrl: String,
     shouldAddAffiliateLinks: Boolean,