Merge pull request #26753 from guardian/sa-disclaimer-again

Lift affiliate links disclaimer out of page elements (again)

Author: SiAdcock

common/app/model/dotcomrendering/DotcomRenderingDataModel.scala

@@ -31,6 +31,7 @@ import navigation._
 import play.api.libs.json._
 import play.api.mvc.RequestHeader
 import services.NewsletterData
+import views.html.fragments.affiliateLinksDisclaimer
 import views.support.{CamelCase, ContentLayout, JavaScriptPage}
 // -----------------------------------------------------------------
 // DCR DataModel
@@ -41,6 +42,7 @@ case class DotcomRenderingDataModel(
     headline: String,
     standfirst: String,
     webTitle: String,
+    affiliateLinksDisclaimer: Option[String],
     mainMediaElements: List[PageElement],
     main: String,
     availableTopics: Option[Seq[Topic]],
@@ -122,6 +124,7 @@ object DotcomRenderingDataModel {
         "headline" -> model.headline,
         "standfirst" -> model.standfirst,
         "webTitle" -> model.webTitle,
+        "affiliateLinksDisclaimer" -> model.affiliateLinksDisclaimer,
         "mainMediaElements" -> model.mainMediaElements,
         "main" -> model.main,
         "filterKeyEvents" -> model.filterKeyEvents,
@@ -452,7 +455,14 @@ object DotcomRenderingDataModel {
       twitterHandle = content.tags.contributors.headOption.flatMap(_.properties.twitterHandle),
     )
 
+    def hasAffiliateLinks(
+        blocks: Seq[APIBlock],
+    ): Boolean = {
+      blocks.exists(block => DotcomRenderingUtils.stringContainsAffiliateableLinks(block.bodyHtml))
+    }
+
     val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)
+    val shouldAddDisclaimer = hasAffiliateLinks(bodyBlocks)
 
     val contentDateTimes: ArticleDateTimes = ArticleDateTimes(
       webPublicationDate = content.trail.webPublicationDate,
@@ -545,7 +555,16 @@ object DotcomRenderingDataModel {
 
     val selectedTopics = topicResult.map(topic => Seq(Topic(topic.`type`, topic.name)))
 
+    def getAffiliateLinksDisclaimer(shouldAddAffiliateLinks: Boolean, shouldAddDisclaimer: Boolean) = {
+      if (shouldAddAffiliateLinks && shouldAddDisclaimer) {
+        Some(affiliateLinksDisclaimer("article").body)
+      } else {
+        None
+      }
+    }
+
     DotcomRenderingDataModel(
+      affiliateLinksDisclaimer = getAffiliateLinksDisclaimer(shouldAddAffiliateLinks, shouldAddDisclaimer),
       author = author,
       badge = Badges.badgeFor(content).map(badge => DCRBadge(badge.seriesTag, badge.imageUrl)),
       beaconURL = Configuration.debug.beaconUrl,

common/app/model/dotcomrendering/DotcomRenderingUtils.scala

@@ -188,7 +188,7 @@ object DotcomRenderingUtils {
         elem.`type` match {
           case Text =>
             val textString = elem.textTypeData.toList.mkString("\n") // just concat all the elems here for this test
-            AffiliateLinksCleaner.stringContainsAffiliateableLinks(textString)
+            stringContainsAffiliateableLinks(textString)
           case _ => false
         },
       )
@@ -201,6 +201,10 @@ object DotcomRenderingUtils {
     } else elems
   }
 
+  def stringContainsAffiliateableLinks(textString: String): Boolean = {
+    AffiliateLinksCleaner.stringContainsAffiliateableLinks(textString)
+  }
+
   def blockElementsToPageElements(
       capiElems: Seq[ClientBlockElement],
       request: RequestHeader,

common/app/views/fragments/affiliateLinksDisclaimer.scala.html

@@ -2,20 +2,29 @@
 
 
 @articleDisclaimer() = {
-    <p><em><sup>
-        This article contains affiliate links, which means we may earn a small commission if a reader clicks through and
-        makes a purchase. All our journalism is independent and is in no way influenced by any advertiser or commercial initiative.
-        By clicking on an affiliate link, you accept that third-party cookies will be set.
-        <a href="https://www.theguardian.com/info/2017/nov/01/reader-information-on-affiliate-links" data-link-name="in body link" class="u-underline">More information</a>.
-    </sup></em></p>
+    <p><sup>
+        The Guardian’s product and service reviews are independent and are
+        in no way influenced by any advertiser or commercial initiative. We
+        will earn a commission from the retailer if you buy something
+        through an affiliate link.
+        <a
+            href="https://www.theguardian.com/info/2017/nov/01/reader-information-on-affiliate-links"
+            data-link-name="in body link"
+            class="u-underline"
+            >Learn more</a
+        >.
+    </sup></p>
 }
 
 @galleryDisclaimer() = {
-    <br><em>This article contains affiliate links, which means we may earn a small commission if a reader clicks through and
-        makes a purchase. All our journalism is independent and is in no way influenced by any advertiser or commercial initiative.
-        By clicking on an affiliate link, you accept that third-party cookies will be set.
-        <a href="https://www.theguardian.com/info/2017/nov/01/reader-information-on-affiliate-links">More information</a>.
-    </em>
+    <br>
+        The Guardian’s product and service reviews are independent and are in no
+        way influenced by any advertiser or commercial initiative. We will earn a
+        commission from the retailer if you buy something through an affiliate link.
+	    <a
+		    href="https://www.theguardian.com/info/2017/nov/01/reader-information-on-affiliate-links"
+		    >Learn more</a
+	    >.
 }
 
 @{contentType match {

common/app/views/support/HtmlCleaner.scala

@@ -916,11 +916,9 @@ object AffiliateLinksCleaner {
       contentType: String,
       skimlinksId: String,
   ): Document = {
-
     val linksToReplace: mutable.Seq[Element] = getAffiliateableLinks(html)
     linksToReplace.foreach { el => el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)) }
-
-    // respect appendDisclaimer, or if it's not set then always add the disclaimer if affilate links have been added
+    // respect appendDisclaimer (for Galleries), or if it's not set then always add the disclaimer if affilate links have been added
     val shouldAppendDisclaimer = appendDisclaimer.getOrElse(linksToReplace.nonEmpty)
     if (shouldAppendDisclaimer) insertAffiliateDisclaimer(html, contentType)
     else html