Show affiliate links on all eligible galleries

applications/app/views/fragments/galleryBody.scala.html

@@ -34,6 +34,7 @@
                 tagPaths = page.gallery.content.tags.tags.map(_.id),
                 firstPublishedDate = page.gallery.content.fields.firstPublicationDate,
                 pageUrl = request.uri,
+                contentType = "gallery",
             )
         )
 

applications/app/views/package.scala

@@ -47,6 +47,7 @@ object GalleryCaptionCleaners {
         appendDisclaimer = Some(isFirstRow && page.item.lightbox.containsAffiliateableLinks),
         tags = page.gallery.content.tags.tags.map(_.id),
         page.gallery.content.fields.firstPublicationDate,
+        contentType = "gallery",
       ),
     )
 

article/app/views/package.scala

@@ -84,6 +84,7 @@ object BodyProcessor {
         showAffiliateLinks = article.content.fields.showAffiliateLinks,
         tags = article.content.tags.tags.map(_.id),
         publishedDate = article.content.fields.firstPublicationDate,
+        contentType = "article",
       ),
     ) ++
       ListIf(true)(VideoEmbedCleaner(article))

common/app/model/dotcomrendering/DotcomRenderingUtils.scala

@@ -252,6 +252,7 @@ object DotcomRenderingUtils {
       tagPaths = content.content.tags.tags.map(_.id),
       firstPublishedDate = content.content.fields.firstPublicationDate,
       pageUrl = content.metadata.id,
+      contentType = "article",
     )
   }
 

common/app/views/support/HtmlCleaner.scala

@@ -872,6 +872,7 @@ case class AffiliateLinksCleaner(
     appendDisclaimer: Option[Boolean] = None,
     tags: List[String],
     publishedDate: Option[DateTime],
+    contentType: String,
 ) extends HtmlCleaner
     with GuLogging {
 
@@ -887,6 +888,7 @@ case class AffiliateLinksCleaner(
         tags,
         publishedDate,
         pageUrl,
+        contentType,
       )
     ) {
       AffiliateLinksCleaner.replaceLinksInHtml(document, pageUrl, skimlinksId)
@@ -943,6 +945,7 @@ object AffiliateLinksCleaner {
       tagPaths: List[String],
       firstPublishedDate: Option[DateTime],
       pageUrl: String,
+      contentType: String,
   ): Boolean = {
     val publishedCutOffDate = new DateTime(2020, 8, 14, 0, 0)
 
@@ -964,15 +967,6 @@ object AffiliateLinksCleaner {
       "fashion/2024/mar/17/beauty-spot-10-best-root-cover-ups",
       "fashion/2024/apr/05/peptides-help-with-good-looking-skin-but-dont-expect-botox-in-a-bottle",
       "fashion/2024/apr/13/sali-hughes-top-50-beauty-products-for-under-20-pounds",
-      "fashion/gallery/2024/mar/09/spring-in-your-step-10-menswear-trends-to-update-your-wardrobe-in-pictures",
-      "fashion/gallery/2024/mar/08/street-smart-what-to-wear-to-run-errands",
-      "fashion/gallery/2024/mar/09/the-edit-mens-sweatshirts-in-pictures",
-      "lifeandstyle/gallery/2024/jan/22/colourful-glass-furniture-from-vases-to-lampshades-in-pictures",
-      "lifeandstyle/gallery/2023/nov/27/cosy-bedding-in-pictures",
-      "fashion/gallery/2024/mar/24/we-love-fashion-fixes-for-the-week-ahead-in-pictures",
-      "fashion/gallery/2024/apr/06/we-love-fashion-fixes-for-the-week-ahead-in-pictures",
-      "fashion/gallery/2024/apr/05/instant-spark-what-to-wear-for-a-first-date",
-      "fashion/gallery/2024/mar/31/crossbody-carrier-18-of-the-best-handbags-in-pictures",
     )
 
     val urlIsInAllowList = affiliateLinksAllowList.contains(cleanedPageUrl)
@@ -983,7 +977,7 @@ object AffiliateLinksCleaner {
     if (
       !contentHasAlwaysOffTag(tagPaths, alwaysOffTags) && (firstPublishedDate.exists(
         _.isBefore(publishedCutOffDate),
-      ) || urlIsInAllowList)
+      ) || urlIsInAllowList || contentType == "gallery")
     ) {
       if (showAffiliateLinks.isDefined) {
         showAffiliateLinks.contains(true)

common/test/views/support/cleaner/AffiliateLinksCleanerTest.scala

@@ -31,6 +31,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List.empty,
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -42,6 +43,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List.empty,
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(true)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -53,6 +55,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List.empty,
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -64,6 +67,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List.empty,
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(true)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -75,6 +79,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List("bereavement"),
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -86,6 +91,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List("tech"),
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -97,6 +103,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List("tech"),
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(true)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -108,6 +115,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List("bereavement"),
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -119,6 +127,7 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List("tech"),
       oldPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(true)
     shouldAddAffiliateLinks(
       switchedOn = true,
@@ -130,6 +139,19 @@ class AffiliateLinksCleanerTest extends AnyFlatSpec with Matchers {
       List.empty,
       newPublishedDate,
       deniedPageUrl,
+      "article",
     ) should be(false)
+    shouldAddAffiliateLinks(
+      switchedOn = true,
+      "film",
+      None,
+      supportedSections,
+      Set.empty,
+      Set.empty,
+      List.empty,
+      newPublishedDate,
+      deniedPageUrl,
+      "gallery",
+    ) should be(true)
   }
 }