Merge branch 'main' into dina/update-logo-styling-for-advertising-par…

…tner

applications/app/services/dotcomrendering/MediaPicker.scala

@@ -5,9 +5,9 @@ import model.Cors.RichRequestHeader
 import model.{MediaPage, Video, Audio}
 import play.api.mvc.RequestHeader
 import utils.DotcomponentsLogger
-import experiments.DCRVideoPages
 import navigation.NavLinks.media
 import experiments.ActiveExperiments
+import conf.switches.Switches.DCRVideoPages
 
 object MediaPicker extends GuLogging {
 
@@ -40,15 +40,13 @@ object MediaPicker extends GuLogging {
       request: RequestHeader,
   ): RenderType = {
 
-    // defaulting to false until we are ready to release and create a 0% test
-    val participatingInTest = ActiveExperiments.isParticipating(DCRVideoPages)
     val dcrCanRender = dcrCouldRender(mediaPage)
     val flags = dcrLogFlags(mediaPage)
 
     val tier = {
       if (request.forceDCROff) LocalRender
       else if (request.forceDCR) RemoteRender
-      else if (dcrCanRender && participatingInTest) RemoteRender
+      else if (dcrCanRender && DCRVideoPages.isSwitchedOn) RemoteRender
       else LocalRender
     }
 

common/app/conf/switches/ABTestSwitches.scala

@@ -55,16 +55,6 @@ trait ABTestSwitches {
     exposeClientSide = true,
   )
 
-  Switch(
-    ABTests,
-    "ab-onward-journeys",
-    "Test click through rate when there is only one onward journey container shown.",
-    owners = Seq(Owner.withEmail("[email protected]")),
-    safeState = Off,
-    sellByDate = Some(LocalDate.of(2024, 6, 7)),
-    exposeClientSide = true,
-  )
-
   Switch(
     ABTests,
     "ab-deeply-read-right-column",

common/app/conf/switches/FeatureSwitches.scala

@@ -503,6 +503,7 @@ trait FeatureSwitches {
     sellByDate = Some(LocalDate.of(2024, 6, 5)),
     exposeClientSide = true,
   )
+
   val DiscussionInApps = Switch(
     SwitchGroup.Feature,
     "discussion-in-apps",
@@ -513,4 +514,14 @@ trait FeatureSwitches {
     sellByDate = Some(LocalDate.of(2024, 6, 5)),
     exposeClientSide = true,
   )
+
+  val DCRVideoPages = Switch(
+    SwitchGroup.Feature,
+    "dcr-video-pages",
+    "If this switch is on, we will render video pages with DCR",
+    owners = Seq(Owner.withEmail("[email protected]"), Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = never,
+    exposeClientSide = false,
+  )
 }

common/app/conf/switches/JournalismSwitches.scala

@@ -63,4 +63,14 @@ trait JournalismSwitches {
     sellByDate = never,
     exposeClientSide = true,
   )
+
+  val AbsoluteServerTimes = Switch(
+    SwitchGroup.Journalism,
+    name = "absolute-server-times",
+    description = "Force times on the server to be absolute to improve caching",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = never,
+    exposeClientSide = true,
+  )
 }

common/app/experiments/Experiments.scala

@@ -13,10 +13,10 @@ object ActiveExperiments extends ExperimentsDefinition {
     Set(
       DarkModeWeb,
       DCRTagPages,
-      DCRVideoPages,
       UpdatedHeaderDesign,
       UpdateLogoAdPartner,
       MastheadWithHighlights,
+      AffiliateLinksDCR,
     )
   implicit val canCheckExperiment: CanCheckExperiment = new CanCheckExperiment(this)
 }
@@ -58,16 +58,13 @@ object UpdateLogoAdPartner
       participationGroup = Perc0A,
     )
 
-object DCRVideoPages
+object AffiliateLinksDCR
     extends Experiment(
-      name = "dcr-video-pages",
-      description = "Render video pages with DCR",
-      owners = Seq(
-        Owner.withGithub("[email protected]"),
-        Owner.withGithub("[email protected]"),
-      ),
-      sellByDate = LocalDate.of(2024, 5, 30),
-      participationGroup = Perc10A,
+      name = "affiliate-links-dcr",
+      description = "Display affiliate links on all eligible DCR articles",
+      owners = Seq(Owner.withGithub("[email protected]")),
+      sellByDate = LocalDate.of(2024, 7, 30),
+      participationGroup = Perc0E,
     )
 
 object DCRTagPages

common/app/http/GuardianAuthWithExemptions.scala

@@ -10,7 +10,6 @@ import common.Environment.stage
 import conf.Configuration.aws.mandatoryCredentials
 import model.ApplicationContext
 import org.apache.pekko.stream.Materializer
-import org.slf4j.LoggerFactory
 import play.api.Mode
 import play.api.libs.ws.WSClient
 import play.api.mvc._
@@ -35,8 +34,6 @@ class GuardianAuthWithExemptions(
 
   private val outer = this
 
-  val logger = LoggerFactory.getLogger(this.getClass)
-
   private val permissions: PermissionsProvider = PermissionsProvider(
     PermissionsConfig(
       stage = if (stage == "PROD") "PROD" else "CODE",
@@ -105,14 +102,12 @@ class GuardianAuthWithExemptions(
           if (permissions.hasPermission(requiredPermission, user.email)) {
             nextFilter(request)
           } else {
-//            Future.successful(
-//              Results.Forbidden(
-//                s"You do not have permission to access $system. " +
-//                  s"You should contact Central Production to request '$requiredEditorialPermissionName' permission.",
-//              ),
-//            )
-            logger.warn(s"${user.email} used $system, but didn't have '$requiredEditorialPermissionName' permission.")
-            nextFilter(request)
+            Future.successful(
+              Results.Forbidden(
+                s"You do not have permission to access $system. " +
+                  s"You should contact Central Production to request '$requiredEditorialPermissionName' permission.",
+              ),
+            )
           }
         }
       }

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)
+    val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)(request)
     val contentDateTimes = DotcomRenderingUtils.contentDateTimes(content)
 
     val edition = Edition(request)

common/app/model/dotcomrendering/DotcomRenderingDataModel.scala

@@ -487,7 +487,7 @@ object DotcomRenderingDataModel {
       blocks.exists(block => DotcomRenderingUtils.stringContainsAffiliateableLinks(block.bodyHtml))
     }
 
-    val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)
+    val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)(request)
     val shouldAddDisclaimer = hasAffiliateLinks(bodyBlocks)
 
     val contentDateTimes: ArticleDateTimes = ArticleDateTimes(

common/app/model/dotcomrendering/DotcomRenderingUtils.scala

@@ -22,6 +22,7 @@ import model.{
   Pillar,
 }
 import org.joda.time.format.DateTimeFormat
+import org.jsoup.Jsoup
 import play.api.libs.json._
 import play.api.mvc.RequestHeader
 import views.support.AffiliateLinksCleaner
@@ -241,19 +242,27 @@ object DotcomRenderingUtils {
     }
   }
 
-  def shouldAddAffiliateLinks(content: ContentType): Boolean = {
-    AffiliateLinksCleaner.shouldAddAffiliateLinks(
-      switchedOn = Switches.AffiliateLinks.isSwitchedOn,
-      section = content.metadata.sectionId,
-      showAffiliateLinks = content.content.fields.showAffiliateLinks,
-      supportedSections = Configuration.affiliateLinks.affiliateLinkSections,
-      defaultOffTags = Configuration.affiliateLinks.defaultOffTags,
-      alwaysOffTags = Configuration.affiliateLinks.alwaysOffTags,
-      tagPaths = content.content.tags.tags.map(_.id),
-      firstPublishedDate = content.content.fields.firstPublicationDate,
-      pageUrl = content.metadata.id,
-      contentType = "article",
-    )
+  def shouldAddAffiliateLinks(content: ContentType)(implicit request: RequestHeader): Boolean = {
+    val contentHtml = Jsoup.parse(content.fields.body)
+    val bodyElements = contentHtml.select("body").first().children()
+    if (bodyElements.size >= 2) {
+      val firstEl = bodyElements.get(0)
+      val secondEl = bodyElements.get(1)
+      if (firstEl.tagName == "p" && secondEl.tagName == "p" && secondEl.text().length >= 250) {
+        AffiliateLinksCleaner.shouldAddAffiliateLinks(
+          switchedOn = Switches.AffiliateLinks.isSwitchedOn,
+          section = content.metadata.sectionId,
+          showAffiliateLinks = content.content.fields.showAffiliateLinks,
+          supportedSections = Configuration.affiliateLinks.affiliateLinkSections,
+          defaultOffTags = Configuration.affiliateLinks.defaultOffTags,
+          alwaysOffTags = Configuration.affiliateLinks.alwaysOffTags,
+          tagPaths = content.content.tags.tags.map(_.id),
+          firstPublishedDate = content.content.fields.firstPublicationDate,
+          pageUrl = content.metadata.id,
+          contentType = "article",
+        )
+      } else false
+    } else false
   }
 
   def contentDateTimes(content: ContentType): ArticleDateTimes = {

common/app/services/ConfigAgentTrait.scala

@@ -133,6 +133,9 @@ object ConfigAgent extends GuLogging {
   def shouldServeFront(id: String)(implicit context: ApplicationContext): Boolean =
     getPathIds.contains(id) && (context.isPreview || !isFrontHidden(id))
 
+  def frontExistsInConfig(id: String)(implicit context: ApplicationContext): Boolean =
+    getPathIds.contains(id)
+
   def shouldServeEditionalisedFront(edition: Edition, id: String)(implicit context: ApplicationContext): Boolean = {
     shouldServeFront(s"${edition.id.toLowerCase}/$id")
   }

common/app/services/DynamoDB.scala

@@ -1,6 +1,5 @@
 package services
 
-import com.amazonaws.regions.{Region, Regions}
 import com.amazonaws.services.dynamodbv2.{
   AmazonDynamoDB,
   AmazonDynamoDBAsync,
@@ -11,7 +10,6 @@ import conf.Configuration
 
 object DynamoDB {
   private lazy val credentials = Configuration.aws.mandatoryCredentials
-  private lazy val region = Region.getRegion(Regions.fromName(Configuration.aws.region))
 
   lazy val asyncClient: AmazonDynamoDBAsync = AmazonDynamoDBAsyncClient
     .asyncBuilder()

common/app/views/support/HtmlCleaner.scala

@@ -6,6 +6,7 @@ import common.{Edition, GuLogging, LinkTo}
 import conf.Configuration.affiliateLinks._
 import conf.Configuration.site.host
 import conf.switches.Switches._
+import experiments.{ActiveExperiments, AffiliateLinksDCR}
 import layout.ContentWidths
 import layout.ContentWidths._
 import model._
@@ -873,7 +874,8 @@ case class AffiliateLinksCleaner(
     tags: List[String],
     publishedDate: Option[DateTime],
     contentType: String,
-) extends HtmlCleaner
+)(implicit request: RequestHeader)
+    extends HtmlCleaner
     with GuLogging {
 
   override def clean(document: Document): Document = {
@@ -946,7 +948,7 @@ object AffiliateLinksCleaner {
       firstPublishedDate: Option[DateTime],
       pageUrl: String,
       contentType: String,
-  ): Boolean = {
+  )(implicit request: RequestHeader): Boolean = {
     val publishedCutOffDate = new DateTime(2020, 8, 14, 0, 0)
 
     val cleanedPageUrl = if (pageUrl.charAt(0) == '/') {
@@ -973,11 +975,11 @@ object AffiliateLinksCleaner {
 
     // Never include affiliate links if it is tagged with an always off tag, or if it was published before our cut off date.
     // The cut off date is temporary while we are working on improving the compliance of affiliate links.
-    // The cut off date does not apply to any URL on the allow list
+    // The cut off date does not apply to any URL on the allow list or to galleries
     if (
       !contentHasAlwaysOffTag(tagPaths, alwaysOffTags) && (firstPublishedDate.exists(
         _.isBefore(publishedCutOffDate),
-      ) || urlIsInAllowList || contentType == "gallery")
+      ) || urlIsInAllowList || contentType == "gallery" || ActiveExperiments.isParticipating(AffiliateLinksDCR))
     ) {
       if (showAffiliateLinks.isDefined) {
         showAffiliateLinks.contains(true)