Loading…
+}
diff --git a/applications/app/views/fragments/crosswords/crosswordContent.scala.html b/applications/app/views/fragments/crosswords/crosswordContent.scala.html
index 2eee10bf2172..e5384db55fa1 100644
--- a/applications/app/views/fragments/crosswords/crosswordContent.scala.html
+++ b/applications/app/views/fragments/crosswords/crosswordContent.scala.html
@@ -46,11 +46,6 @@ Down
@fragments.commercial.standardAd("right", Seq("mpu-banner-ad"), Map())
- @if(crosswordPage.item.trail.isCommentable) {
-
- @fragments.commercial.standardAd("crossword-banner", Seq("crossword-banner"), Map())
-
- }
}
diff --git a/applications/app/views/fragments/galleryHeader.scala.html b/applications/app/views/fragments/galleryHeader.scala.html
index 4be88f075aa8..48ec58171893 100644
--- a/applications/app/views/fragments/galleryHeader.scala.html
+++ b/applications/app/views/fragments/galleryHeader.scala.html
@@ -32,8 +32,11 @@ @Html(gallery.item.trail.headline)
{Inline
- + - +
});
-
-
- Merchandising: blended component
-
-
+
}
-
- @Seq(
- Map(
- ("id", "manual1"),
- ("type", "single"),
- ("creativeId", "10025607"),
- ("args", Json.obj(
- ("creative", "manual-single"),
- ("toneClass", "commercial--tone-brand"),
- ("omnitureId", "[%omnitureid%]"),
- ("baseUrl", "http://www.theguardian.com/technology/2014/nov/20/apple-beats-music-iphone-ipad-spotify"),
- ("title", "title"),
- ("viewAllText", "View all"),
- ("offerTitle", "Scientists climb to bottom of Siberian sinkhole - in pictures"),
- ("offerImage", "http://pagead2.googlesyndication.com/pagead/imgad?id=CICAgKDjk-jQkgEQARgBMghE750kQXQwJg"),
- ("offerText", "A Russian research team including scientists, a medic and a professional climber has descended a giant sinkhole on the Yamal Peninsula in northern Siberia. Photographs by Vladimir Pushkarev/Siberian Times"),
- ("offerUrl", "http://www.theguardian.com/technology/2014/nov/20/apple-beats-music-iphone-ipad-spotify"),
- ("seeMoreUrl", "http://www.theguardian.com/technology/2014/nov/20/apple-beats-music-iphone-ipad-spotify"),
- ("showCtaLink", "show-cta-link"),
- ("offerLinkText", "See more"),
- ("clickMacro", "%%CLICK_URL_ESC%%")
- ))
- ),
- Map(
- ("id", "multiple1"),
- ("type", "multiple"),
- ("creativeId", "10025847"),
- ("args", Json.obj(
- ("creative", "manual-multiple"),
- ("title", "A Title"),
- ("explainer", "Explainer text"),
- ("base__url", "http://www.theguardian.com/uk"),
- ("offerlinktext", "Offer link text"),
- ("viewalltext", "View all text"),
- ("offeramount", "offer-amount"),
- ("relevance", "high"),
- ("Toneclass", "commercial--tone-brand"),
- ("prominent", "true"),
- ("offer1title", "Offer 1 Title"),
- ("offer1linktext", "Offer 1 Link Text"),
- ("offer1url", "http://www.theguardian.com/uk"),
- ("offer1meta", "Offer 1 Meta"),
- ("offer1image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer2title", "Offer 2 Title"),
- ("offer2linktext", "Offer 2 Link Text"),
- ("offer2url", "http://www.theguardian.com/uk"),
- ("offer2meta", "Offer 1 Meta"),
- ("offer2image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer3title", "Offer 3 Title"),
- ("offer3linktext", "Offer 3 Link Text"),
- ("offer3url", "http://www.theguardian.com/uk"),
- ("offer3meta", "Offer 1 Meta"),
- ("offer3image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer4title", "Offer 4 Title"),
- ("offer4linktext", "Offer 4 Link Text"),
- ("offer4url", "http://www.theguardian.com/uk"),
- ("offer4meta", "Offer 1 Meta"),
- ("offer4image", "http://www.catgifpage.com/gifs/247.gif"),
- ("omnitureId", "[%OmnitureID%]"),
- ("clickMacro", "%%CLICK_URL_ESC%%")
- ))
- ),
- Map(
- ("id", "multipleMembership"),
- ("type", "multiple"),
- ("creativeId", "10025847"),
- ("args", Json.obj(
- ("creative", "manual-multiple"),
- ("base__url", "https://memebrship.theguardian.com"),
- ("viewalltext", "Become a Supporter"),
- ("title", "Events for foodies from Guardian Live"),
- ("offeramount", "offer-amount"),
- ("relevance", "high"),
- ("Toneclass", "commercial--tone-membership"),
- ("offer1title", "Offer 1 Title"),
- ("offer1linktext", "Offer 1 Link Text"),
- ("offer1url", "http://www.theguardian.com/uk"),
- ("offer1meta", "Offer 1 Meta"),
- ("offer1image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer2title", "Offer 2 Title"),
- ("offer2linktext", "Offer 2 Link Text"),
- ("offer2url", "http://www.theguardian.com/uk"),
- ("offer2meta", "Offer 1 Meta"),
- ("offer2image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer3title", "Offer 3 Title"),
- ("offer3linktext", "Offer 3 Link Text"),
- ("offer3url", "http://www.theguardian.com/uk"),
- ("offer3meta", "Offer 1 Meta"),
- ("offer3image", "http://www.catgifpage.com/gifs/247.gif"),
- ("offer4title", "Offer 4 Title"),
- ("offer4linktext", "Offer 4 Link Text"),
- ("offer4url", "http://www.theguardian.com/uk"),
- ("offer4meta", "Offer 1 Meta"),
- ("offer4image", "http://www.catgifpage.com/gifs/247.gif"),
- ("omnitureId", "[%OmnitureID%]"),
- ("clickMacro", "%%CLICK_URL_ESC%%")
- ))
- )
- ).map { component =>
-
-
-
- }
-
-
-}
+}
\ No newline at end of file
diff --git a/commercial/conf/routes b/commercial/conf/routes
index 62cdc6f1cb4b..e10ab896a7dd 100644
--- a/commercial/conf/routes
+++ b/commercial/conf/routes
@@ -6,6 +6,9 @@
GET /assets/*path dev.DevAssetsController.at(path)
GET /_healthcheck commercial.controllers.HealthCheck.healthCheck()
+# Admiral Ad Block Recovery solution - fetching the bootstrap script
+GET /commercial/admiral-bootstrap.js commercial.controllers.AdmiralController.getBootstrapScript
+
# Content API merchandising components
# Attempting to remove ContentApiOffersController, discovered
# https://github.com/guardian/commercial-templates/blob/dba808f89127d4405f4f4f087208e6135400e61c/src/capi-single-paidfor/web/index.js#L30
@@ -17,6 +20,7 @@ GET /commercial/api/capi-multiple.json comm
GET /commercial/anx/anxresize.js commercial.controllers.PiggybackPixelController.resize()
# Hosted content
+GET /advertiser-content/:campaignName/:pageName.json commercial.controllers.HostedContentController.renderJson(campaignName, pageName)
GET /advertiser-content/:campaignName/:pageName commercial.controllers.HostedContentController.renderHostedPage(campaignName, pageName)
GET /advertiser-content/:campaignName/:pageName/:cType/onward.json commercial.controllers.HostedContentController.renderOnwardComponent(campaignName, pageName, cType)
GET /advertiser-content/:campaignName/:pageName/autoplay.json commercial.controllers.HostedContentController.renderAutoplayComponent(campaignName, pageName)
@@ -33,3 +37,7 @@ GET /commercial/amp-iframe.html comm
# DFP Non refreshable line items
GET /commercial/non-refreshable-line-items.json commercial.controllers.nonRefreshableLineItemsController.getIds
+
+# Ad-Lite opt in
+GET /commercial/ad-lite/enable commercial.controllers.TemporaryAdLiteController.enable()
+GET /commercial/ad-lite/disable commercial.controllers.TemporaryAdLiteController.disable()
diff --git a/commercial/test/services/dotcomrendering/HostedContentPickerTest.scala b/commercial/test/services/dotcomrendering/HostedContentPickerTest.scala
new file mode 100644
index 000000000000..ece680c04de2
--- /dev/null
+++ b/commercial/test/services/dotcomrendering/HostedContentPickerTest.scala
@@ -0,0 +1,41 @@
+package services.dotcomrendering
+
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.DoNotDiscover
+import services.dotcomrendering.{LocalRender, RemoteRender}
+import test.TestRequest
+
+@DoNotDiscover class HostedContentPickerTest extends AnyFlatSpec with Matchers {
+ // All tests should return LocalRender initially
+
+ "Hosted Content Picker decideTier" should "return LocalRender if forceDCROff and dcr cannot render" in {
+ val testRequest = TestRequest("hosted-content-path?dcr=false")
+ val tier = HostedContentPicker.decideTier(false)(testRequest)
+ tier should be(LocalRender)
+ }
+
+ it should "return LocalRender if forceDCROff and dcrCanRender" in {
+ val testRequest = TestRequest("hosted-content-path?dcr=false")
+ val tier = HostedContentPicker.decideTier(false)(testRequest)
+ tier should be(LocalRender)
+ }
+
+ it should "return LocalRender if force DCR" in {
+ val testRequest = TestRequest("hosted-content-path?dcr=true")
+ val tier = HostedContentPicker.decideTier(false)(testRequest)
+ tier should be(LocalRender)
+ }
+
+ it should "return LocalRender if force DCR and content should be served pressed" in {
+ val testRequest = TestRequest("hosted-content-path?dcr=true")
+ val tier = HostedContentPicker.decideTier(true)(testRequest)
+ tier should be(LocalRender)
+ }
+
+ it should "return LocalRender otherwise" in {
+ val testRequest = TestRequest("hosted-content-path")
+ val tier = HostedContentPicker.decideTier(false)(testRequest)
+ tier should be(LocalRender)
+ }
+}
diff --git a/common/app/ab/ABTests.scala b/common/app/ab/ABTests.scala
new file mode 100644
index 000000000000..f877e3fd31f1
--- /dev/null
+++ b/common/app/ab/ABTests.scala
@@ -0,0 +1,79 @@
+package ab
+
+import play.api.mvc.RequestHeader
+import play.api.libs.typedmap.TypedKey
+import java.util.concurrent.ConcurrentHashMap
+import scala.jdk.CollectionConverters._
+
+object ABTests {
+
+ type ABTest = (String, String)
+ type ABTestsHashMap = ConcurrentHashMap[ABTest, Unit]
+
+ private val attrKey: TypedKey[ConcurrentHashMap[ABTest, Unit]] =
+ TypedKey[ABTestsHashMap]("serverABTests")
+
+ /** Decorates the request with the AB tests defined in the request header. The header should be in the format:
+ * "testName1:variant1,testName2:variant2,..."
+ */
+ def decorateRequest(implicit request: RequestHeader, abTestHeader: String): RequestHeader = {
+ val tests = request.headers.get(abTestHeader).fold(Map.empty[String, String]) { tests =>
+ tests
+ .split(",")
+ .collect {
+ case test if test.split(":").length == 2 =>
+ val parts = test.split(":")
+ parts(0).trim -> parts(1).trim
+ }
+ .toMap
+ }
+ request.addAttr(
+ attrKey,
+ tests.foldLeft(new ABTestsHashMap) { case (map, (name, variant)) => map.put((name, variant), ()); map },
+ )
+ }
+
+ /** Checks if the request is participating in a specific AB test.
+ * @param testName
+ * The name of the AB test to check.
+ * @return
+ * true if the request is participating in the test, false otherwise.
+ */
+ def isParticipating(implicit request: RequestHeader, testName: String): Boolean = {
+ request.attrs.get(attrKey).exists(_.asScala.keys.exists { case (name, _) => name == testName })
+ }
+
+ /** Checks if the request is in a specific variant of an AB test.
+ * @param testName
+ * The name of the AB test to check.
+ * @param variant
+ * The variant to check.
+ * @return
+ * true if the request is in the specified variant, false otherwise.
+ */
+ def isInVariant(implicit request: RequestHeader, testName: String, variant: String): Boolean = {
+ request.attrs.get(attrKey).exists(_.containsKey((testName, variant)))
+ }
+
+ /** Retrieves all AB tests and their variants for the current request.
+ * @return
+ * A map of test names to their variants.
+ */
+ def allTests(implicit request: RequestHeader): Map[String, String] = {
+ request.attrs
+ .get(attrKey)
+ .map(_.asScala.keys.map { case (testName, variant) => testName -> variant }.toMap)
+ .getOrElse(Map.empty)
+ }
+
+ /** Generates a JavaScript object string representation of all AB tests and their variants. This is set on the window
+ * object for use in client-side JavaScript.
+ * @return
+ * A string in the format: {"testName1":"variant1","testName2":"variant2",...}
+ */
+ def getJavascriptConfig(implicit request: RequestHeader): String = {
+ allTests.toList
+ .map({ case (key, value) => s""""${key}":"${value}"""" })
+ .mkString(",")
+ }
+}
diff --git a/common/app/agents/DeeplyReadAgent.scala b/common/app/agents/DeeplyReadAgent.scala
index 3a3036f04082..ae1e41566639 100644
--- a/common/app/agents/DeeplyReadAgent.scala
+++ b/common/app/agents/DeeplyReadAgent.scala
@@ -1,6 +1,6 @@
package agents
-import com.gu.contentapi.client.model.v1.Content
+import com.gu.contentapi.client.model.v1.{Content, ElementType}
import com.gu.contentapi.client.utils.CapiModelEnrichment.RenderingFormat
import common._
import contentapi.ContentApiClient
@@ -123,6 +123,9 @@ class DeeplyReadAgent(contentApiClient: ContentApiClient, ophanApi: OphanApi) ex
avatarUrl = None,
branding = None,
discussion = DiscussionSettings.fromTrail(FaciaContentConvert.contentToFaciaContent(content)),
+ trailText = content.fields.flatMap(_.trailText),
+ galleryCount =
+ content.elements.map(_.count(el => el.`type` == ElementType.Image && el.relation == "gallery")).filter(_ > 0),
)
}
diff --git a/common/app/awswrappers/cloudwatch.scala b/common/app/awswrappers/cloudwatch.scala
deleted file mode 100644
index 95e84de86f89..000000000000
--- a/common/app/awswrappers/cloudwatch.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-package awswrappers
-
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchAsync
-import com.amazonaws.services.cloudwatch.model._
-
-import scala.concurrent.Future
-
-/** NB: We ought to switch to this library once we update to Scala 2.11.2:
- *
- * https://github.com/guardian/aws-sdk-scala-wrappers
- *
- * Then we can delete these manually written wrappers.
- */
-object cloudwatch {
- implicit class RichAsyncCloudWatchClient(client: AmazonCloudWatchAsync) {
- def putMetricDataFuture(request: PutMetricDataRequest): Future[PutMetricDataResult] =
- asFuture[PutMetricDataRequest, PutMetricDataResult](client.putMetricDataAsync(request, _))
-
- def getMetricStatisticsFuture(request: GetMetricStatisticsRequest): Future[GetMetricStatisticsResult] =
- asFuture[GetMetricStatisticsRequest, GetMetricStatisticsResult](client.getMetricStatisticsAsync(request, _))
-
- def listMetricsFuture(request: ListMetricsRequest): Future[ListMetricsResult] =
- asFuture[ListMetricsRequest, ListMetricsResult](client.listMetricsAsync(request, _))
- }
-}
diff --git a/common/app/awswrappers/kinesisfirehose.scala b/common/app/awswrappers/kinesisfirehose.scala
deleted file mode 100644
index 15da1553a66f..000000000000
--- a/common/app/awswrappers/kinesisfirehose.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package awswrappers
-
-import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseAsync
-import com.amazonaws.services.kinesisfirehose.model.{PutRecordRequest, PutRecordResult}
-
-import scala.concurrent.Future
-
-object kinesisfirehose {
- implicit class RichKinesisFirehoseAsyncClient(client: AmazonKinesisFirehoseAsync) {
- def putRecordFuture(request: PutRecordRequest): Future[PutRecordResult] =
- asFuture[PutRecordRequest, PutRecordResult](client.putRecordAsync(request, _))
- }
-}
diff --git a/common/app/awswrappers/package.scala b/common/app/awswrappers/package.scala
deleted file mode 100644
index 2fe99479c0b0..000000000000
--- a/common/app/awswrappers/package.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-import com.amazonaws.handlers.AsyncHandler
-
-import scala.concurrent.{Future, Promise}
-import scala.util.{Success, Failure}
-import java.util.concurrent.{Future => JavaFuture}
-
-package object awswrappers {
- private[awswrappers] def createHandler[A <: com.amazonaws.AmazonWebServiceRequest, B]() = {
- val promise = Promise[B]()
-
- val handler = new AsyncHandler[A, B] {
- override def onSuccess(request: A, result: B): Unit = promise.complete(Success(result))
-
- override def onError(exception: Exception): Unit = promise.complete(Failure(exception))
- }
-
- (promise.future, handler)
- }
-
- private[awswrappers] def asFuture[A <: com.amazonaws.AmazonWebServiceRequest, B](
- block: AsyncHandler[A, B] => JavaFuture[B],
- ): Future[B] = {
- val (future, handler) = createHandler[A, B]()
-
- block(handler)
-
- future
- }
-}
diff --git a/common/app/awswrappers/sns.scala b/common/app/awswrappers/sns.scala
deleted file mode 100644
index 3d7b73fca6f6..000000000000
--- a/common/app/awswrappers/sns.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package awswrappers
-
-import com.amazonaws.services.sns.AmazonSNSAsync
-import com.amazonaws.services.sns.model.{PublishRequest, PublishResult}
-
-import scala.concurrent.Future
-
-object sns {
- implicit class RichSnsAsyncClient(client: AmazonSNSAsync) {
- def publishFuture(publishRequest: PublishRequest): Future[PublishResult] =
- asFuture[PublishRequest, PublishResult](client.publishAsync(publishRequest, _))
- }
-}
diff --git a/common/app/bindables/LocalDateBindable.scala b/common/app/bindables/LocalDateBindable.scala
index 478d74c0458b..c3bb87f419b1 100644
--- a/common/app/bindables/LocalDateBindable.scala
+++ b/common/app/bindables/LocalDateBindable.scala
@@ -14,7 +14,7 @@ class LocalDateBindable extends PathBindable[LocalDate] with GuLogging {
Try {
Option(LocalDate.parse(value, DateTimeFormat.forPattern(Format))).get
} match {
- case Success(date) => Right(date)
+ case Success(date) => Right(date)
case Failure(error) =>
log.error(s"Could not bind $key to $value", error)
Left(error.getMessage)
diff --git a/common/app/commercial/targeting/CampaignAgent.scala b/common/app/commercial/targeting/CampaignAgent.scala
index 2e965f396089..a4755ff54179 100644
--- a/common/app/commercial/targeting/CampaignAgent.scala
+++ b/common/app/commercial/targeting/CampaignAgent.scala
@@ -13,7 +13,7 @@ object CampaignAgent extends GuLogging {
def refresh()(implicit executionContext: ExecutionContext): Future[Unit] = {
// The maximum number of campaigns which will be fetched. If there are too many campaigns additional campaigns will be truncated.
// Which campaigns make it through is undefined
- val campaignLimit = 200
+ val campaignLimit = 300
// Total number of rules allowed per campaign, any campaigns with more than one rule will be filtered
val ruleLimit = 1
diff --git a/common/app/common/InlineStyles.scala b/common/app/common/InlineStyles.scala
index e7ad874c14a3..b05238959357 100644
--- a/common/app/common/InlineStyles.scala
+++ b/common/app/common/InlineStyles.scala
@@ -108,7 +108,7 @@ object InlineStyles extends GuLogging {
Retry(3)(cssParser.parseStyleSheet(source, null, null)) { (exception, attemptNumber) =>
log.error(s"Attempt $attemptNumber to parse stylesheet failed", exception)
} match {
- case Failure(_) => (inline, head :+ element.html)
+ case Failure(_) => (inline, head :+ element.html)
case Success(sheet) =>
val (styles, others) = seq(sheet.getCssRules).partition(isStyleRule)
val (inlineStyles, headStyles) = styles.flatMap(CSSRule.fromW3).flatten.partition(_.canInline)
diff --git a/common/app/common/JsonComponent.scala b/common/app/common/JsonComponent.scala
index c3b5d81f5e6c..33abad55cfb5 100644
--- a/common/app/common/JsonComponent.scala
+++ b/common/app/common/JsonComponent.scala
@@ -59,12 +59,12 @@ object JsonComponent extends Results with implicits.Requests {
toJson(
(items.toMap + ("refreshStatus" -> AutoRefreshSwitch.isSwitchedOn)).map {
// compress and take the body if value is Html
- case (name, html: Html) => name -> toJson(html.body)
- case (name, value: String) => name -> toJson(value)
- case (name, value: Boolean) => name -> toJson(value)
- case (name, value: Int) => name -> toJson(value)
- case (name, value: Double) => name -> toJson(value)
- case (name, value: Float) => name -> toJson(value)
+ case (name, html: Html) => name -> toJson(html.body)
+ case (name, value: String) => name -> toJson(value)
+ case (name, value: Boolean) => name -> toJson(value)
+ case (name, value: Int) => name -> toJson(value)
+ case (name, value: Double) => name -> toJson(value)
+ case (name, value: Float) => name -> toJson(value)
case (name, value: Seq[_]) if value.forall(_.isInstanceOf[String]) =>
name -> toJson(value.asInstanceOf[Seq[String]])
case (name, value: JsValue) => name -> value
diff --git a/common/app/common/ModelOrResult.scala b/common/app/common/ModelOrResult.scala
index a4bf0248b4fc..e277e3981770 100644
--- a/common/app/common/ModelOrResult.scala
+++ b/common/app/common/ModelOrResult.scala
@@ -1,8 +1,9 @@
package common
-import com.gu.contentapi.client.model.v1.{Section => ApiSection, ItemResponse}
+import com.gu.contentapi.client.model.v1
+import com.gu.contentapi.client.model.v1.{ItemResponse, Section => ApiSection}
import contentapi.Paths
-import play.api.mvc.{Result, RequestHeader, Results}
+import play.api.mvc.{RequestHeader, Result, Results}
import model._
import implicits.ItemResponses
import java.net.URI
@@ -57,6 +58,7 @@ private object ItemOrRedirect extends ItemResponses with GuLogging {
private def paramString(r: RequestHeader) = if (r.rawQueryString.isEmpty) "" else s"?${r.rawQueryString}"
private def canonicalPath(response: ItemResponse) = response.webUrl.map(new URI(_)).map(_.getPath)
+ def canonicalPath(content: v1.Content): String = new URI(content.webUrl).getPath
private def pathWithoutEdition(section: ApiSection) =
section.editions
@@ -77,29 +79,32 @@ object InternalRedirect extends implicits.Requests with GuLogging {
.orElse(response.tag.map(t => internalRedirect("facia", t.id)))
.orElse(response.section.map(s => internalRedirect("facia", s.id)))
- def contentTypes(response: ItemResponse)(implicit request: RequestHeader): Option[Result] = {
+ private def contentTypes(response: ItemResponse)(implicit request: RequestHeader): Option[Result] = {
response.content.map {
- case a if a.isArticle || a.isLiveBlog => internalRedirect("type/article", a.id)
- case v if v.isVideo => internalRedirect("applications", v.id)
- case g if g.isGallery => internalRedirect("applications", g.id)
- case a if a.isAudio => internalRedirect("applications", a.id)
+ case a if a.isArticle || a.isLiveBlog =>
+ internalRedirect("type/article", ItemOrRedirect.canonicalPath(a))
+ case a if a.isInteractive =>
+ internalRedirect("applications/interactive", ItemOrRedirect.canonicalPath(a))
+ case a if a.isVideo || a.isGallery || a.isAudio =>
+ internalRedirect("applications", ItemOrRedirect.canonicalPath(a))
case unsupportedContent =>
logInfoWithRequestId(s"unsupported content: ${unsupportedContent.id}")
NotFound
-
}
}
- def internalRedirect(base: String, id: String)(implicit request: RequestHeader): Result =
- internalRedirect(base, id, None)
+ private def internalRedirect(base: String, id: String)(implicit request: RequestHeader): Result =
+ internalRedirect(base, id, request.rawQueryStringOption.map("?" + _))
def internalRedirect(base: String, id: String, queryString: Option[String])(implicit
request: RequestHeader,
): Result = {
+ // remove any leading `/` from the ID before using in the redirect
+ val path = id.stripPrefix("/")
val qs: String = queryString.getOrElse("")
request.path match {
- case ShortUrl(_) => Found(s"/$id$qs")
- case _ => Ok.withHeaders("X-Accel-Redirect" -> s"/$base/$id$qs")
+ case ShortUrl(_) => Found(s"/$path$qs")
+ case _ => Ok.withHeaders("X-Accel-Redirect" -> s"/$base/$path$qs")
}
}
diff --git a/common/app/common/SQSQueues.scala b/common/app/common/SQSQueues.scala
index de8789cd0b52..8cd95d97d078 100644
--- a/common/app/common/SQSQueues.scala
+++ b/common/app/common/SQSQueues.scala
@@ -1,105 +1,84 @@
package common
-import java.util.concurrent.{Future => JavaFuture}
-
-import com.amazonaws.handlers.AsyncHandler
-import com.amazonaws.services.sqs.AmazonSQSAsync
-import com.amazonaws.services.sqs.model.{Message => AWSMessage, _}
import play.api.libs.json.{Json, Reads, Writes}
+import software.amazon.awssdk.services.sqs.SqsAsyncClient
+import software.amazon.awssdk.services.sqs.model.{
+ ChangeMessageVisibilityRequest,
+ ChangeMessageVisibilityResponse,
+ DeleteMessageRequest,
+ Message => AWSMessage,
+ ReceiveMessageRequest,
+ SendMessageRequest,
+ SendMessageResponse,
+}
import scala.jdk.CollectionConverters._
+import scala.jdk.FutureConverters._
import scala.collection.mutable
-import scala.concurrent.{ExecutionContext, Future, Promise}
-import scala.util.{Failure, Success}
-
-object SQSQueues {
- implicit class RichAmazonSQSAsyncClient(client: AmazonSQSAsync) {
- private def createHandler[A <: com.amazonaws.AmazonWebServiceRequest, B]() = {
- val promise = Promise[B]()
-
- val handler = new AsyncHandler[A, B] {
- override def onSuccess(request: A, result: B): Unit = promise.complete(Success(result))
-
- override def onError(exception: Exception): Unit = promise.complete(Failure(exception))
- }
-
- (promise.future, handler)
- }
-
- private def asFuture[A <: com.amazonaws.AmazonWebServiceRequest, B](f: AsyncHandler[A, B] => JavaFuture[B]) = {
- val (future, handler) = createHandler[A, B]()
- f(handler)
- future
- }
-
- def receiveMessageFuture(request: ReceiveMessageRequest): Future[ReceiveMessageResult] =
- asFuture[ReceiveMessageRequest, ReceiveMessageResult](client.receiveMessageAsync(request, _))
-
- def deleteMessageFuture(request: DeleteMessageRequest): Future[DeleteMessageResult] =
- asFuture[DeleteMessageRequest, DeleteMessageResult](client.deleteMessageAsync(request, _))
-
- def sendMessageFuture(request: SendMessageRequest): Future[SendMessageResult] =
- asFuture[SendMessageRequest, SendMessageResult](client.sendMessageAsync(request, _))
-
- def changeMessageVisibilityFuture(request: ChangeMessageVisibilityRequest): Future[ChangeMessageVisibilityResult] =
- asFuture[ChangeMessageVisibilityRequest, ChangeMessageVisibilityResult](
- client.changeMessageVisibilityAsync(request, _),
- )
- }
-}
+import scala.concurrent.{ExecutionContext, Future}
case class MessageId(get: String) extends AnyVal
case class ReceiptHandle(get: String) extends AnyVal
case class Message[A](id: MessageId, get: A, handle: ReceiptHandle)
-class MessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implicit executionContext: ExecutionContext) {
-
- import SQSQueues._
+class MessageQueue[A](client: SqsAsyncClient, queueUrl: String)(implicit executionContext: ExecutionContext) {
- protected def sendMessage(sendRequest: SendMessageRequest): Future[SendMessageResult] = {
- client.sendMessageFuture(sendRequest)
+ protected def sendMessage(sendRequest: SendMessageRequest): Future[SendMessageResponse] = {
+ client.sendMessage(sendRequest).asScala
}
- def retryMessageAfter(handle: ReceiptHandle, timeoutSeconds: Int): Future[ChangeMessageVisibilityResult] = {
- client.changeMessageVisibilityFuture(new ChangeMessageVisibilityRequest(queueUrl, handle.get, timeoutSeconds))
+ def retryMessageAfter(handle: ReceiptHandle, timeoutSeconds: Int): Future[ChangeMessageVisibilityResponse] = {
+ client
+ .changeMessageVisibility(
+ ChangeMessageVisibilityRequest
+ .builder()
+ .queueUrl(queueUrl)
+ .receiptHandle(handle.get)
+ .visibilityTimeout(timeoutSeconds)
+ .build(),
+ )
+ .asScala
}
protected def receiveMessages(receiveRequest: ReceiveMessageRequest): Future[mutable.Buffer[AWSMessage]] = {
- client.receiveMessageFuture(receiveRequest.withQueueUrl(queueUrl)) map { response =>
- response.getMessages.asScala
+ client.receiveMessage(receiveRequest.toBuilder.queueUrl(queueUrl).build()).asScala map { response =>
+ response.messages().asScala
}
}
protected def deleteMessage(handle: ReceiptHandle): Future[Unit] = {
client
- .deleteMessageFuture(
- new DeleteMessageRequest()
- .withQueueUrl(queueUrl)
- .withReceiptHandle(handle.get),
+ .deleteMessage(
+ DeleteMessageRequest
+ .builder()
+ .queueUrl(queueUrl)
+ .receiptHandle(handle.get)
+ .build(),
)
+ .asScala
.map(_ => ())
}
}
/** Utility class for SQS queues that pass simple string messages */
-case class TextMessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implicit executionContext: ExecutionContext)
+case class TextMessageQueue[A](client: SqsAsyncClient, queueUrl: String)(implicit executionContext: ExecutionContext)
extends MessageQueue[A](client, queueUrl)(executionContext) {
def receive(request: ReceiveMessageRequest): Future[Seq[Message[String]]] = {
receiveMessages(request) map { messages =>
messages.toSeq map { message =>
Message(
- MessageId(message.getMessageId),
- message.getBody,
- ReceiptHandle(message.getReceiptHandle),
+ MessageId(message.messageId()),
+ message.body(),
+ ReceiptHandle(message.receiptHandle()),
)
}
}
}
def receiveOne(request: ReceiveMessageRequest): Future[Option[Message[String]]] = {
- receive(request.withMaxNumberOfMessages(1)) map { messages =>
+ receive(request.toBuilder.maxNumberOfMessages(1).build()) map { messages =>
messages.toList match {
case message :: Nil => Some(message)
case Nil => None
@@ -113,30 +92,30 @@ case class TextMessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implici
}
/** Utility class for SQS queues that use JSON to serialize their messages */
-case class JsonMessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implicit executionContext: ExecutionContext)
+case class JsonMessageQueue[A](client: SqsAsyncClient, queueUrl: String)(implicit executionContext: ExecutionContext)
extends MessageQueue[A](client, queueUrl)(executionContext) {
- def send(a: A)(implicit writes: Writes[A]): Future[SendMessageResult] =
- sendMessage(new SendMessageRequest().withQueueUrl(queueUrl).withMessageBody(Json.stringify(Json.toJson(a))))
+ def send(a: A)(implicit writes: Writes[A]): Future[SendMessageResponse] =
+ sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody(Json.stringify(Json.toJson(a))).build())
def receive(request: ReceiveMessageRequest)(implicit reads: Reads[A]): Future[Seq[Message[A]]] = {
receiveMessages(request) map { messages =>
messages.toSeq map { message =>
Message(
- MessageId(message.getMessageId),
- Json.fromJson[A](Json.parse(message.getBody)) getOrElse {
+ MessageId(message.messageId()),
+ Json.fromJson[A](Json.parse(message.body())) getOrElse {
throw new RuntimeException(
- s"Couldn't parse JSON for message with ID ${message.getMessageId}: '${message.getBody}'",
+ s"Couldn't parse JSON for message with ID ${message.messageId()}: '${message.body}'",
)
},
- ReceiptHandle(message.getReceiptHandle),
+ ReceiptHandle(message.receiptHandle),
)
}
}
}
def receiveOne(request: ReceiveMessageRequest)(implicit reads: Reads[A]): Future[Option[Message[A]]] = {
- receive(request.withMaxNumberOfMessages(1)) map { messages =>
+ receive(request.toBuilder.maxNumberOfMessages(1).build()) map { messages =>
messages.toList match {
case message :: Nil => Some(message)
case Nil => None
diff --git a/common/app/common/TrailsToRss.scala b/common/app/common/TrailsToRss.scala
index 96ccc529fca3..d2b7c2b4b9de 100644
--- a/common/app/common/TrailsToRss.scala
+++ b/common/app/common/TrailsToRss.scala
@@ -11,7 +11,7 @@ import model.liveblog.{Blocks, TextBlockElement}
import model.pressed.PressedStory
import org.jsoup.Jsoup
import play.api.mvc.RequestHeader
-import views.support.{ImageProfile, Item140, Item460}
+import views.support.{ImageProfile, Item140, Item460, Item700}
import java.io.StringWriter
import java.text.SimpleDateFormat
@@ -104,7 +104,7 @@ object TrailsToRss {
val description = makeEntryDescriptionUsing(standfirst, intro, trail.metadata.webUrl)
val mediaModules: Seq[MediaEntryModuleImpl] = for {
- profile: ImageProfile <- List(Item140, Item460)
+ profile: ImageProfile <- List(Item140, Item460, Item700)
trailPicture: ImageMedia <- trail.trailPicture
trailAsset: ImageAsset <- profile.bestFor(trailPicture)
resizedImage <- profile.bestSrcFor(trailPicture)
@@ -211,7 +211,7 @@ object TrailsToRss {
val description = makeEntryDescriptionUsing(standfirst, intro, webUrl)
val mediaModules: Seq[MediaEntryModuleImpl] = for {
- profile: ImageProfile <- List(Item140, Item460)
+ profile: ImageProfile <- List(Item140, Item460, Item700)
trailPicture: ImageMedia <- faciaContent.trail.trailPicture
trailAsset: ImageAsset <- profile.bestFor(trailPicture)
resizedImage <- profile.bestSrcFor(trailPicture)
diff --git a/common/app/common/commercial/hosted/HostedPage.scala b/common/app/common/commercial/hosted/HostedPage.scala
index b62b3910af54..ee54dd6ea2af 100644
--- a/common/app/common/commercial/hosted/HostedPage.scala
+++ b/common/app/common/commercial/hosted/HostedPage.scala
@@ -46,7 +46,7 @@ object HostedPage extends GuLogging {
case Video => HostedVideoPage.fromContent(item)
case Article => HostedArticlePage.fromContent(item)
case Gallery => HostedGalleryPage.fromContent(item)
- case _ =>
+ case _ =>
log.error(s"Failed to make unsupported hosted type: ${item.`type`}: ${item.id}")
None
}
diff --git a/common/app/common/configuration.scala b/common/app/common/configuration.scala
index 2eff1ec15ef6..21db8a160d42 100644
--- a/common/app/common/configuration.scala
+++ b/common/app/common/configuration.scala
@@ -1,8 +1,5 @@
package common
-import com.amazonaws.AmazonClientException
-import com.amazonaws.auth._
-import com.amazonaws.auth.profile.ProfileCredentialsProvider
import com.typesafe.config.{ConfigException, ConfigFactory}
import common.Environment.{app, awsRegion, stage}
import conf.{Configuration, Static}
@@ -18,6 +15,7 @@ import java.util.Map.Entry
import scala.concurrent.duration._
import scala.jdk.CollectionConverters._
import scala.util.{Failure, Success, Try}
+import conf.switches.Switches.{LineItemJobs}
class BadConfigurationException(msg: String) extends RuntimeException(msg)
@@ -132,7 +130,7 @@ object GuardianConfiguration extends GuLogging {
Try(get(property)) match {
case Success(value) => Some(value)
case Failure(_: ConfigException.Missing) => None
- case Failure(e) =>
+ case Failure(e) =>
log.error(s"couldn't retrieve $property", e)
None
}
@@ -243,10 +241,12 @@ class GuardianConfiguration extends GuLogging {
lazy val capiPreviewRoleToAssume: Option[String] =
configuration.getStringProperty("content.api.preview.roleToAssume")
- lazy val capiPreviewCredentials: AWSCredentialsProvider = new AWSCredentialsProviderChain(
- Seq(new ProfileCredentialsProvider("capi")) ++
- capiPreviewRoleToAssume.map(new STSAssumeRoleSessionCredentialsProvider.Builder(_, "capi").build()): _*,
- )
+ lazy val capiPreviewCredentials: software.amazon.awssdk.auth.credentials.AwsCredentialsProvider = {
+ import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider
+ capiPreviewRoleToAssume
+ .map(roleArn => utils.AWSv2.stsCredentials("capi", roleArn, sessionName = "capi"))
+ .getOrElse(ProfileCredentialsProvider.create("capi"))
+ }
lazy val nextPreviousPageSize: Int =
configuration.getIntegerProperty("content.api.nextPreviousPageSize").getOrElse(50)
@@ -286,13 +286,18 @@ class GuardianConfiguration extends GuLogging {
lazy val subscribeWithGoogleApiUrl =
configuration.getStringProperty("google.subscribeWithGoogleApiUrl").getOrElse("https://swg.theguardian.com")
lazy val googleRecaptchaSiteKey = configuration.getMandatoryStringProperty("guardian.page.googleRecaptchaSiteKey")
+ lazy val googleRecaptchaSiteKeyVisible =
+ configuration.getMandatoryStringProperty("guardian.page.googleRecaptchaSiteKeyVisible")
lazy val googleRecaptchaSecret = configuration.getMandatoryStringProperty("google.googleRecaptchaSecret")
+ lazy val googleRecaptchaSecretVisible =
+ configuration.getMandatoryStringProperty("google.googleRecaptchaSecretVisible")
}
object affiliateLinks {
lazy val bucket: Option[String] = configuration.getStringProperty("skimlinks.bucket")
lazy val domainsKey = "skimlinks/skimlinks-domains.csv"
- lazy val skimlinksId = configuration.getMandatoryStringProperty("skimlinks.id")
+ lazy val skimlinksDefaultId = configuration.getMandatoryStringProperty("skimlinks.id")
+ lazy val skimlinksUSId = configuration.getMandatoryStringProperty("skimlinks.us.id")
lazy val alwaysOffTags: Set[String] =
configuration.getStringProperty("affiliatelinks.always.off.tags").getOrElse("").split(",").toSet
}
@@ -478,10 +483,6 @@ class GuardianConfiguration extends GuLogging {
else configuration.getStringProperty("guardian.page.host") getOrElse ""
lazy val dfpAdUnitGuRoot = configuration.getMandatoryStringProperty("guardian.page.dfpAdUnitRoot")
- lazy val dfpFacebookIaAdUnitRoot =
- configuration.getMandatoryStringProperty("guardian.page.dfp.facebookIaAdUnitRoot")
- lazy val dfpMobileAppsAdUnitRoot =
- configuration.getMandatoryStringProperty("guardian.page.dfp.mobileAppsAdUnitRoot")
lazy val dfpAccountId = configuration.getMandatoryStringProperty("guardian.page.dfpAccountId")
lazy val travelFeedUrl = configuration.getStringProperty("travel.feed.url")
@@ -492,19 +493,19 @@ class GuardianConfiguration extends GuLogging {
}
private lazy val dfpRoot = s"$commercialRoot/dfp"
- lazy val dfpPageSkinnedAdUnitsKey = s"$dfpRoot/pageskinned-adunits-v9.json"
- lazy val dfpLiveBlogTopSponsorshipDataKey = s"$dfpRoot/liveblog-top-sponsorships-v3.json"
- lazy val dfpSurveySponsorshipDataKey = s"$dfpRoot/survey-sponsorships.json"
- lazy val dfpNonRefreshableLineItemIdsKey = s"$dfpRoot/non-refreshable-lineitem-ids-v1.json"
- lazy val dfpLineItemsKey = s"$dfpRoot/lineitems-v7.json"
- lazy val dfpActiveAdUnitListKey = s"$dfpRoot/active-ad-units.csv"
- lazy val dfpMobileAppsAdUnitListKey = s"$dfpRoot/mobile-active-ad-units.csv"
- lazy val dfpFacebookIaAdUnitListKey = s"$dfpRoot/facebookia-active-ad-units.csv"
- lazy val dfpTemplateCreativesKey = s"$dfpRoot/template-creatives.json"
- lazy val dfpCustomTargetingKey = s"$dfpRoot/custom-targeting-key-values.json"
+ private lazy val gamRoot = s"$commercialRoot/gam"
+ def dfpPageSkinnedAdUnitsKey = s"$gamRoot/pageskins.json"
+ lazy val dfpLiveBlogTopSponsorshipDataKey = s"$gamRoot/liveblog-top-sponsorships.json"
+ def dfpSurveySponsorshipDataKey = s"$gamRoot/survey-sponsorships.json"
+ def dfpNonRefreshableLineItemIdsKey = s"$gamRoot/non-refreshable-line-items.json"
+ def dfpLineItemsKey =
+ if (LineItemJobs.isSwitchedOn) s"$gamRoot/line-items.json"
+ else s"$dfpRoot/lineitems-v7.json"
+ lazy val dfpSpecialAdUnitsKey = s"$gamRoot/special-ad-units.json"
+ lazy val dfpCustomFieldsKey = s"$gamRoot/custom-fields.json"
+ lazy val dfpCustomTargetingKey = s"$gamRoot/custom-targeting-key-values.json"
lazy val adsTextObjectKey = s"$commercialRoot/ads.txt"
lazy val appAdsTextObjectKey = s"$commercialRoot/app-ads.txt"
- lazy val takeoversWithEmptyMPUsKey = s"$commercialRoot/takeovers-with-empty-mpus.json"
private lazy val merchandisingFeedsRoot = s"$commercialRoot/merchandising"
lazy val merchandisingFeedsLatest = s"$merchandisingFeedsRoot/latest"
@@ -525,6 +526,12 @@ class GuardianConfiguration extends GuLogging {
lazy val overrideCommercialBundleUrl: Option[String] =
if (environment.isDev) configuration.getStringProperty("commercial.overrideCommercialBundleUrl")
else None
+
+ lazy val admiralUrl = configuration.getStringProperty("commercial.admiralUrl")
+ }
+
+ object abTesting {
+ lazy val uiHtmlObjectKey = s"${environment.stage.toUpperCase}/admin/ab-testing/ab-tests.html"
}
object journalism {
@@ -650,26 +657,6 @@ class GuardianConfiguration extends GuLogging {
lazy val frontPressSns: Option[String] = configuration.getStringProperty("frontpress.sns.topic")
lazy val r2PressSns: Option[String] = configuration.getStringProperty("r2press.sns.topic")
lazy val r2PressTakedownSns: Option[String] = configuration.getStringProperty("r2press.takedown.sns.topic")
-
- def mandatoryCredentials: AWSCredentialsProvider =
- credentials.getOrElse(throw new BadConfigurationException("AWS credentials are not configured"))
- val credentials: Option[AWSCredentialsProvider] = {
- val provider = new AWSCredentialsProviderChain(
- new ProfileCredentialsProvider("frontend"),
- InstanceProfileCredentialsProvider.getInstance(),
- )
-
- // this is a bit of a convoluted way to check whether we actually have credentials.
- // I guess in an ideal world there would be some sort of isConfigued() method...
- try {
- provider.getCredentials
- Some(provider)
- } catch {
- case ex: AmazonClientException =>
- log.error(ex.getMessage, ex)
- throw ex
- }
- }
}
object standalone {
diff --git a/common/app/common/dfp/AdSlotAgent.scala b/common/app/common/dfp/AdSlotAgent.scala
deleted file mode 100644
index d4a5bb353441..000000000000
--- a/common/app/common/dfp/AdSlotAgent.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package common.dfp
-
-import java.net.URI
-import common.Edition
-
-trait AdSlotAgent {
-
- protected def takeoversWithEmptyMPUs: Seq[TakeoverWithEmptyMPUs]
-
- def omitMPUsFromContainers(pageId: String, edition: Edition): Boolean = {
-
- def toPageId(url: String): String = new URI(url).getPath.tail
-
- val current = takeoversWithEmptyMPUs filter { takeover =>
- takeover.startTime.isBeforeNow && takeover.endTime.isAfterNow
- }
-
- current exists { takeover =>
- toPageId(takeover.url) == pageId && takeover.editions.contains(edition)
- }
- }
-}
-
-sealed abstract class AdSlot(val name: String)
diff --git a/common/app/common/dfp/DfpAgent.scala b/common/app/common/dfp/DfpAgent.scala
index 1d4b71ad8ed9..8f774167577e 100644
--- a/common/app/common/dfp/DfpAgent.scala
+++ b/common/app/common/dfp/DfpAgent.scala
@@ -8,24 +8,22 @@ import services.S3
import scala.concurrent.ExecutionContext
import scala.io.Codec.UTF8
+import org.checkerframework.checker.units.qual.s
-object DfpAgent extends PageskinAdAgent with LiveBlogTopSponsorshipAgent with SurveySponsorshipAgent with AdSlotAgent {
+object DfpAgent extends PageskinAdAgent with LiveBlogTopSponsorshipAgent with SurveySponsorshipAgent {
override protected val environmentIsProd: Boolean = environment.isProd
private lazy val liveblogTopSponsorshipAgent = Box[Seq[LiveBlogTopSponsorship]](Nil)
private lazy val surveyAdUnitAgent = Box[Seq[SurveySponsorship]](Nil)
private lazy val pageskinnedAdUnitAgent = Box[Seq[PageSkinSponsorship]](Nil)
- private lazy val lineItemAgent = Box[Map[AdSlot, Seq[GuLineItem]]](Map.empty)
- private lazy val takeoverWithEmptyMPUsAgent = Box[Seq[TakeoverWithEmptyMPUs]](Nil)
private lazy val nonRefreshableLineItemsAgent = Box[Seq[Long]](Nil)
+ private lazy val specialAdUnitsAgent = Box[Seq[(String, String)]](Nil)
+ private lazy val customFieldsAgent = Box[Seq[GuCustomField]](Nil)
protected def pageSkinSponsorships: Seq[PageSkinSponsorship] = pageskinnedAdUnitAgent.get()
protected def liveBlogTopSponsorships: Seq[LiveBlogTopSponsorship] = liveblogTopSponsorshipAgent.get()
protected def surveySponsorships: Seq[SurveySponsorship] = surveyAdUnitAgent.get()
- protected def lineItemsBySlot: Map[AdSlot, Seq[GuLineItem]] = lineItemAgent.get()
- protected def takeoversWithEmptyMPUs: Seq[TakeoverWithEmptyMPUs] =
- takeoverWithEmptyMPUsAgent.get()
def nonRefreshableLineItemIds(): Seq[Long] = nonRefreshableLineItemsAgent.get()
@@ -73,6 +71,20 @@ object DfpAgent extends PageskinAdAgent with LiveBlogTopSponsorshipAgent with Su
} yield lineItemIds) getOrElse Nil
}
+ def grabSpecialAdUnitsFromStore(): Seq[(String, String)] = {
+ (for {
+ jsonString <- stringFromS3(dfpSpecialAdUnitsKey)
+ report <- Json.parse(jsonString).validate[Seq[(String, String)]].asOpt
+ } yield report) getOrElse Nil
+ }
+
+ def grabCustomFieldsFromStore() = {
+ (for {
+ jsonString <- stringFromS3(dfpCustomFieldsKey)
+ customFields <- Json.parse(jsonString).validate[Seq[GuCustomField]].asOpt
+ } yield customFields) getOrElse Nil
+ }
+
update(pageskinnedAdUnitAgent)(grabPageSkinSponsorshipsFromStore(dfpPageSkinnedAdUnitsKey))
update(nonRefreshableLineItemsAgent)(grabNonRefreshableLineItemIdsFromStore())
@@ -81,10 +93,9 @@ object DfpAgent extends PageskinAdAgent with LiveBlogTopSponsorshipAgent with Su
update(surveyAdUnitAgent)(grabSurveySponsorshipsFromStore())
- }
+ update(specialAdUnitsAgent)(grabSpecialAdUnitsFromStore())
- def refreshFaciaSpecificData()(implicit executionContext: ExecutionContext): Unit = {
+ update(customFieldsAgent)(grabCustomFieldsFromStore())
- update(takeoverWithEmptyMPUsAgent)(TakeoverWithEmptyMPUs.fetch())
}
}
diff --git a/common/app/common/dfp/DfpAgentLifecycle.scala b/common/app/common/dfp/DfpAgentLifecycle.scala
index 40de6413596c..714c7e8bae33 100644
--- a/common/app/common/dfp/DfpAgentLifecycle.scala
+++ b/common/app/common/dfp/DfpAgentLifecycle.scala
@@ -30,13 +30,3 @@ class DfpAgentLifecycle(appLifeCycle: ApplicationLifecycle, jobs: JobScheduler,
}
}
}
-
-class FaciaDfpAgentLifecycle(appLifeCycle: ApplicationLifecycle, jobs: JobScheduler, pekkoAsync: PekkoAsync)(implicit
- ec: ExecutionContext,
-) extends DfpAgentLifecycle(appLifeCycle, jobs, pekkoAsync) {
-
- override def refreshDfpAgent(): Unit = {
- DfpAgent.refresh()
- DfpAgent.refreshFaciaSpecificData()
- }
-}
diff --git a/common/app/common/dfp/DfpData.scala b/common/app/common/dfp/DfpData.scala
index 3bae0e67a27f..b0c394c00d2d 100644
--- a/common/app/common/dfp/DfpData.scala
+++ b/common/app/common/dfp/DfpData.scala
@@ -76,9 +76,9 @@ case class CustomTarget(name: String, op: String, values: Seq[String]) {
def isPlatform(value: String): Boolean = isPositive("p") && values.contains(value)
def isNotPlatform(value: String): Boolean = isNegative("p") && values.contains(value)
- def matchesLiveBlogTopTargeting: Boolean = {
- val liveBlogTopSectionTargets = List("culture", "football", "sport", "tv-and-radio")
- values.intersect(liveBlogTopSectionTargets).nonEmpty
+ val allowedliveBlogTopSectionTargets = Seq("culture", "football", "sport", "tv-and-radio")
+ private def matchesLiveBlogTopTargeting: Boolean = {
+ values.intersect(allowedliveBlogTopSectionTargets).nonEmpty
}
val isLiveblogTopSlot = isSlot("liveblog-top")
@@ -265,10 +265,8 @@ case class GuLineItem(
target.name == "ct" && target.values.contains("liveblog")
}
- val allowedSections = Set("culture", "sport", "football")
-
val targetsOnlyAllowedSections = matchingLiveblogTargeting.exists { target =>
- target.name == "s" && target.values.forall(allowedSections.contains)
+ target.name == "s" && target.values.forall(target.allowedliveBlogTopSectionTargets.contains)
}
val isMobileBreakpoint = matchingLiveblogTargeting.exists { target =>
@@ -277,23 +275,25 @@ case class GuLineItem(
val isSponsorship = lineItemType == Sponsorship
- val hasEditionTargeting = targeting.editions.nonEmpty
-
- isLiveblogTopSlot && isLiveblogContentType && targetsOnlyAllowedSections && isMobileBreakpoint && isSponsorship && hasEditionTargeting
+ isLiveblogTopSlot && isLiveblogContentType && targetsOnlyAllowedSections && isMobileBreakpoint && isSponsorship
}
val targetsSurvey: Boolean = {
val matchingSurveyTargeting = for {
targetSet <- targeting.customTargetSets
target <- targetSet.targets
- if target.name == "slot" || target.values.contains("survey")
+ if target.name == "slot" || target.name == "bp"
} yield target
- val isSurveySlot = matchingSurveyTargeting.exists { target =>
+ val targetsSurveySlot = matchingSurveyTargeting.exists { target =>
target.name == "slot" && target.values.contains("survey")
}
- isSurveySlot
+ val targetsDesktopBreakpoint = matchingSurveyTargeting.exists { target =>
+ target.name == "bp" && target.values.contains("desktop")
+ }
+
+ targetsSurveySlot && targetsDesktopBreakpoint
}
lazy val targetsNetworkOrSectionFrontDirectly: Boolean = {
diff --git a/common/app/common/dfp/LiveBlogTopSponsorshipAgent.scala b/common/app/common/dfp/LiveBlogTopSponsorshipAgent.scala
index f8716f1728a0..9a6d48c46394 100644
--- a/common/app/common/dfp/LiveBlogTopSponsorshipAgent.scala
+++ b/common/app/common/dfp/LiveBlogTopSponsorshipAgent.scala
@@ -20,10 +20,13 @@ trait LiveBlogTopSponsorshipAgent {
adTest: Option[String],
): Seq[LiveBlogTopSponsorship] = {
liveBlogTopSponsorships.filter { sponsorship =>
- sponsorship.editions.contains(edition) && sponsorship.sections.contains(
- sectionId,
- ) && (keywords exists sponsorship.hasTag) && sponsorship
- .matchesTargetedAdTest(adTest)
+ // Section must match
+ sponsorship.sections.contains(sectionId) &&
+ // Edition, keywords & adtest are optional matches
+ // If specified on the line item, they must match
+ sponsorship.matchesEditionTargeting(edition) &&
+ sponsorship.matchesKeywordTargeting(keywords) &&
+ sponsorship.matchesTargetedAdTest(adTest)
}
}
@@ -32,7 +35,7 @@ trait LiveBlogTopSponsorshipAgent {
val adTest = request.getQueryString("adtest")
val edition = Edition(request)
- findSponsorships(edition, metadata.sectionId, tags, adTest).nonEmpty
+ findSponsorships(edition, metadata.sectionId, tags.filter(_.isKeyword), adTest).nonEmpty
} else {
false
}
diff --git a/common/app/common/dfp/LiveblogTopSponsorship.scala b/common/app/common/dfp/LiveblogTopSponsorship.scala
index 5e0eec3d7eff..342889f40a4d 100644
--- a/common/app/common/dfp/LiveblogTopSponsorship.scala
+++ b/common/app/common/dfp/LiveblogTopSponsorship.scala
@@ -13,19 +13,41 @@ case class LiveBlogTopSponsorship(
adTest: Option[String],
targetsAdTest: Boolean,
) {
- def matchesTargetedAdTest(adTest: Option[String]): Boolean =
- if (this.targetsAdTest) { adTest == this.adTest }
- else { true }
+ def matchesTargetedAdTest(adTest: Option[String]): Boolean = {
+ if (this.targetsAdTest) {
+ // If the sponsorship targets an adtest, check if it matches
+ adTest == this.adTest
+ } else {
+ // If no adtest targeting, return true
+ true
+ }
+ }
- private def hasTagId(tags: Seq[String], tagId: String): Boolean =
- tagId.split('/').lastOption exists { endPart =>
- tags contains endPart
+ def matchesEditionTargeting(edition: Edition) = {
+ if (this.editions.nonEmpty) {
+ // If the sponsorship targets an edition, check if it matches
+ this.editions.exists(_.id == edition.id)
+ } else {
+ // If no edition targeting, return true
+ true
+ }
+ }
+
+ def matchesKeywordTargeting(keywordTags: Seq[Tag]) = {
+ if (this.keywords.nonEmpty) {
+ // If the sponsorship targets a keyword, check if it matches
+ keywordTags exists { tag: Tag =>
+ tag.isKeyword && matchesTag(this.keywords, tag.id)
+ }
+ } else {
+ // If no keyword targeting, return true
+ true
}
+ }
- def hasTag(tag: Tag): Boolean =
- tag.properties.tagType match {
- case "Keyword" => hasTagId(keywords, tag.id)
- case _ => false
+ private def matchesTag(tags: Seq[String], tagId: String): Boolean =
+ tagId.split("/").lastOption exists { endPart =>
+ tags contains endPart
}
}
diff --git a/common/app/common/dfp/TakeoverWithEmptyMPUs.scala b/common/app/common/dfp/TakeoverWithEmptyMPUs.scala
deleted file mode 100644
index 7de28be96fac..000000000000
--- a/common/app/common/dfp/TakeoverWithEmptyMPUs.scala
+++ /dev/null
@@ -1,102 +0,0 @@
-package common.dfp
-
-import common.Edition
-import conf.Configuration.commercial._
-import org.joda.time.format.{DateTimeFormat, ISODateTimeFormat}
-import org.joda.time.{DateTime, DateTimeZone}
-import play.api.data.Forms._
-import play.api.data.JodaForms._
-import play.api.data.format.Formatter
-import play.api.data.validation.{Invalid, Valid, Constraint}
-import play.api.data.{Form, FormError}
-import play.api.libs.functional.syntax._
-import play.api.libs.json.Json._
-import play.api.libs.json._
-import services.S3
-import java.net.{MalformedURLException, URL}
-
-case class TakeoverWithEmptyMPUs(url: String, editions: Seq[Edition], startTime: DateTime, endTime: DateTime)
-
-object TakeoverWithEmptyMPUs {
-
- private val timeJsonFormatter = ISODateTimeFormat.dateTime().withZoneUTC()
-
- val timeViewFormatter = DateTimeFormat.forPattern("d MMM YYYY HH:mm:ss z").withZoneUTC()
-
- implicit val writes: Writes[TakeoverWithEmptyMPUs] = (takeover: TakeoverWithEmptyMPUs) => {
- Json.obj(
- "url" -> takeover.url,
- "editions" -> takeover.editions,
- "startTime" -> timeJsonFormatter.print(takeover.startTime),
- "endTime" -> timeJsonFormatter.print(takeover.endTime),
- )
- }
-
- val mustBeAtLeastOneDirectoryDeep = Constraint[String] { s: String =>
- try {
- val uri = new URL(s)
- uri.getPath.trim match {
- case "" => Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us")
- case "/" => Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us")
- case _ => Valid
- }
- } catch {
- case _: MalformedURLException => Invalid("Must be a valid URL. eg: http://www.theguardian.com/us")
- }
- }
-
- implicit val reads: Reads[TakeoverWithEmptyMPUs] = (
- (JsPath \ "url").read[String] and
- (JsPath \ "editions").read[Seq[Edition]] and
- (JsPath \ "startTime").read[String].map(timeJsonFormatter.parseDateTime) and
- (JsPath \ "endTime").read[String].map(timeJsonFormatter.parseDateTime)
- )(TakeoverWithEmptyMPUs.apply _)
-
- implicit val editionFormatter: Formatter[Edition] = new Formatter[Edition] {
- override def bind(key: String, data: Map[String, String]): Either[Seq[FormError], Edition] = {
- val editionId = data(key)
- Edition.byId(editionId) map (Right(_)) getOrElse
- Left(Seq(FormError(key, s"No such edition: $key")))
- }
- override def unbind(key: String, value: Edition): Map[String, String] = {
- Map(key -> value.id)
- }
- }
-
- val form = Form(
- mapping(
- "url" -> nonEmptyText.verifying(mustBeAtLeastOneDirectoryDeep),
- "editions" -> seq(of[Edition]),
- "startTime" -> jodaDate("yyyy-MM-dd'T'HH:mm", DateTimeZone.UTC),
- "endTime" -> jodaDate("yyyy-MM-dd'T'HH:mm", DateTimeZone.UTC),
- )(TakeoverWithEmptyMPUs.apply)(TakeoverWithEmptyMPUs.unapply),
- )
-
- def fetch(): Seq[TakeoverWithEmptyMPUs] = {
- val takeovers = S3.get(takeoversWithEmptyMPUsKey) map {
- Json.parse(_).as[Seq[TakeoverWithEmptyMPUs]]
- } getOrElse Nil
- takeovers filter { t => mustBeAtLeastOneDirectoryDeep(t.url) == Valid }
- }
-
- def fetchSorted(): Seq[TakeoverWithEmptyMPUs] = {
- fetch() sortBy { takeover =>
- (takeover.url, takeover.startTime.getMillis)
- }
- }
-
- private def put(takeovers: Seq[TakeoverWithEmptyMPUs]): Unit = {
- val content = Json.stringify(toJson(takeovers))
- S3.putPrivate(takeoversWithEmptyMPUsKey, content, "application/json")
- }
-
- def create(takeover: TakeoverWithEmptyMPUs): Unit = {
- val takeovers = fetch() :+ takeover
- put(takeovers)
- }
-
- def remove(url: String): Unit = {
- val takeovers = fetch() filterNot (_.url == url)
- put(takeovers)
- }
-}
diff --git a/common/app/common/editions/Us.scala b/common/app/common/editions/Us.scala
index 4032508673fa..1415f04438c1 100644
--- a/common/app/common/editions/Us.scala
+++ b/common/app/common/editions/Us.scala
@@ -12,6 +12,7 @@ object Us
timezone = DateTimeZone.forID("America/New_York"),
locale = Some(Locale.forLanguageTag("en-us")),
networkFrontId = "us",
+ editionalisedSections = Edition.commonEditionalisedSections :+ "thefilter",
navigationLinks = EditionNavLinks(
NavLinks.usNewsPillar,
NavLinks.usOpinionPillar,
diff --git a/common/app/common/metrics.scala b/common/app/common/metrics.scala
index 6e94833cf673..2e96ef867686 100644
--- a/common/app/common/metrics.scala
+++ b/common/app/common/metrics.scala
@@ -3,14 +3,13 @@ package common
import java.io.File
import java.lang.management.{GarbageCollectorMXBean, ManagementFactory}
import java.util.concurrent.atomic.AtomicLong
-
import app.LifecycleComponent
-import com.amazonaws.services.cloudwatch.model.{Dimension, StandardUnit}
import conf.Configuration
import metrics._
import model.ApplicationIdentity
import model.diagnostics.CloudWatch
import play.api.inject.ApplicationLifecycle
+import software.amazon.awssdk.services.cloudwatch.model.{Dimension, StandardUnit}
import scala.jdk.CollectionConverters._
import scala.concurrent.duration._
@@ -50,18 +49,6 @@ object SystemMetrics extends implicits.Numbers {
get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getHeapMemoryUsage.getUsed),
)
- val MaxNonHeapMemoryMetric = GaugeMetric(
- name = "max-non-heap-memory",
- description = "Max non heap memory (MB)",
- get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getNonHeapMemoryUsage.getMax),
- )
-
- val UsedNonHeapMemoryMetric = GaugeMetric(
- name = "used-non-heap-memory",
- description = "Used non heap memory (MB)",
- get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getNonHeapMemoryUsage.getUsed),
- )
-
val FreeDiskSpaceMetric = GaugeMetric(
name = "free-disk-space",
description = "Free disk space (MB)",
@@ -72,7 +59,7 @@ object SystemMetrics extends implicits.Numbers {
name = "thread-count",
description = "Thread Count",
get = () => ManagementFactory.getThreadMXBean.getThreadCount,
- metricUnit = StandardUnit.Count,
+ metricUnit = StandardUnit.COUNT,
)
// yeah, casting to com.sun.. ain't too pretty
@@ -105,7 +92,7 @@ object SystemMetrics extends implicits.Numbers {
name = "build-number",
description = "Build number",
get = () => buildNumber,
- metricUnit = StandardUnit.None,
+ metricUnit = StandardUnit.NONE,
)
}
@@ -138,33 +125,21 @@ object ContentApiMetrics {
}
-object DfpApiMetrics {
- val DfpSessionErrors = CountMetric(
- "dfp-session-errors",
- "Number of times the app failed to build a DFP session",
- )
-
- val DfpApiErrors = CountMetric(
- "dfp-api-errors",
- "Number of times a request to the DFP API results in an error",
- )
-}
-
object FaciaPressMetrics {
val FrontPressCronSuccess = CountMetric(
"front-press-cron-success",
"Number of times facia-tool cron job has successfully pressed",
)
- val UkPressLatencyMetric = DurationMetric("uk-press-latency", StandardUnit.Milliseconds)
- val UsPressLatencyMetric = DurationMetric("us-press-latency", StandardUnit.Milliseconds)
- val AuPressLatencyMetric = DurationMetric("au-press-latency", StandardUnit.Milliseconds)
- val AllFrontsPressLatencyMetric = DurationMetric("front-press-latency", StandardUnit.Milliseconds)
- val FrontPressContentSize = SamplerMetric("front-press-content-size", StandardUnit.Bytes)
- val FrontPressContentSizeLite = SamplerMetric("front-press-content-size-lite", StandardUnit.Bytes)
- val FrontDecodingLatency = DurationMetric("front-decoding-latency", StandardUnit.Milliseconds)
- val FrontDownloadLatency = DurationMetric("front-download-latency", StandardUnit.Milliseconds)
- val FrontNotModifiedDownloadLatency = DurationMetric("front-not-modified-download-latency", StandardUnit.Milliseconds)
+ val UkPressLatencyMetric = DurationMetric("uk-press-latency", StandardUnit.MILLISECONDS)
+ val UsPressLatencyMetric = DurationMetric("us-press-latency", StandardUnit.MILLISECONDS)
+ val AuPressLatencyMetric = DurationMetric("au-press-latency", StandardUnit.MILLISECONDS)
+ val AllFrontsPressLatencyMetric = DurationMetric("front-press-latency", StandardUnit.MILLISECONDS)
+ val FrontPressContentSize = SamplerMetric("front-press-content-size", StandardUnit.BYTES)
+ val FrontPressContentSizeLite = SamplerMetric("front-press-content-size-lite", StandardUnit.BYTES)
+ val FrontDecodingLatency = DurationMetric("front-decoding-latency", StandardUnit.MILLISECONDS)
+ val FrontDownloadLatency = DurationMetric("front-download-latency", StandardUnit.MILLISECONDS)
+ val FrontNotModifiedDownloadLatency = DurationMetric("front-not-modified-download-latency", StandardUnit.MILLISECONDS)
}
object EmailSubsciptionMetrics {
@@ -208,7 +183,7 @@ class CloudWatchMetricsLifecycle(
extends LifecycleComponent
with GuLogging {
val applicationMetricsNamespace: String = "Application"
- val applicationDimension = List(new Dimension().withName("ApplicationName").withValue(appIdentity.name))
+ val applicationDimension = List(Dimension.builder().name("ApplicationName").value(appIdentity.name).build())
appLifecycle.addStopHook { () =>
Future {
@@ -233,13 +208,13 @@ class CloudWatchMetricsLifecycle(
GaugeMetric(
s"${gc.name}-gc-count-per-min",
"Used heap memory (MB)",
- StandardUnit.Count,
+ StandardUnit.COUNT,
() => gc.gcCount,
),
GaugeMetric(
s"${gc.name}-gc-time-per-min",
"Used heap memory (MB)",
- StandardUnit.Count,
+ StandardUnit.COUNT,
() => gc.gcTime,
),
)
@@ -247,7 +222,6 @@ class CloudWatchMetricsLifecycle(
private def report(): Unit = {
val allMetrics: List[FrontendMetric] = this.systemMetrics ::: this.appMetrics.metrics
-
CloudWatch.putMetrics(applicationMetricsNamespace, allMetrics, applicationDimension)
}
diff --git a/common/app/concurrent/CircuitBreakerRegistry.scala b/common/app/concurrent/CircuitBreakerRegistry.scala
index b33d63dcb80f..7d2e5a87b404 100644
--- a/common/app/concurrent/CircuitBreakerRegistry.scala
+++ b/common/app/concurrent/CircuitBreakerRegistry.scala
@@ -25,7 +25,9 @@ object CircuitBreakerRegistry extends GuLogging {
)
cb.onOpen(
- log.error(s"Circuit breaker ($name) OPEN (exceeded $maxFailures failures)"),
+ log.error(
+ s"Circuit breaker ($name) OPEN (exceeded $maxFailures failures) with $callTimeout (${callTimeout}) and resetTimeout (${resetTimeout}).",
+ ),
)
cb.onHalfOpen(
diff --git a/common/app/conf/switches/ABTestSwitches.scala b/common/app/conf/switches/ABTestSwitches.scala
index 677b5a11dd90..4c9327bb3f20 100644
--- a/common/app/conf/switches/ABTestSwitches.scala
+++ b/common/app/conf/switches/ABTestSwitches.scala
@@ -7,66 +7,22 @@ import conf.switches.Expiry.never
trait ABTestSwitches {
Switch(
ABTests,
- "ab-sign-in-gate-main-control",
- "Control audience for the sign in gate to 9% audience. Will never see the sign in gate.",
- owners = Seq(Owner.withGithub("coldlink")),
- safeState = Off,
- sellByDate = Some(LocalDate.of(2025, 12, 1)),
- exposeClientSide = true,
- highImpact = false,
- )
-
- Switch(
- ABTests,
- "ab-sign-in-gate-main-variant",
- "Show sign in gate to 90% of users on 3rd article view, variant/full audience",
- owners = Seq(Owner.withGithub("coldlink")),
- safeState = Off,
- sellByDate = Some(LocalDate.of(2025, 12, 1)),
- exposeClientSide = true,
- highImpact = false,
- )
-
- Switch(
- ABTests,
- "ab-auxia-sign-in-gate",
- "Experimental use of Auxia to drive the client-side SignIn gate",
+ "ab-no-auxia-sign-in-gate",
+ "Defines a control group who should not have sign-in gate journeys handled by Auxia",
owners = Seq(Owner.withEmail("growth@guardian.co.uk")),
safeState = Off,
- sellByDate = Some(LocalDate.of(2026, 1, 30)),
- exposeClientSide = true,
- highImpact = false,
- )
-
- Switch(
- ABTests,
- "ab-defer-permutive-load",
- "Test the impact of deferring the Permutive script load",
- owners = Seq(Owner.withEmail("commercial.dev@theguardian.com")),
- safeState = Off,
- sellByDate = Some(LocalDate.of(2025, 3, 28)),
- exposeClientSide = true,
- highImpact = false,
- )
-
- Switch(
- ABTests,
- "ab-prebid-bid-cache",
- "Test the impact of enabling prebid bid caching",
- owners = Seq(Owner.withEmail("commercial.dev@theguardian.com")),
- safeState = Off,
- sellByDate = Some(LocalDate.of(2025, 3, 28)),
+ sellByDate = Some(LocalDate.of(2027, 11, 1)),
exposeClientSide = true,
highImpact = false,
)
Switch(
ABTests,
- "ab-the-trade-desk",
- "Test the impact of disabling the trade desk for some of our users",
- owners = Seq(Owner.withEmail("commercial.dev@theguardian.com")),
+ "ab-admiral-adblock-recovery",
+ "Testing the Admiral integration for adblock recovery on theguardian.com",
+ owners = Seq(Owner.withEmail("commercial.dev@guardian.co.uk")),
safeState = Off,
- sellByDate = Some(LocalDate.of(2025, 3, 28)),
+ sellByDate = Some(LocalDate.of(2026, 1, 21)),
exposeClientSide = true,
highImpact = false,
)
diff --git a/common/app/conf/switches/CommercialSwitches.scala b/common/app/conf/switches/CommercialSwitches.scala
index 818e56d3bb5e..5d202c208bdc 100644
--- a/common/app/conf/switches/CommercialSwitches.scala
+++ b/common/app/conf/switches/CommercialSwitches.scala
@@ -159,6 +159,28 @@ trait CommercialSwitches {
exposeClientSide = true,
highImpact = false,
)
+
+ val LineItemJobs: Switch = Switch(
+ group = Commercial,
+ name = "line-item-jobs",
+ description = "Enable Frontend to read from the S3 line items jobs generated by the Step Functions",
+ owners = group(Commercial),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = true,
+ highImpact = false,
+ )
+
+ val disableChildDirected: Switch = Switch(
+ group = Commercial,
+ name = "disable-child-directed",
+ description = "Disable child-directed treatment for ads",
+ owners = group(Commercial),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = true,
+ highImpact = false,
+ )
}
trait PrebidSwitches {
@@ -350,17 +372,6 @@ trait PrebidSwitches {
highImpact = false,
)
- val prebidAdYouLike: Switch = Switch(
- group = CommercialPrebid,
- name = "prebid-ad-you-like",
- description = "Include AdYouLike adapter in Prebid auctions",
- owners = group(Commercial),
- safeState = Off,
- sellByDate = never,
- exposeClientSide = true,
- highImpact = false,
- )
-
val prebidCriteo: Switch = Switch(
group = CommercialPrebid,
name = "prebid-criteo",
@@ -416,17 +427,6 @@ trait PrebidSwitches {
highImpact = false,
)
- val prebidBidCache: Switch = Switch(
- group = CommercialPrebid,
- name = "prebid-bid-cache",
- description = "Enable the Prebid bid cache",
- owners = group(Commercial),
- safeState = Off,
- sellByDate = never,
- exposeClientSide = true,
- highImpact = false,
- )
-
val sentinelLogger: Switch = Switch(
group = Commercial,
name = "sentinel-logger",
diff --git a/common/app/conf/switches/FeatureSwitches.scala b/common/app/conf/switches/FeatureSwitches.scala
index 74efc58aef57..762da402aa3f 100644
--- a/common/app/conf/switches/FeatureSwitches.scala
+++ b/common/app/conf/switches/FeatureSwitches.scala
@@ -73,17 +73,6 @@ trait FeatureSwitches {
highImpact = false,
)
- val ExtendedMostPopularFronts = Switch(
- SwitchGroup.Feature,
- "extended-most-popular-fronts",
- "Extended 'If switched on shows 'Most Popular' component with space for DPMUs on fronts",
- owners = group(Commercial),
- safeState = On,
- sellByDate = never,
- exposeClientSide = true,
- highImpact = false,
- )
-
val MostViewedFronts = Switch(
SwitchGroup.Feature,
"most-viewed-fronts",
@@ -397,18 +386,6 @@ trait FeatureSwitches {
highImpact = false,
)
- // Election interactive header switch
- val InteractiveHeaderSwitch = Switch(
- SwitchGroup.Feature,
- "interactive-full-header-switch",
- "If switched on, the header on all interactives will display in full.",
- owners = Seq(Owner.withName("unknown")),
- safeState = Off,
- sellByDate = never,
- exposeClientSide = true,
- highImpact = false,
- )
-
val slotBodyEnd = Switch(
SwitchGroup.Feature,
"slot-body-end",
@@ -562,4 +539,125 @@ trait FeatureSwitches {
exposeClientSide = false,
highImpact = false,
)
+
+ val DCRFootballPages = Switch(
+ SwitchGroup.Feature,
+ "dcr-football-pages",
+ "If this switch is on, live, fixtures and results football pages will be rendered with DCR",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val DCRFootballMatchSummary = Switch(
+ SwitchGroup.Feature,
+ "dcr-football-match-summary",
+ "If this switch is on, football match summary pages will be rendered with DCR",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val DCRCricketPages = Switch(
+ SwitchGroup.Feature,
+ "dcr-cricket-pages",
+ "If this switch is on, cricket scorecard pages will be rendered with DCR",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val DCRFootballTablesPages = Switch(
+ SwitchGroup.Feature,
+ "dcr-football-table-pages",
+ "If this switch is on, football table pages will be rendered with DCR",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val WomensEuro2025Atom = Switch(
+ SwitchGroup.Feature,
+ "womens-euro-2025-atom",
+ "If this switch is on, the atom will be rendered on several football data pages",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val DCARGalleyPages = Switch(
+ SwitchGroup.Feature,
+ "dcar-gallery-pages",
+ "If this switch is on, the gallery article will be rendered by DCAR",
+ owners = Seq(Owner.withGithub("dotcom.platform@theguardian.com")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val EnableNewServerSideABTestsHeader = Switch(
+ SwitchGroup.Feature,
+ "enable-new-server-side-tests-header",
+ "Enable new server-side AB tests header and add it to the vary header",
+ owners = Seq(Owner.withEmail("commercial.dev@guardian.co.uk")),
+ sellByDate = never,
+ safeState = Off,
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val ProductLeftColCards = Switch(
+ SwitchGroup.Feature,
+ "product-left-col-cards",
+ "Enables product element summary cards to be shown in the left column at wide breakpoints",
+ owners = Seq(Owner.withEmail("thefilter.dev@guardian.co.uk")),
+ sellByDate = never,
+ safeState = Off,
+ exposeClientSide = true,
+ highImpact = false,
+ )
+
+ val DCRHostedContent = Switch(
+ group = SwitchGroup.Feature,
+ name = "dcr-hosted-content",
+ description = "Render hosted content pages with DCR",
+ owners = Seq(Owner.withEmail("commercial.dev@guardian.co.uk")),
+ safeState = Off,
+ sellByDate = Some(LocalDate.of(2026, 4, 15)),
+ exposeClientSide = false,
+ highImpact = false,
+ )
+
+ val SignInGate = Switch(
+ group = SwitchGroup.Feature,
+ name = "sign-in-gate",
+ description = "Enable sign-in gate on articles",
+ owners = Seq(Owner.withEmail("value.dev@guardian.co.uk"), Owner.withEmail("growth.dev@guardian.co.uk")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = true,
+ highImpact = false,
+ )
+
+ val EnableHlsWeb = Switch(
+ group = SwitchGroup.Feature,
+ name = "enable-hls-web",
+ description = "Enable HLS web streaming on web",
+ owners = Seq(Owner.withEmail("fronts.and.curation@guardian.co.uk")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = true,
+ highImpact = false,
+ )
}
diff --git a/common/app/conf/switches/IdentitySwitches.scala b/common/app/conf/switches/IdentitySwitches.scala
index 795e6c6a10c0..1c0cb35200f0 100644
--- a/common/app/conf/switches/IdentitySwitches.scala
+++ b/common/app/conf/switches/IdentitySwitches.scala
@@ -15,11 +15,11 @@ trait IdentitySwitches {
highImpact = false,
)
- val Okta = Switch(
- group = SwitchGroup.Identity,
- name = "okta",
- description = "Use Okta for authentication",
- owners = Seq(Owner.withGithub("@guardian/dotcom-platform")),
+ val GoogleOneTapSwitch = Switch(
+ SwitchGroup.Identity,
+ "google-one-tap-switch",
+ "Signing into the Guardian with Google One Tap",
+ owners = Seq(Owner.withEmail("identity.dev@theguardian.com")),
safeState = Off,
sellByDate = never,
exposeClientSide = true,
diff --git a/common/app/conf/switches/JournalismSwitches.scala b/common/app/conf/switches/JournalismSwitches.scala
index 802a06aba9a0..17528ec9d919 100644
--- a/common/app/conf/switches/JournalismSwitches.scala
+++ b/common/app/conf/switches/JournalismSwitches.scala
@@ -70,15 +70,4 @@ trait JournalismSwitches {
exposeClientSide = true,
highImpact = false,
)
-
- 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("dotcom.platform@theguardian.com")),
- safeState = Off,
- sellByDate = never,
- exposeClientSide = true,
- highImpact = false,
- )
}
diff --git a/common/app/conf/switches/NewslettersSwitches.scala b/common/app/conf/switches/NewslettersSwitches.scala
index b68986b3e04d..3149f118d79e 100644
--- a/common/app/conf/switches/NewslettersSwitches.scala
+++ b/common/app/conf/switches/NewslettersSwitches.scala
@@ -16,6 +16,17 @@ trait NewslettersSwitches {
highImpact = false,
)
+ val ManyNewsletterVisibleRecaptcha = Switch(
+ SwitchGroup.Newsletters,
+ "many-newsletter-visible-recaptcha",
+ "Shows a visible rather than invisible reCAPTCHA when signing up on the All Newsletters page",
+ owners = Seq(Owner.withEmail("newsletters.dev@guardian.co.uk")),
+ safeState = Off,
+ sellByDate = never,
+ exposeClientSide = true,
+ highImpact = false,
+ )
+
val NewslettersRemoveConfirmationStep = Switch(
SwitchGroup.Newsletters,
"newsletters-remove-confirmation-step",
diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala
index 56d2cea8e275..d9fe61144a39 100644
--- a/common/app/conf/switches/PerformanceSwitches.scala
+++ b/common/app/conf/switches/PerformanceSwitches.scala
@@ -226,26 +226,4 @@ trait PerformanceSwitches {
exposeClientSide = true,
highImpact = false,
)
-
- val ShorterSurrogateCacheForRecentArticles = Switch(
- SwitchGroup.Performance,
- "shorter-surrogate-cache-for-recent-articles",
- "Shorten the surrogate cache time for recent articles for load testing",
- owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")),
- safeState = Off,
- sellByDate = LocalDate.of(2025, 12, 1),
- exposeClientSide = false,
- highImpact = false,
- )
-
- val ShorterSurrogateCacheForOlderArticles = Switch(
- SwitchGroup.Performance,
- "shorter-surrogate-cache-for-older-articles",
- "Shorten the surrogate cache time for older articles for load testing",
- owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")),
- safeState = Off,
- sellByDate = LocalDate.of(2025, 12, 1),
- exposeClientSide = false,
- highImpact = false,
- )
}
diff --git a/common/app/conf/switches/SwitchboardLifecycle.scala b/common/app/conf/switches/SwitchboardLifecycle.scala
index d24a26cc0954..8cad6a70727a 100644
--- a/common/app/conf/switches/SwitchboardLifecycle.scala
+++ b/common/app/conf/switches/SwitchboardLifecycle.scala
@@ -42,7 +42,7 @@ class SwitchboardLifecycle(appLifecycle: ApplicationLifecycle, jobs: JobSchedule
nextState.get(switch.name) match {
case Some("on") => switch.switchOn()
case Some("off") => switch.switchOff()
- case _ =>
+ case _ =>
log.warn(s"Badly configured switch ${switch.name}, setting to safe state.")
switch.switchToSafeState()
}
diff --git a/common/app/conf/switches/Switches.scala b/common/app/conf/switches/Switches.scala
index a001f1abadd3..739138c29968 100644
--- a/common/app/conf/switches/Switches.scala
+++ b/common/app/conf/switches/Switches.scala
@@ -8,6 +8,8 @@ import scala.concurrent.duration._
import scala.concurrent.{ExecutionContext, Future, Promise}
import java.text.SimpleDateFormat
import java.util.TimeZone
+import java.time.format.DateTimeFormatter
+import java.util.Locale
sealed trait SwitchState
case object On extends SwitchState
@@ -157,10 +159,13 @@ object Switch {
}
def expiryAsUserFriendlyString(switch: Switch): String = {
- val timeFormatter = new SimpleDateFormat("E dd MMM")
- timeFormatter.setTimeZone(TimeZone.getTimeZone("Europe/London"))
+ val zone = ZoneId.of("Europe/London")
+ val dateFormatter = DateTimeFormatter.ofPattern("E dd MMM", Locale.UK)
switch.sellByDate
- .map(d => s"expires ${timeFormatter.format(d)} at 23:59 (London time)")
+ .map { d =>
+ val datePortion = d.atStartOfDay(zone).format(dateFormatter)
+ s"expires $datePortion at 23:59 (London time)"
+ }
.getOrElse("expiry not specified")
}
}
diff --git a/common/app/controllers/EmailSignupController.scala b/common/app/controllers/EmailSignupController.scala
index c459ce5033a3..7f040536bf4f 100644
--- a/common/app/controllers/EmailSignupController.scala
+++ b/common/app/controllers/EmailSignupController.scala
@@ -6,6 +6,7 @@ import common.{GuLogging, ImplicitControllerExecutionContext, LinkTo}
import conf.Configuration
import conf.switches.Switches.{
EmailSignupRecaptcha,
+ ManyNewsletterVisibleRecaptcha,
NewslettersRemoveConfirmationStep,
ValidateEmailSignupRecaptchaTokens,
}
@@ -33,7 +34,7 @@ object emailLandingPage extends StandalonePage {
case class EmailForm(
email: String,
listName: Option[String],
- marketing: Option[String],
+ marketing: Option[Boolean],
referrer: Option[String],
ref: Option[String],
refViewId: Option[String],
@@ -45,7 +46,7 @@ case class EmailForm(
case class EmailFormManyNewsletters(
email: String,
listNames: Seq[String],
- marketing: Option[String],
+ marketing: Option[Boolean],
referrer: Option[String],
ref: Option[String],
refViewId: Option[String],
@@ -65,7 +66,8 @@ class EmailFormService(wsClient: WSClient, emailEmbedAgent: NewsletterSignupAgen
.obj(
"email" -> form.email,
"set-lists" -> List(form.listName),
- "set-consents" -> form.marketing.map(_ => List("similar_guardian_products")),
+ "set-consents" -> form.marketing.filter(_ == true).map(_ => List("similar_guardian_products")),
+ "unset-consents" -> form.marketing.filter(_ == false).map(_ => List("similar_guardian_products")),
)
.fields,
)
@@ -90,7 +92,8 @@ class EmailFormService(wsClient: WSClient, emailEmbedAgent: NewsletterSignupAgen
"set-lists" -> form.listNames,
"refViewId" -> form.refViewId,
"ref" -> form.ref,
- "set-consents" -> form.marketing.map(_ => List("similar_guardian_products")),
+ "set-consents" -> form.marketing.filter(_ == true).map(_ => List("similar_guardian_products")),
+ "unset-consents" -> form.marketing.filter(_ == false).map(_ => List("similar_guardian_products")),
)
.fields,
)
@@ -142,7 +145,7 @@ class EmailSignupController(
mapping(
"email" -> nonEmptyText.verifying(emailAddress),
"listName" -> optional[String](of[String]),
- "marketing" -> optional[String](of[String]),
+ "marketing" -> optional[Boolean](of[Boolean]),
"referrer" -> optional[String](of[String]),
"ref" -> optional[String](of[String]),
"refViewId" -> optional[String](of[String]),
@@ -156,7 +159,7 @@ class EmailSignupController(
mapping(
"email" -> nonEmptyText.verifying(emailAddress),
"listNames" -> seq(of[String]),
- "marketing" -> optional[String](of[String]),
+ "marketing" -> optional[Boolean](of[Boolean]),
"referrer" -> optional[String](of[String]),
"ref" -> optional[String](of[String]),
"refViewId" -> optional[String](of[String]),
@@ -275,7 +278,9 @@ class EmailSignupController(
}
def logNewsletterNotFoundError(newsletterName: String)(implicit request: RequestHeader): Unit = {
- logErrorWithRequestId(s"Newsletter not found: Couldn't find $newsletterName")
+ logInfoWithRequestId(
+ s"The newsletter $newsletterName used in an email sign-up form could not be found by the NewsletterSignupAgent. It may no longer exist or $newsletterName may be an outdated reference number.",
+ )
}
def renderFormFromNameWithParentComponent(
@@ -442,18 +447,22 @@ class EmailSignupController(
}
}
- private def validateCaptcha(googleRecaptchaResponse: Option[String], shouldValidateCaptcha: Boolean)(implicit
+ private def validateCaptcha(
+ googleRecaptchaResponse: Option[String],
+ shouldValidateCaptcha: Boolean,
+ shouldUseVisibleKey: Boolean = false,
+ )(implicit
request: Request[AnyContent],
) = {
if (shouldValidateCaptcha) {
for {
token <- googleRecaptchaResponse match {
case Some(token) => Future.successful(token)
- case None =>
+ case None =>
RecaptchaMissingTokenError.increment()
Future.failed(new IllegalAccessException("reCAPTCHA client token not provided"))
}
- wsResponse <- googleRecaptchaTokenValidationService.submit(token) recoverWith { case e =>
+ wsResponse <- googleRecaptchaTokenValidationService.submit(token, shouldUseVisibleKey) recoverWith { case e =>
RecaptchaAPIUnavailableError.increment()
Future.failed(e)
}
@@ -532,7 +541,11 @@ class EmailSignupController(
)
(for {
- _ <- validateCaptcha(form.googleRecaptchaResponse, ValidateEmailSignupRecaptchaTokens.isSwitchedOn)
+ _ <- validateCaptcha(
+ form.googleRecaptchaResponse,
+ ValidateEmailSignupRecaptchaTokens.isSwitchedOn,
+ shouldUseVisibleKey = ManyNewsletterVisibleRecaptcha.isSwitchedOn,
+ )
result <- buildSubmissionResult(emailFormService.submitWithMany(form), Option.empty[String])
} yield {
result
diff --git a/common/app/controllers/IndexControllerCommon.scala b/common/app/controllers/IndexControllerCommon.scala
index 829aeaec4ddf..e8a2117d69a7 100644
--- a/common/app/controllers/IndexControllerCommon.scala
+++ b/common/app/controllers/IndexControllerCommon.scala
@@ -75,7 +75,10 @@ trait IndexControllerCommon
path match {
// if this is a section tag e.g. football/football
case TagPattern(left, right) if left == right => successful(Cached(60)(redirect(left, request.isRss)))
- case _ =>
+ // This page does not exist on dotcom, and we don't want to make a CAPI request because that
+ // will trigger a CAPI sections query.
+ case "sections" => successful(Cached(CacheTime.NotFound)(WithoutRevalidationResult(NotFound)))
+ case _ =>
logGoogleBot(request)
(index(Edition(request), path, inferPage(request), request.isRss) map {
// if no content is returned (as often happens with old/expired/migrated microsites) return 404 rather than an empty page
diff --git a/common/app/crosswords/CrosswordPage.scala b/common/app/crosswords/CrosswordPage.scala
index 191be74eeabe..7b3488d76d71 100644
--- a/common/app/crosswords/CrosswordPage.scala
+++ b/common/app/crosswords/CrosswordPage.scala
@@ -59,11 +59,13 @@ class CrosswordSearchPage extends StandalonePage {
"quick-cryptic",
"quiptic",
"genius",
+ "sunday-quick",
"speedy",
"everyman",
"azed",
"weekend",
"special",
+ "mini",
)
def queryParameter(crossType: String): String = {
diff --git a/common/app/dev/DevParametersHttpRequestHandler.scala b/common/app/dev/DevParametersHttpRequestHandler.scala
index 19f122307bc9..faa6979eb6cf 100644
--- a/common/app/dev/DevParametersHttpRequestHandler.scala
+++ b/common/app/dev/DevParametersHttpRequestHandler.scala
@@ -59,6 +59,8 @@ class DevParametersHttpRequestHandler(
"amzn_debug_mode", // set to `1` to enable A9 debugging
"force-braze-message", // JSON encoded representation of "extras" data from Braze
"dcr", // force page to render in DCR
+ "_sp_env", // allow testing of Sourcepoint stage campaign
+ "_sp_geo_override", // allow Sourcepoint geolocation override for testing purposes
)
val commercialParams = Seq(
@@ -76,7 +78,7 @@ class DevParametersHttpRequestHandler(
"dll", // Disable lazy loading of ads
"iasdebug", // IAS troubleshooting
"cmpdebug", // CMP troubleshooting
- "sfdebug", // enable spacefinder visualiser. '1' = inline ads (first pass), '2' = inline ads (second pass), 'carrot' = carrot ads
+ "sfdebug", // enable spacefinder visualiser. '1' = inline ads (first pass), '2' = inline ads (second pass)
"rikerdebug", // enable debug logging for Canadian ad setup managed by the Globe and Mail
"forceSendMetrics", // enable force sending of commercial metrics
"multiSticky", // enable multiple sticky ads in the right column, for the purpose of qualitative testing
diff --git a/common/app/experiments/Experiments.scala b/common/app/experiments/Experiments.scala
index 692a070eed44..b9b3784f34e5 100644
--- a/common/app/experiments/Experiments.scala
+++ b/common/app/experiments/Experiments.scala
@@ -11,40 +11,36 @@ import java.time.LocalDate
object ActiveExperiments extends ExperimentsDefinition {
override val allExperiments: Set[Experiment] =
Set(
- EuropeBetaFront,
+ StarRatingRedesign,
DarkModeWeb,
- DCRFootballMatches,
+ GoogleOneTap,
)
implicit val canCheckExperiment: CanCheckExperiment = new CanCheckExperiment(this)
}
-object EuropeBetaFront
+object StarRatingRedesign
extends Experiment(
- name = "europe-beta-front",
- description = "Allows viewing the beta version of the Europe network front",
- owners = Seq(
- Owner.withGithub("cemms1"),
- Owner.withEmail("project.fairground@theguardian.com"),
- Owner.withEmail("dotcom.platform@theguardian.com"),
- ),
- sellByDate = LocalDate.of(2025, 4, 2),
- participationGroup = Perc50,
+ name = "star-rating-redesign",
+ description = "Enable the refreshed star ratings design",
+ owners = Seq(Owner.withEmail("fronts.and.curation@theguardian.com")),
+ sellByDate = LocalDate.of(2026, 2, 2),
+ participationGroup = Perc0A,
)
-object DarkModeWeb
+object GoogleOneTap
extends Experiment(
- name = "dark-mode-web",
- description = "Enable dark mode on web",
- owners = Seq(Owner.withGithub("jakeii"), Owner.withEmail("dotcom.platform@theguardian.com")),
- sellByDate = LocalDate.of(2025, 4, 30),
- participationGroup = Perc0D,
+ name = "google-one-tap",
+ description = "Signing into the Guardian with Google One Tap",
+ owners = Seq(Owner.withEmail("identity.dev@theguardian.com")),
+ sellByDate = LocalDate.of(2026, 2, 2),
+ participationGroup = Perc0B,
)
-object DCRFootballMatches
+object DarkModeWeb
extends Experiment(
- name = "dcr-football-matches",
- description = "Render football matches lists in DCR",
+ name = "dark-mode-web",
+ description = "Enable dark mode on web",
owners = Seq(Owner.withEmail("dotcom.platform@theguardian.com")),
- sellByDate = LocalDate.of(2025, 4, 10),
- participationGroup = Perc10A,
+ sellByDate = LocalDate.of(2026, 1, 30),
+ participationGroup = Perc0D,
)
diff --git a/common/app/http/CustomPanDomainAuth.scala b/common/app/http/CustomPanDomainAuth.scala
new file mode 100644
index 000000000000..7a22a9c72d00
--- /dev/null
+++ b/common/app/http/CustomPanDomainAuth.scala
@@ -0,0 +1,12 @@
+package http
+
+import com.gu.pandomainauth.model.User
+import play.api.mvc.{RequestHeader, Result}
+
+import scala.concurrent.Future
+
+trait CustomPanDomainAuth {
+ def appliesTo(requestHeader: RequestHeader): Boolean
+
+ def authenticateRequest(request: RequestHeader)(produceResultGivenAuthedUser: User => Future[Result]): Future[Result]
+}
diff --git a/common/app/http/Filters.scala b/common/app/http/Filters.scala
index 5e6e88f306de..1e72e9c56fea 100644
--- a/common/app/http/Filters.scala
+++ b/common/app/http/Filters.scala
@@ -12,8 +12,12 @@ import play.filters.gzip.{GzipFilter, GzipFilterConfig}
import experiments.LookedAtExperiments
import model.Cached.PanicReuseExistingResult
import org.apache.commons.codec.digest.DigestUtils
+import ab.ABTests
+import conf.switches.Switches.{EnableNewServerSideABTestsHeader}
import scala.concurrent.{ExecutionContext, Future}
+import experiments.Experiment
+import experiments.{ActiveExperiments}
class GzipperConfig() extends GzipFilterConfig {
override val shouldGzip: (RequestHeader, Result) => Boolean = (request, result) => {
@@ -105,6 +109,32 @@ class ExperimentsFilter(implicit val mat: Materializer, executionContext: Execut
.map { case (k, v) => k -> v.map(_._2).mkString(",") }
}
+/** AB Testing filter that add the server side ab tests header to the Vary header and sets up AB tests from the request
+ * header.
+ */
+class ABTestingFilter(implicit val mat: Materializer, executionContext: ExecutionContext) extends Filter {
+ private val abTestHeader = "X-GU-Server-AB-Tests"
+
+ override def apply(nextFilter: (RequestHeader) => Future[Result])(request: RequestHeader): Future[Result] = {
+ if (EnableNewServerSideABTestsHeader.isSwitchedOff) {
+ nextFilter(request)
+ } else {
+ val r = ABTests.decorateRequest(request, abTestHeader)
+ nextFilter(r).map { result =>
+ val varyHeaderValues = result.header.headers.get("Vary").toSeq ++ Seq(abTestHeader)
+ val abTestHeaderValue = request.headers.get(abTestHeader).getOrElse("")
+ val responseHeaders =
+ Map(abTestHeader -> abTestHeaderValue, "Vary" -> varyHeaderValues.mkString(",")).filterNot { case (_, v) =>
+ v.isEmpty
+ }.toSeq
+
+ result.withHeaders(responseHeaders: _*)
+
+ }
+ }
+ }
+}
+
class PanicSheddingFilter(implicit val mat: Materializer, executionContext: ExecutionContext) extends Filter {
override def apply(nextFilter: (RequestHeader) => Future[Result])(request: RequestHeader): Future[Result] = {
if (Switches.PanicShedding.isSwitchedOn && request.headers.hasHeader("If-None-Match")) {
@@ -126,6 +156,7 @@ object Filters {
new RequestLoggingFilter,
new PanicSheddingFilter,
new JsonVaryHeadersFilter,
+ new ABTestingFilter,
new ExperimentsFilter,
new Gzipper,
new BackendHeaderFilter(frontendBuildInfo),
diff --git a/common/app/http/GuardianAuthWithExemptions.scala b/common/app/http/GuardianAuthWithExemptions.scala
index 16f849ad9797..9278903f1979 100644
--- a/common/app/http/GuardianAuthWithExemptions.scala
+++ b/common/app/http/GuardianAuthWithExemptions.scala
@@ -1,18 +1,18 @@
package http
-import com.amazonaws.regions.Regions
-import com.amazonaws.services.s3.AmazonS3
import com.gu.pandomainauth.action.AuthActions
-import com.gu.pandomainauth.model.AuthenticatedUser
+import com.gu.pandomainauth.model.{AuthenticatedUser, User}
import com.gu.pandomainauth.{PanDomain, PanDomainAuthSettingsRefresher, S3BucketLoader}
import com.gu.permissions.{PermissionDefinition, PermissionsConfig, PermissionsProvider}
import common.Environment.stage
-import conf.Configuration.aws.mandatoryCredentials
import model.ApplicationContext
import org.apache.pekko.stream.Materializer
import play.api.Mode
import play.api.libs.ws.WSClient
import play.api.mvc._
+import software.amazon.awssdk.regions.Region.EU_WEST_1
+import software.amazon.awssdk.services.s3.S3Client
+import utils.AWSv2
import java.net.URL
import scala.concurrent.Future
@@ -22,10 +22,11 @@ class GuardianAuthWithExemptions(
override val wsClient: WSClient,
toolsDomainPrefix: String,
oauthCallbackPath: String,
- s3Client: AmazonS3,
+ s3Client: S3Client,
system: String,
extraDoNotAuthenticatePathPrefixes: Seq[String],
requiredEditorialPermissionName: String,
+ customPandaAuth: Option[CustomPanDomainAuth] = None,
)(implicit
val mat: Materializer,
context: ApplicationContext,
@@ -37,8 +38,8 @@ class GuardianAuthWithExemptions(
private val permissions: PermissionsProvider = PermissionsProvider(
PermissionsConfig(
stage = if (stage == "PROD") "PROD" else "CODE",
- region = Regions.EU_WEST_1.getName,
- awsCredentials = mandatoryCredentials,
+ region = EU_WEST_1.toString,
+ awsCredentials = AWSv2.credentials,
),
)
@@ -57,7 +58,7 @@ class GuardianAuthWithExemptions(
override lazy val panDomainSettings = PanDomainAuthSettingsRefresher(
domain = toolsDomainSuffix,
system,
- S3BucketLoader.forAwsSdkV1(s3Client, "pan-domain-auth-settings"),
+ S3BucketLoader.forAwsSdkV2(s3Client, "pan-domain-auth-settings"),
)
override def authCallbackUrl = s"https://$toolsDomainPrefix.$toolsDomainSuffix$oauthCallbackPath"
@@ -91,22 +92,24 @@ class GuardianAuthWithExemptions(
) ++ extraDoNotAuthenticatePathPrefixes).exists(request.path.startsWith)
def apply(nextFilter: RequestHeader => Future[Result])(request: RequestHeader): Future[Result] = {
- if (doNotAuthenticate(request)) {
- nextFilter(request)
- } else {
- AuthAction.authenticateRequest(request) { user =>
- 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.",
- ),
- )
- }
+ def authoriseUser(user: User): Future[Result] =
+ 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.",
+ ),
+ )
}
- }
+
+ if (doNotAuthenticate(request)) nextFilter(request)
+ else
+ customPandaAuth
+ .filter(_.appliesTo(request))
+ .map(_.authenticateRequest(request)(authoriseUser))
+ .getOrElse(AuthAction.authenticateRequest(request)(authoriseUser))
}
}
}
diff --git a/common/app/http/RequestLoggingFilter.scala b/common/app/http/RequestLoggingFilter.scala
index c66e9454d556..a8e4cca2398a 100644
--- a/common/app/http/RequestLoggingFilter.scala
+++ b/common/app/http/RequestLoggingFilter.scala
@@ -21,9 +21,9 @@ class RequestLoggingFilter(implicit val mat: Materializer, executionContext: Exe
val additionalInfo =
response.header.headers.get("X-Accel-Redirect") match {
case Some(internalRedirect) => s" - internal redirect to $internalRedirect"
- case None =>
+ case None =>
response.header.status match {
- case 304 => " - 304 Not Modified"
+ case 304 => " - 304 Not Modified"
case status if (status / 100) == 3 =>
s" - external redirect to ${response.header.headers.getOrElse("Location", "[location not found]")}"
case _ => ""
diff --git a/common/app/implicits/Requests.scala b/common/app/implicits/Requests.scala
index 5f10adeadf4c..94b3a83a92a4 100644
--- a/common/app/implicits/Requests.scala
+++ b/common/app/implicits/Requests.scala
@@ -1,14 +1,14 @@
package implicits
import com.gu.facia.client.models.{
+ AUNewSouthWalesTerritory,
+ AUQueenslandTerritory,
+ AUVictoriaTerritory,
EU27Territory,
NZTerritory,
TargetedTerritory,
USEastCoastTerritory,
USWestCoastTerritory,
- AUVictoriaTerritory,
- AUQueenslandTerritory,
- AUNewSouthWalesTerritory,
}
import conf.Configuration
import play.api.mvc.RequestHeader
@@ -62,6 +62,12 @@ trait Requests {
lazy val isEmailJson: Boolean = r.path.endsWith(EMAIL_JSON_SUFFIX)
+ lazy val isInteractiveRedirect: Boolean = r.path.startsWith("/interactive/")
+
+ private val desktopAuthPathPrefix = "/desktop-auth"
+
+ lazy val isDesktopAuthRequest: Boolean = r.path.startsWith(desktopAuthPathPrefix)
+
lazy val isEmailTxt: Boolean = r.path.endsWith(EMAIL_TXT_SUFFIX)
lazy val isLazyLoad: Boolean =
@@ -82,10 +88,12 @@ trait Requests {
lazy val isHeadlineText: Boolean =
r.getQueryString("format").contains("email-headline") || r.path.endsWith(HEADLINE_SUFFIX)
- lazy val isModified = isJson || isRss || isEmail || isHeadlineText
+ lazy val isModified = isJson || isRss || isEmail || isHeadlineText || isDesktopAuthRequest
lazy val pathWithoutModifiers: String =
if (isEmail) r.path.stripSuffix(EMAIL_SUFFIX)
+ else if (isInteractiveRedirect) r.path.stripPrefix("/interactive")
+ else if (isDesktopAuthRequest) r.path.stripPrefix(desktopAuthPathPrefix)
else r.path.stripSuffix("/all")
lazy val hasParameters: Boolean = r.queryString.nonEmpty
diff --git a/common/app/layout/ContainerCommercialOptions.scala b/common/app/layout/ContainerCommercialOptions.scala
index 792bba29eec1..533503632839 100644
--- a/common/app/layout/ContainerCommercialOptions.scala
+++ b/common/app/layout/ContainerCommercialOptions.scala
@@ -1,3 +1,3 @@
package layout
-case class ContainerCommercialOptions(omitMPU: Boolean, adFree: Boolean)
+case class ContainerCommercialOptions(adFree: Boolean)
diff --git a/common/app/layout/ContainerLayout.scala b/common/app/layout/ContainerLayout.scala
index 4cf61d9aa512..ced946fdfd9a 100644
--- a/common/app/layout/ContainerLayout.scala
+++ b/common/app/layout/ContainerLayout.scala
@@ -37,7 +37,7 @@ object ContainerLayout {
val (slices, showMore, finalContext) = sliceDefinitions.foldLeft(
(Seq.empty[SliceWithCards], indexedTrails, initialContext),
) {
- case ((slicesSoFar, Nil, context), _) => (slicesSoFar, Nil, context)
+ case ((slicesSoFar, Nil, context), _) => (slicesSoFar, Nil, context)
case ((slicesSoFar, trailsForUse, context), sliceDefinition) =>
val (slice, remainingTrails, newContext) = SliceWithCards.fromItems(
trailsForUse,
@@ -115,7 +115,7 @@ object ContainerLayout {
accumulation: Vector[SliceWithCards] = Vector.empty,
): Seq[SliceWithCards] = {
slices match {
- case Nil => accumulation
+ case Nil => accumulation
case (slice, numToConsume) :: remainingSlices =>
val (blobsConsumed, blobsUnconsumed) = blobs.splitAt(numToConsume)
slicesWithCards(
diff --git a/common/app/layout/DisplaySettings.scala b/common/app/layout/DisplaySettings.scala
index 88d8b8e32cf9..f68940e7e62b 100644
--- a/common/app/layout/DisplaySettings.scala
+++ b/common/app/layout/DisplaySettings.scala
@@ -6,6 +6,7 @@ import model.pressed._
case class DisplaySettings(
isBoosted: Boolean,
boostLevel: Option[BoostLevel],
+ isImmersive: Option[Boolean],
showBoostedHeadline: Boolean,
showQuotedHeadline: Boolean,
imageHide: Boolean,
@@ -17,6 +18,7 @@ object DisplaySettings {
DisplaySettings(
faciaContent.display.isBoosted,
faciaContent.display.boostLevel,
+ faciaContent.display.isImmersive,
faciaContent.display.showBoostedHeadline,
faciaContent.display.showQuotedHeadline,
faciaContent.display.imageHide,
diff --git a/common/app/layout/FaciaContainer.scala b/common/app/layout/FaciaContainer.scala
index 9454e4594979..78daa29b19f5 100644
--- a/common/app/layout/FaciaContainer.scala
+++ b/common/app/layout/FaciaContainer.scala
@@ -163,7 +163,6 @@ object FaciaContainer {
collectionEssentials: CollectionEssentials,
containerLayout: Option[ContainerLayout],
componentId: Option[String],
- omitMPU: Boolean = false,
adFree: Boolean = false,
targetedTerritory: Option[TargetedTerritory] = None,
): FaciaContainer =
@@ -180,9 +179,9 @@ object FaciaContainer {
config.config.showLatestUpdate,
// popular containers should never be sponsored
container match {
- case MostPopular => ContainerCommercialOptions(omitMPU = omitMPU, adFree = adFree)
- case _ if !adFree => ContainerCommercialOptions(omitMPU = false, adFree = false)
- case _ => ContainerCommercialOptions(omitMPU = false, adFree = adFree)
+ case MostPopular => ContainerCommercialOptions(adFree = adFree)
+ case _ if !adFree => ContainerCommercialOptions(adFree = false)
+ case _ => ContainerCommercialOptions(adFree = adFree)
},
config.config.description.map(DescriptionMetaHeader),
customClasses = config.config.metadata.flatMap(paletteClasses(container, _)),
diff --git a/common/app/layout/Front.scala b/common/app/layout/Front.scala
index b9d1af262064..9e5c34b01516 100644
--- a/common/app/layout/Front.scala
+++ b/common/app/layout/Front.scala
@@ -39,7 +39,7 @@ object Front {
accumulation: Vector[FaciaContainer] = Vector.empty,
): Seq[FaciaContainer] = {
allConfigs.toList match {
- case Nil => accumulation
+ case Nil => accumulation
case ((config, collection), container) :: remainingConfigs =>
val newItems = collection.items.distinctBy(_.header.url)
val layoutMaybe = ContainerLayout.fromContainer(container, context, config, newItems, hasMore = false)
@@ -77,10 +77,9 @@ object Front {
): Seq[FaciaContainer] = {
collections match {
- case Nil => accumulation
+ case Nil => accumulation
case pressedCollection :: remainingPressedCollections =>
- val omitMPU: Boolean = pressedPage.metadata.omitMPUsFromContainers(edition)
- val container: Container = Container.fromPressedCollection(pressedCollection, omitMPU, adFree)
+ val container: Container = Container.fromPressedCollection(pressedCollection, adFree)
val newItems = pressedCollection.distinct
val collectionEssentials = CollectionEssentials.fromPressedCollection(pressedCollection)
@@ -101,7 +100,6 @@ object Front {
collectionEssentials.copy(items = newItems),
containerLayoutMaybe.map(_._1),
None,
- omitMPU = if (containerLayoutMaybe.isDefined) false else omitMPU,
adFree = adFree,
targetedTerritory = pressedCollection.targetedTerritory,
)
diff --git a/common/app/layout/SliceWithCards.scala b/common/app/layout/SliceWithCards.scala
index f7dc9f0e12e0..d82be3e20c72 100644
--- a/common/app/layout/SliceWithCards.scala
+++ b/common/app/layout/SliceWithCards.scala
@@ -40,7 +40,7 @@ object SliceWithCards {
): Seq[ColumnAndCards] = {
columns match {
- case Nil => accumulation
+ case Nil => accumulation
case column :: remainingColumns =>
val (itemsForColumn, itemsNotConsumed) = items splitAt column.numItems
diff --git a/common/app/layout/slices/Container.scala b/common/app/layout/slices/Container.scala
index 15e211c92559..971eaafe4838 100644
--- a/common/app/layout/slices/Container.scala
+++ b/common/app/layout/slices/Container.scala
@@ -18,9 +18,6 @@ case class Email(get: EmailLayout) extends Container
case object NavList extends Container
case object NavMediaList extends Container
case object MostPopular extends Container
-case object Video extends Container
-case object VerticalVideo extends Container
-
object Container extends GuLogging {
/** This is THE top level resolver for containers */
@@ -29,9 +26,6 @@ object Container extends GuLogging {
("dynamic/fast", Dynamic(DynamicFast)),
("dynamic/slow", Dynamic(DynamicSlow)),
("dynamic/package", Dynamic(DynamicPackage)),
- ("dynamic/slow-mpu", Dynamic(DynamicSlowMPU(omitMPU = false, adFree = adFree))),
- ("fixed/video", Video),
- ("fixed/video/vertical", VerticalVideo),
("nav/list", NavList),
("nav/media-list", NavMediaList),
("news/most-popular", MostPopular),
@@ -57,7 +51,14 @@ object Container extends GuLogging {
.map(Front.itemsVisible)
case Fixed(fixedContainer) => Some(Front.itemsVisible(fixedContainer.slices))
case Email(_) => Some(EmailContentContainer.storiesCount(collectionConfig))
- case _ => None
+ // scrollable feature containers are capped at 3 stories
+ case _ if collectionConfig.collectionType == "scrollable/feature" => Some(3)
+ // scrollable small and medium containers are capped at 4 stories
+ case _ if collectionConfig.collectionType == "scrollable/small" => Some(4)
+ case _ if collectionConfig.collectionType == "scrollable/medium" => Some(4)
+ // scrollable highlights containers are capped at 6 stories
+ case _ if collectionConfig.collectionType == "scrollable/highlights" => Some(6)
+ case _ => None
}
}
@@ -78,13 +79,11 @@ object Container extends GuLogging {
}
}
- def fromPressedCollection(pressedCollection: PressedCollection, omitMPU: Boolean, adFree: Boolean): Container = {
+ def fromPressedCollection(pressedCollection: PressedCollection, adFree: Boolean): Container = {
val container = resolve(pressedCollection.collectionType, adFree)
container match {
- case Fixed(definition) if omitMPU || adFree =>
+ case Fixed(definition) if adFree =>
Fixed(definition.copy(slices = definition.slicesWithoutMPU))
- case Dynamic(DynamicSlowMPU(_, _)) if omitMPU || adFree =>
- Dynamic(DynamicSlowMPU(omitMPU, adFree))
case _ => container
}
}
diff --git a/common/app/layout/slices/DynamicContainers.scala b/common/app/layout/slices/DynamicContainers.scala
index ca1293f9bb72..32a3e923d5df 100644
--- a/common/app/layout/slices/DynamicContainers.scala
+++ b/common/app/layout/slices/DynamicContainers.scala
@@ -7,7 +7,6 @@ object DynamicContainers {
("dynamic/fast", DynamicFast),
("dynamic/slow", DynamicSlow),
("dynamic/package", DynamicPackage),
- ("dynamic/slow-mpu", DynamicSlowMPU(omitMPU = false, adFree = false)),
)
def apply(collectionType: Option[String], items: Seq[PressedContent]): Option[ContainerDefinition] = {
diff --git a/common/app/layout/slices/DynamicSlowMpu.scala b/common/app/layout/slices/DynamicSlowMpu.scala
deleted file mode 100644
index 89c05b7fcde9..000000000000
--- a/common/app/layout/slices/DynamicSlowMpu.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package layout.slices
-
-case class DynamicSlowMPU(omitMPU: Boolean, adFree: Boolean) extends DynamicContainer {
- override protected def optionalFirstSlice(stories: Seq[Story]): Option[(Slice, Seq[Story])] = {
- val BigsAndStandards(bigs, _) = bigsAndStandards(stories)
- val isFirstBoosted = stories.headOption.exists(_.isBoosted)
- val isSecondBoosted = stories.lift(1).exists(_.isBoosted)
-
- if (bigs.length == 3) {
- Some((HalfQQ, stories.drop(3)))
- } else if (bigs.length == 2) {
- Some(
- if (isFirstBoosted) ThreeQuarterQuarter else if (isSecondBoosted) QuarterThreeQuarter else HalfHalf,
- stories.drop(2),
- )
- } else if (bigs.length == 1) {
- Some(if (isFirstBoosted) ThreeQuarterQuarter else HalfHalf, stories.drop(2))
- } else if (bigs.isEmpty) {
- None
- } else {
- Some(QuarterQuarterQuarterQuarter, stories.drop(4))
- }
- }
-
- override protected def standardSlices(stories: Seq[Story], firstSlice: Option[Slice]): Seq[Slice] =
- firstSlice match {
- case Some(_) if omitMPU =>
- if (stories.size > 3) Seq(Hl3QuarterQuarter) else Seq(HalfQQ)
- case Some(_) if adFree =>
- if (stories.size > 3) Seq(Hl3QuarterQuarter) else Seq(TlTlTl)
- case Some(_) => Seq(Hl3Mpu)
- case None if omitMPU || adFree =>
- if (stories.size > 3) Seq(QuarterQuarterQuarterQuarter) else Seq(HalfHalf)
- case None => Seq(TTlMpu)
- }
-}
diff --git a/common/app/layout/slices/Slice.scala b/common/app/layout/slices/Slice.scala
index b08c010fbb25..7a0bc6d3fe12 100755
--- a/common/app/layout/slices/Slice.scala
+++ b/common/app/layout/slices/Slice.scala
@@ -1150,7 +1150,7 @@ case object Highlights extends Slice {
case object ScrollableSmall extends Slice {
val layout = SliceLayout(
cssClassName = "scrollable-small",
- columns = Seq.fill(8)(
+ columns = Seq.fill(4)(
SingleItem(
colSpan = 1,
ItemClasses(
@@ -1165,7 +1165,7 @@ case object ScrollableSmall extends Slice {
case object ScrollableMedium extends Slice {
val layout = SliceLayout(
cssClassName = "scrollable-medium",
- columns = Seq.fill(6)(
+ columns = Seq.fill(4)(
SingleItem(
colSpan = 1,
ItemClasses(
diff --git a/common/app/metrics/FrontendMetrics.scala b/common/app/metrics/FrontendMetrics.scala
index 70f24ef52ef5..4ab502ff9c61 100644
--- a/common/app/metrics/FrontendMetrics.scala
+++ b/common/app/metrics/FrontendMetrics.scala
@@ -1,9 +1,9 @@
package metrics
-import com.amazonaws.services.cloudwatch.model.StandardUnit
import common.{Box, StopWatch}
import model.diagnostics.CloudWatch
import org.joda.time.DateTime
+import software.amazon.awssdk.services.cloudwatch.model.StandardUnit
import java.util.concurrent.TimeUnit.MILLISECONDS
import java.util.concurrent.atomic.AtomicLong
@@ -37,37 +37,16 @@ case class SimpleDataPoint(value: Double, sampleTime: DateTime) extends DataPoin
}
final case class SimpleMetric(override val name: String, datapoint: SimpleDataPoint) extends FrontendMetric {
- override val metricUnit: StandardUnit = StandardUnit.Count
+ override val metricUnit: StandardUnit = StandardUnit.COUNT
override val getAndResetDataPoints: List[DataPoint] = List(datapoint)
override val isEmpty = false
}
-// MetricUploader is a class to allow basic putting of metrics. Why does it exist? Because if we provide
-// access to cloudwatch directly, then we start to measure everything, and never remove unused metrics.
-// Also, MetricUploader will upload in batches.
-final case class MetricUploader(namespace: String) {
-
- private val datapoints: Box[List[SimpleMetric]] = Box(List.empty)
-
- def put(metrics: Map[String, Double]): Unit = {
- val timedMetrics = metrics.map { case (key, value) =>
- SimpleMetric(name = key, SimpleDataPoint(value, DateTime.now))
- }
- datapoints.send(_ ++ timedMetrics)
- }
-
- def upload(): Unit = {
- val points = datapoints.get()
- datapoints.alter(_.diff(points))
- CloudWatch.putMetrics(namespace, points, List.empty)
- }
-}
-
case class TimingDataPoint(value: Double, time: Option[DateTime] = None) extends DataPoint
final case class TimingMetric(override val name: String, description: String) extends FrontendMetric {
- override val metricUnit: StandardUnit = StandardUnit.Milliseconds
+ override val metricUnit: StandardUnit = StandardUnit.MILLISECONDS
private val timeInMillis = new AtomicLong()
private val currentCount = new AtomicLong()
@@ -91,7 +70,7 @@ case class GaugeDataPoint(value: Double, time: Option[DateTime] = None) extends
final case class GaugeMetric(
override val name: String,
description: String,
- override val metricUnit: StandardUnit = StandardUnit.Megabytes,
+ override val metricUnit: StandardUnit = StandardUnit.MEGABYTES,
get: () => Double,
) extends FrontendMetric {
@@ -103,7 +82,7 @@ case class CountDataPoint(value: Double, time: Option[DateTime] = None) extends
final case class CountMetric(override val name: String, description: String) extends FrontendMetric {
private val count: AtomicLong = new AtomicLong(0L)
- override val metricUnit = StandardUnit.Count
+ override val metricUnit = StandardUnit.COUNT
override def getAndResetDataPoints: List[DataPoint] = List(CountDataPoint(count.getAndSet(0L).toDouble))
diff --git a/common/app/model/Cached.scala b/common/app/model/Cached.scala
index ab4c826a59e7..35b493fe3119 100644
--- a/common/app/model/Cached.scala
+++ b/common/app/model/Cached.scala
@@ -1,8 +1,6 @@
package model
import conf.switches.Switches.LongCacheSwitch
-import conf.switches.Switches.ShorterSurrogateCacheForOlderArticles
-import conf.switches.Switches.ShorterSurrogateCacheForRecentArticles
import org.joda.time.DateTime
import play.api.http.Writeable
import play.api.mvc._
@@ -19,7 +17,7 @@ object CacheTime {
object Default extends CacheTime(60)
object LiveBlogActive extends CacheTime(5, Some(60))
- def RecentlyUpdated = CacheTime(60, if (ShorterSurrogateCacheForRecentArticles.isSwitchedOn) Some(30) else None)
+ def RecentlyUpdated = CacheTime(60, None)
// There is lambda which invalidates the cache on press events, so the facia cache time can be high.
object Facia extends CacheTime(60, Some(900))
object Crosswords extends CacheTime(60, Some(900))
@@ -29,9 +27,11 @@ object CacheTime {
object DiscussionDefault extends CacheTime(60)
object DiscussionClosed extends CacheTime(60, Some(longCacheTime))
object Football extends CacheTime(10)
- private def oldArticleCacheTime = if (ShorterSurrogateCacheForOlderArticles.isSwitchedOn) 60 else longCacheTime
- def LastDayUpdated = CacheTime(60, Some(oldArticleCacheTime))
- def NotRecentlyUpdated = CacheTime(60, Some(oldArticleCacheTime))
+ object FootballMatch extends CacheTime(30)
+ object Cricket extends CacheTime(60)
+ object FootballTables extends CacheTime(60)
+ def LastDayUpdated = CacheTime(60, Some(longCacheTime))
+ def NotRecentlyUpdated = CacheTime(60, Some(longCacheTime))
}
object Cached extends implicits.Dates {
diff --git a/common/app/model/CardStylePicker.scala b/common/app/model/CardStylePicker.scala
index cb3922d7a68d..6592b63a8ccb 100644
--- a/common/app/model/CardStylePicker.scala
+++ b/common/app/model/CardStylePicker.scala
@@ -37,7 +37,7 @@ object CardStylePicker {
def getCampaignType(campaigns: Seq[Campaign]): CampaignType = {
campaigns match {
- case Nil => OtherCampaign
+ case Nil => OtherCampaign
case head :: tail =>
head.fields match {
case ReportFields(campaignId) =>
diff --git a/common/app/model/FaciaDisplayElement.scala b/common/app/model/FaciaDisplayElement.scala
index f343327ef3f3..4ede49cf7fab 100644
--- a/common/app/model/FaciaDisplayElement.scala
+++ b/common/app/model/FaciaDisplayElement.scala
@@ -13,7 +13,7 @@ object FaciaDisplayElement {
itemClasses: ItemClasses,
): Option[FaciaDisplayElement] = {
faciaContent.mainVideo match {
- case Some(videoElement) if faciaContent.properties.showMainVideo =>
+ case Some(videoElement) if faciaContent.properties.mediaSelect.exists(_.showMainVideo) =>
Some(
InlineVideo(
videoElement,
@@ -23,9 +23,12 @@ object FaciaDisplayElement {
)
case _ if faciaContent.properties.isCrossword && Switches.CrosswordSvgThumbnailsSwitch.isSwitchedOn =>
faciaContent.properties.maybeContentId map CrosswordSvg
- case _ if faciaContent.properties.imageSlideshowReplace && itemClasses.canShowSlideshow =>
+ case _ if faciaContent.properties.mediaSelect.exists(_.imageSlideshowReplace) && itemClasses.canShowSlideshow =>
InlineSlideshow.fromFaciaContent(faciaContent)
- case _ if faciaContent.properties.showMainVideo && faciaContent.mainYouTubeMediaAtom.isDefined =>
+ case _
+ if faciaContent.properties.mediaSelect.exists(
+ _.showMainVideo,
+ ) && faciaContent.mainYouTubeMediaAtom.isDefined =>
Some(InlineYouTubeMediaAtom(faciaContent.mainYouTubeMediaAtom.get, faciaContent.trailPicture))
case _ => InlineImage.fromFaciaContent(faciaContent)
}
diff --git a/common/app/model/Formats.scala b/common/app/model/Formats.scala
index aec269f60252..542319bb14b3 100644
--- a/common/app/model/Formats.scala
+++ b/common/app/model/Formats.scala
@@ -255,6 +255,7 @@ object PressedContentFormat {
implicit val imageMediaFormat: OFormat[ImageMedia] = Json.format[ImageMedia]
implicit val videoMediaFormat: OFormat[VideoMedia] = Json.format[VideoMedia]
implicit val videoElementFormat: OFormat[VideoElement] = Json.format[VideoElement]
+ implicit val assetDimensionsFormat: OFormat[AssetDimensions] = Json.format[AssetDimensions]
implicit val mediaAssetFormat: OFormat[MediaAsset] = Json.format[MediaAsset]
implicit val mediaAtomFormat: OFormat[MediaAtom] = Json.format[MediaAtom]
implicit val mediaTypeFormat: MediaTypeFormat.type = MediaTypeFormat
@@ -272,6 +273,7 @@ object PressedContentFormat {
implicit val pressedMetadata: OFormat[PressedMetadata] = Json.format[PressedMetadata]
implicit val pressedElements: OFormat[PressedElements] = Json.format[PressedElements]
implicit val pressedStory: OFormat[PressedStory] = Json.format[PressedStory]
+ implicit val mediaSelectFormat: OFormat[MediaSelect] = Json.format[MediaSelect]
implicit val pressedPropertiesFormat: OFormat[PressedProperties] = Json.format[PressedProperties]
implicit val enrichedContentFormat: OFormat[EnrichedContent] = Json.format[EnrichedContent]
@@ -311,11 +313,11 @@ object ItemKickerFormat {
def writes(itemKicker: ItemKicker): JsObject =
itemKicker match {
- case BreakingNewsKicker => JsObject(Seq("type" -> JsString("BreakingNewsKicker")))
- case LiveKicker => JsObject(Seq("type" -> JsString("LiveKicker")))
- case AnalysisKicker => JsObject(Seq("type" -> JsString("AnalysisKicker")))
- case ReviewKicker => JsObject(Seq("type" -> JsString("ReviewKicker")))
- case CartoonKicker => JsObject(Seq("type" -> JsString("CartoonKicker")))
+ case BreakingNewsKicker => JsObject(Seq("type" -> JsString("BreakingNewsKicker")))
+ case LiveKicker => JsObject(Seq("type" -> JsString("LiveKicker")))
+ case AnalysisKicker => JsObject(Seq("type" -> JsString("AnalysisKicker")))
+ case ReviewKicker => JsObject(Seq("type" -> JsString("ReviewKicker")))
+ case CartoonKicker => JsObject(Seq("type" -> JsString("CartoonKicker")))
case podcastKicker: PodcastKicker =>
JsObject(
Seq("type" -> JsString("PodcastKicker"), "series" -> Json.toJson(podcastKicker)(podcastKickerFormat)),
diff --git a/common/app/model/IpsosTags.scala b/common/app/model/IpsosTags.scala
index f7f0523c7a51..470c9e833763 100644
--- a/common/app/model/IpsosTags.scala
+++ b/common/app/model/IpsosTags.scala
@@ -30,7 +30,7 @@ object IpsosTags {
"au/environment" -> "environment",
"fashion" -> "fashion",
"au/lifeandstyle/fashion" -> "fashion",
- "fashion/beauty" -> "fashion",
+ "fashion/beauty" -> "beauty",
"uk/film" -> "film", /* There is no US film tag - should these map to film? */
"film" -> "film",
"au/film" -> "film",
@@ -52,9 +52,8 @@ object IpsosTags {
"lifeandstyle/love-and-sex" -> "lifeandstyle",
"lifeandstyle/women" -> "lifeandstyle",
"lifeandstyle/men" -> "lifeandstyle",
- "lifeandstyle/home-and-garden" -> "lifeandstyle",
+ "lifeandstyle/home-and-garden" -> "homeandgarden",
"us/lifeandstyle" -> "lifeandstyle",
- "lifeandstyle/home-and-garden" -> "lifeandstyle",
"au/media" -> "media",
"uk/media" -> "media", /* There is no US media tag - should these map to media? */
"membership" -> "membership",
@@ -97,7 +96,8 @@ object IpsosTags {
"teacher-network" -> "teachernetwork",
"uk/technology" -> "technology", /* There is no US technology tag - should these map to technology? */
"au/technology" -> "technology",
- "technology" -> "technology", /* Default for technology (including motoring) articles */
+ "technology" -> "technology", /* Default for technology articles */
+ "technology/motoring" -> "cars",
"thefilter" -> "thefilter",
"uk/thefilter" -> "thefilter",
"the-guardian-foundation" -> "foundation",
diff --git a/common/app/model/LiveBlogCurrentPage.scala b/common/app/model/LiveBlogCurrentPage.scala
index 11c9968840d9..88581187834a 100644
--- a/common/app/model/LiveBlogCurrentPage.scala
+++ b/common/app/model/LiveBlogCurrentPage.scala
@@ -20,7 +20,7 @@ object LiveBlogCurrentPage {
filterKeyEvents: Boolean,
): Option[LiveBlogCurrentPage] = {
range match {
- case CanonicalLiveBlog => firstPage(pageSize, blocks, filterKeyEvents)
+ case CanonicalLiveBlog => firstPage(pageSize, blocks, filterKeyEvents)
case PageWithBlock(isRequestedBlock) =>
findPageWithBlock(pageSize, blocks.body, isRequestedBlock, filterKeyEvents)
case SinceBlockId(blockId) => updates(blocks, SinceBlockId(blockId), filterKeyEvents)
diff --git a/common/app/model/PressedDisplaySettings.scala b/common/app/model/PressedDisplaySettings.scala
index 1644b2ceda50..46b893632354 100644
--- a/common/app/model/PressedDisplaySettings.scala
+++ b/common/app/model/PressedDisplaySettings.scala
@@ -6,6 +6,7 @@ import com.gu.facia.api.{models => fapi}
final case class PressedDisplaySettings(
isBoosted: Boolean,
boostLevel: Option[BoostLevel],
+ isImmersive: Option[Boolean],
showBoostedHeadline: Boolean,
showQuotedHeadline: Boolean,
imageHide: Boolean,
@@ -20,6 +21,7 @@ object PressedDisplaySettings {
imageHide = shouldSuppressImages || contentProperties.imageHide,
isBoosted = FaciaContentUtils.isBoosted(content),
boostLevel = Some(FaciaContentUtils.boostLevel(content)),
+ isImmersive = Some(FaciaContentUtils.isImmersive(content)),
showBoostedHeadline = FaciaContentUtils.showBoostedHeadline(content),
showQuotedHeadline = FaciaContentUtils.showQuotedHeadline(content),
showLivePlayable = FaciaContentUtils.showLivePlayable(content),
diff --git a/common/app/model/PressedPage.scala b/common/app/model/PressedPage.scala
index 81d66dfe4b16..1aef2ab3b5e6 100644
--- a/common/app/model/PressedPage.scala
+++ b/common/app/model/PressedPage.scala
@@ -1,7 +1,6 @@
package model
import com.gu.commercial.branding.Branding
-import com.gu.facia.api.models._
import common.Edition
import conf.Configuration
import contentapi.Paths
diff --git a/common/app/model/PressedProperties.scala b/common/app/model/PressedProperties.scala
index d5c331fced70..66766dc6c38d 100644
--- a/common/app/model/PressedProperties.scala
+++ b/common/app/model/PressedProperties.scala
@@ -2,15 +2,20 @@ package model.pressed
import com.gu.facia.api.utils.FaciaContentUtils
import com.gu.facia.api.{models => fapi, utils => fapiutils}
-import common.{Edition}
+import common.Edition
import common.commercial.EditionBranding
+case class MediaSelect(
+ showMainVideo: Boolean,
+ imageSlideshowReplace: Boolean,
+ videoReplace: Boolean,
+)
+
final case class PressedProperties(
isBreaking: Boolean,
- showMainVideo: Boolean,
+ mediaSelect: Option[MediaSelect],
showKickerTag: Boolean,
showByline: Boolean,
- imageSlideshowReplace: Boolean,
maybeContent: Option[PressedStory],
maybeContentId: Option[String],
isLiveBlog: Boolean,
@@ -40,10 +45,15 @@ object PressedProperties {
PressedProperties(
isBreaking = contentProperties.isBreaking,
- showMainVideo = contentProperties.showMainVideo,
+ mediaSelect = Some(
+ MediaSelect(
+ showMainVideo = contentProperties.showMainVideo,
+ imageSlideshowReplace = contentProperties.imageSlideshowReplace,
+ videoReplace = contentProperties.videoReplace,
+ ),
+ ),
showKickerTag = contentProperties.showKickerTag,
showByline = contentProperties.showByline,
- imageSlideshowReplace = contentProperties.imageSlideshowReplace,
maybeContent = capiContent.map(PressedStory(_)),
maybeContentId = FaciaContentUtils.maybeContentId(content),
isLiveBlog = FaciaContentUtils.isLiveBlog(content),
diff --git a/common/app/model/SupportedUrl.scala b/common/app/model/SupportedUrl.scala
index 4560b861cca3..f76db7506fcf 100644
--- a/common/app/model/SupportedUrl.scala
+++ b/common/app/model/SupportedUrl.scala
@@ -23,7 +23,7 @@ object SupportedUrl {
.map(_.replaceFirst("^https?://www.theguardian.com/", ""))
.orElse(supportingCuratedContent.properties.href)
.getOrElse(supportingCuratedContent.card.id)}"
- case linkSnap: LinkSnap => linkSnap.properties.href.getOrElse(linkSnap.card.id)
+ case linkSnap: LinkSnap => linkSnap.properties.href.getOrElse(linkSnap.card.id)
case latestSnap: LatestSnap =>
latestSnap.properties.maybeContent
.map(content => s"/${content.metadata.id}")
diff --git a/common/app/model/content.scala b/common/app/model/content.scala
index d73f3d011597..648fd015a7b3 100644
--- a/common/app/model/content.scala
+++ b/common/app/model/content.scala
@@ -24,8 +24,6 @@ import scala.jdk.CollectionConverters._
import scala.util.Try
import implicits.Booleans._
import org.joda.time.DateTime
-import conf.switches.Switches.InteractiveHeaderSwitch
-import _root_.contentapi.SectionTagLookUp.sectionId
sealed trait ContentType {
def content: Content
@@ -88,7 +86,9 @@ final case class Content(
lazy val isImmersive =
fields.displayHint.contains("immersive") || isGallery || tags.isTheMinuteArticle || isPhotoEssay
lazy val isPaidContent: Boolean = tags.tags.exists { tag => tag.id == "tone/advertisement-features" }
- lazy val isTheFilter: Boolean = tags.tags.exists { tag => tag.id == "thefilter/series/the-filter" }
+ lazy val isTheFilterUk: Boolean = tags.tags.exists { tag => tag.id == "thefilter/series/the-filter" }
+ lazy val isTheFilterUs: Boolean = tags.tags.exists { tag => tag.id == "thefilter-us/series/thefilter-us" }
+ lazy val isUSProductionOffice: Boolean = productionOffice.exists(_.toLowerCase == "us")
lazy val campaigns: List[Campaign] =
_root_.commercial.targeting.CampaignAgent.getCampaignsForTags(tags.tags.map(_.id))
@@ -96,12 +96,14 @@ final case class Content(
val shouldAmplifyContent = {
if (tags.isLiveBlog) {
AmpLiveBlogSwitch.isSwitchedOn
+ } else if (tags.isInteractive) {
+ AmpArticleSwitch.isSwitchedOn
} else if (tags.isArticle) {
val hasBodyBlocks: Boolean = fields.blocks.exists(b => b.body.nonEmpty)
// Some Labs pages have quiz atoms but are not tagged as quizzes
val hasQuizAtoms: Boolean = atoms.exists(a => a.quizzes.nonEmpty)
- AmpArticleSwitch.isSwitchedOn && hasBodyBlocks && !tags.isQuiz && !hasQuizAtoms && !isTheFilter
+ AmpArticleSwitch.isSwitchedOn && hasBodyBlocks && !tags.isQuiz && !hasQuizAtoms && !isTheFilterUk
} else {
false
}
@@ -162,7 +164,9 @@ final case class Content(
trail.webPublicationDate.isBefore(DateTime.now().minusYears(1))
() match {
- case paid if isPaidContent => Paid
+ case paid if isPaidContent => Paid
+ case filterUk if isTheFilterUk => FilterUk
+ case filterUs if isTheFilterUs => FilterUs
case oldcommentObserver if isOldOpinion && isFromTheObserver =>
CommentObserverOldContent(trail.webPublicationDate.getYear)
case oldComment if isOldOpinion => CommentGuardianOldContent(trail.webPublicationDate.getYear)
@@ -290,8 +294,9 @@ final case class Content(
("references", JsArray(javascriptReferences)),
(
"showRelatedContent",
- JsBoolean(if (tags.isTheMinuteArticle) { false }
- else showInRelated && !legallySensitive),
+ JsBoolean(if (tags.isTheMinuteArticle) {
+ false
+ } else showInRelated && !legallySensitive),
),
("productionOffice", JsString(productionOffice.getOrElse(""))),
("isImmersive", JsBoolean(isImmersive)),
@@ -332,7 +337,7 @@ final case class Content(
} else Nil
val seriesMeta = tags.series.filterNot { _.id == "commentisfree/commentisfree" } match {
- case Nil => Nil
+ case Nil => Nil
case allTags @ (mainSeries :: _) =>
List(
Some("series", JsString(mainSeries.name)),
@@ -1009,7 +1014,6 @@ object Interactive {
contentType = Some(contentType),
adUnitSuffix = section + "/" + contentType.name.toLowerCase,
twitterPropertiesOverrides = Map("twitter:title" -> fields.linkText),
- contentWithSlimHeader = InteractiveHeaderSwitch.isSwitchedOff,
opengraphPropertiesOverrides = opengraphProperties,
)
val contentOverrides = content.copy(
diff --git a/common/app/model/content/Atom.scala b/common/app/model/content/Atom.scala
index 6dd7f0d37c52..27e82db1ab3b 100644
--- a/common/app/model/content/Atom.scala
+++ b/common/app/model/content/Atom.scala
@@ -1,6 +1,11 @@
package model.content
-import com.gu.contentatom.thrift.atom.media.{Asset => AtomApiMediaAsset, MediaAtom => AtomApiMediaAtom}
+import com.gu.contentatom.thrift.atom.media.{
+ Asset => AtomApiMediaAsset,
+ MediaAtom => AtomApiMediaAtom,
+ VideoPlayerFormat => AtomApiVideoPlayerFormat,
+}
+import com.gu.contentatom.thrift.AtomDataAliases.{MediaAlias => MediaAtomData}
import com.gu.contentatom.thrift.atom.timeline.{TimelineItem => TimelineApiItem}
import com.gu.contentatom.thrift.{
AtomData,
@@ -15,7 +20,7 @@ import model.{ImageAsset, ImageMedia, ShareLinkMeta}
import org.apache.commons.lang3.time.DurationFormatUtils
import org.joda.time.format.DateTimeFormat
import org.joda.time.{DateTime, DateTimeZone, Duration}
-import play.api.libs.json.{JsError, JsSuccess, Json, OFormat}
+import play.api.libs.json.{JsError, JsSuccess, Json, OFormat, Writes}
import quiz._
import views.support.GoogleStructuredData
@@ -166,6 +171,8 @@ final case class MediaAtom(
expired: Option[Boolean],
activeVersion: Option[Long],
channelId: Option[String],
+ trailImage: Option[ImageMedia],
+ videoPlayerFormat: Option[VideoPlayerFormat],
) extends Atom {
def activeAssets: Seq[MediaAsset] =
@@ -188,13 +195,44 @@ final case class MediaAtom(
}
}
+object AssetDimensions {
+ implicit val assetDimensionsWrites: Writes[AssetDimensions] =
+ Json.writes[AssetDimensions]
+}
+final case class AssetDimensions(
+ width: Int,
+ height: Int,
+)
+
final case class MediaAsset(
id: String,
version: Long,
platform: MediaAssetPlatform,
mimeType: Option[String],
+ assetType: MediaAssetType,
+ dimensions: Option[AssetDimensions],
+ aspectRatio: Option[String],
)
+sealed trait VideoPlayerFormat extends EnumEntry
+
+object VideoPlayerFormat extends Enum[VideoPlayerFormat] with PlayJsonEnum[VideoPlayerFormat] {
+ val values = findValues
+
+ case object Default extends VideoPlayerFormat
+ case object Loop extends VideoPlayerFormat
+ case object Cinemagraph extends VideoPlayerFormat
+}
+
+sealed trait MediaAssetType extends EnumEntry
+
+object MediaAssetType extends Enum[MediaAssetType] with PlayJsonEnum[MediaAssetType] {
+ val values = findValues
+
+ case object Audio extends MediaAssetType
+ case object Video extends MediaAssetType
+ case object Subtitles extends MediaAssetType
+}
sealed trait MediaAssetPlatform extends EnumEntry
object MediaAtom extends common.GuLogging {
@@ -206,6 +244,33 @@ object MediaAtom extends common.GuLogging {
MediaAtom.mediaAtomMake(id, defaultHtml, mediaAtom)
}
+ def makeFromThrift(id: String, mediaAtom: MediaAtomData): MediaAtom = {
+ MediaAtom(
+ id,
+ // Default html is not being used by DCR - consider removing this field entirely.
+ defaultHtml = "",
+ assets = mediaAtom.assets.map(mediaAssetMake).toSeq,
+ title = mediaAtom.title,
+ duration = mediaAtom.duration,
+ source = mediaAtom.source,
+ posterImage = mediaAtom.posterImage.map(imageMediaMake(_, mediaAtom.title)),
+ // We filter out expired atoms in facia-scala-client so this is always false.
+ expired = Some(false),
+ activeVersion = mediaAtom.activeVersion,
+ channelId = mediaAtom.metadata.flatMap(_.channelId),
+ trailImage = mediaAtom.trailImage.map(imageMediaMake(_, mediaAtom.title)),
+ videoPlayerFormat = VideoPlayerFormat.withNameOption(
+ mediaAtom.metadata
+ .flatMap(_.selfHost)
+ .flatMap(_.videoPlayerFormat)
+ .getOrElse(
+ AtomApiVideoPlayerFormat.Default,
+ )
+ .name,
+ ),
+ )
+ }
+
def mediaAtomMake(id: String, defaultHtml: String, mediaAtom: AtomApiMediaAtom): MediaAtom = {
val expired: Option[Boolean] = for {
metadata <- mediaAtom.metadata
@@ -223,6 +288,16 @@ object MediaAtom extends common.GuLogging {
expired = expired,
activeVersion = mediaAtom.activeVersion,
channelId = mediaAtom.metadata.flatMap(_.channelId),
+ trailImage = mediaAtom.trailImage.map(imageMediaMake(_, mediaAtom.title)),
+ videoPlayerFormat = VideoPlayerFormat.withNameOption(
+ mediaAtom.metadata
+ .flatMap(_.selfHost)
+ .flatMap(_.videoPlayerFormat)
+ .getOrElse(
+ AtomApiVideoPlayerFormat.Default,
+ )
+ .name,
+ ),
)
}
@@ -236,6 +311,9 @@ object MediaAtom extends common.GuLogging {
version = mediaAsset.version,
platform = MediaAssetPlatform.withName(mediaAsset.platform.name),
mimeType = mediaAsset.mimeType,
+ assetType = MediaAssetType.withName(mediaAsset.assetType.name),
+ dimensions = mediaAsset.dimensions.map(dim => AssetDimensions(dim.width, dim.height)),
+ aspectRatio = mediaAsset.aspectRatio,
)
}
diff --git a/common/app/model/diagnostics/CloudWatch.scala b/common/app/model/diagnostics/CloudWatch.scala
index 0c71516c8e5a..d4a2bf095039 100644
--- a/common/app/model/diagnostics/CloudWatch.scala
+++ b/common/app/model/diagnostics/CloudWatch.scala
@@ -1,47 +1,33 @@
package model.diagnostics
-import com.amazonaws.handlers.AsyncHandler
-import com.amazonaws.services.cloudwatch.{AmazonCloudWatchAsync, AmazonCloudWatchAsyncClient}
-import com.amazonaws.services.cloudwatch.model._
import common.GuLogging
import conf.Configuration
import conf.Configuration._
import metrics.{FrontendMetric, FrontendStatisticSet}
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient
+import software.amazon.awssdk.services.cloudwatch.model.{Dimension, MetricDatum, PutMetricDataRequest, StatisticSet}
+import utils.AWSv2
+import scala.concurrent.ExecutionContext
import scala.jdk.CollectionConverters._
+import scala.jdk.FutureConverters._
+import scala.util.{Failure, Success}
trait CloudWatch extends GuLogging {
- lazy val stageDimension = new Dimension().withName("Stage").withValue(environment.stage)
+ lazy val stageDimension = Dimension.builder().name("Stage").value(environment.stage).build()
- lazy val cloudwatch: Option[AmazonCloudWatchAsync] = Configuration.aws.credentials.map { credentials =>
- AmazonCloudWatchAsyncClient
- .asyncBuilder()
- .withCredentials(credentials)
- .withRegion(conf.Configuration.aws.region)
+ lazy val cloudwatch: CloudWatchAsyncClient =
+ CloudWatchAsyncClient
+ .builder()
+ .credentialsProvider(AWSv2.credentials)
+ .region(Region.of(conf.Configuration.aws.region))
.build()
- }
- trait LoggingAsyncHandler extends AsyncHandler[PutMetricDataRequest, PutMetricDataResult] with GuLogging {
- def onError(exception: Exception): Unit = {
- log.info(s"CloudWatch PutMetricDataRequest error: ${exception.getMessage}}")
- }
- def onSuccess(request: PutMetricDataRequest, result: PutMetricDataResult): Unit = {
- log.info("CloudWatch PutMetricDataRequest - success")
- }
- }
-
- object LoggingAsyncHandler extends LoggingAsyncHandler
-
- case class AsyncHandlerForMetric(frontendStatisticSets: List[FrontendStatisticSet]) extends LoggingAsyncHandler {
- override def onError(exception: Exception): Unit = {
- log.warn(s"Failed to put ${frontendStatisticSets.size} metrics: $exception")
- log.warn(s"Failed to put ${frontendStatisticSets.map(_.name).mkString(",")}")
- super.onError(exception)
- }
- }
-
- def putMetrics(metricNamespace: String, metrics: List[FrontendMetric], dimensions: List[Dimension]): Unit = {
+ def putMetrics(metricNamespace: String, metrics: List[FrontendMetric], dimensions: List[Dimension])(implicit
+ executionContext: ExecutionContext,
+ ): Unit = {
if (Configuration.environment.isProd) {
putMetricsWithStage(metricNamespace, metrics, dimensions :+ stageDimension)
} else {
@@ -53,35 +39,52 @@ trait CloudWatch extends GuLogging {
metricNamespace: String,
metrics: List[FrontendMetric],
dimensions: List[Dimension],
- ): Unit = {
+ )(implicit executionContext: ExecutionContext): Unit = {
for {
metricGroup <- metrics.filterNot(_.isEmpty).grouped(20)
} {
val metricsAsStatistics: List[FrontendStatisticSet] =
metricGroup.map(metric => FrontendStatisticSet(metric.getAndResetDataPoints, metric.name, metric.metricUnit))
- val request = new PutMetricDataRequest()
- .withNamespace(metricNamespace)
- .withMetricData {
- val metricDatum = for (metricStatistic <- metricsAsStatistics) yield {
- new MetricDatum()
- .withStatisticValues(frontendMetricToStatisticSet(metricStatistic))
- .withUnit(metricStatistic.unit)
- .withMetricName(metricStatistic.name)
- .withDimensions(dimensions.asJava)
+ val request =
+ PutMetricDataRequest
+ .builder()
+ .namespace(metricNamespace)
+ .metricData {
+ val metricDatum = for (metricStatistic <- metricsAsStatistics) yield {
+ MetricDatum
+ .builder()
+ .statisticValues(frontendMetricToStatisticSet(metricStatistic))
+ .unit(metricStatistic.unit)
+ .metricName(metricStatistic.name)
+ .dimensions(dimensions.asJava)
+ .build()
+ }
+ metricDatum.asJava
}
- metricDatum.asJava
+ .build()
+
+ CloudWatch.cloudwatch
+ .putMetricData(request)
+ .asScala
+ .onComplete {
+ case Success(_) => log.info("CloudWatch PutMetricDataRequest - success")
+ case Failure(e) =>
+ log.warn(s"Failed to put ${metricsAsStatistics.size} metrics: $e")
+ log.warn(s"Failed to put ${metricsAsStatistics.map(_.name).mkString(",")}")
+ log.info(s"CloudWatch PutMetricDataRequest error: ${e.getMessage}}")
}
- CloudWatch.cloudwatch.foreach(_.putMetricDataAsync(request, AsyncHandlerForMetric(metricsAsStatistics)))
}
}
private def frontendMetricToStatisticSet(metricStatistics: FrontendStatisticSet): StatisticSet =
- new StatisticSet()
- .withMaximum(metricStatistics.maximum)
- .withMinimum(metricStatistics.minimum)
- .withSampleCount(metricStatistics.sampleCount)
- .withSum(metricStatistics.sum)
+ StatisticSet
+ .builder()
+ .maximum(metricStatistics.maximum)
+ .minimum(metricStatistics.minimum)
+ .sampleCount(metricStatistics.sampleCount)
+ .sum(metricStatistics.sum)
+ .build()
}
diff --git a/common/app/model/dotcomrendering/DotcomBlocksRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomBlocksRenderingDataModel.scala
index edba663ef04a..2d61c96e88ef 100644
--- a/common/app/model/dotcomrendering/DotcomBlocksRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/DotcomBlocksRenderingDataModel.scala
@@ -11,6 +11,7 @@ import play.api.libs.json._
import play.api.mvc.RequestHeader
import views.support.CamelCase
import experiments.ActiveExperiments
+import ab.ABTests
// -----------------------------------------------------------------
// DCR Blocks DataModel
@@ -30,6 +31,7 @@ case class DotcomBlocksRenderingDataModel(
adUnit: String,
switches: Map[String, Boolean],
abTests: Map[String, String],
+ serverSideABTests: Map[String, String],
)
object DotcomBlocksRenderingDataModel {
@@ -52,6 +54,7 @@ object DotcomBlocksRenderingDataModel {
"adUnit" -> model.adUnit,
"switches" -> model.switches,
"abTests" -> model.abTests,
+ "serverSideABTests" -> model.serverSideABTests,
)
ElementsEnhancer.enhanceBlocks(obj)
@@ -115,6 +118,7 @@ object DotcomBlocksRenderingDataModel {
adUnit = content.metadata.adUnitSuffix,
switches = switches,
abTests = ActiveExperiments.getJsMap(request),
+ serverSideABTests = ABTests.allTests(request),
)
}
}
diff --git a/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala
index d5fc57c7206d..e1f19775e067 100644
--- a/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala
@@ -12,6 +12,7 @@ import navigation.{FooterLinks, Nav}
import play.api.libs.json.{JsObject, JsValue, Json, OWrites}
import play.api.mvc.RequestHeader
import views.support.{CamelCase, JavaScriptPage}
+import ab.ABTests
case class DotcomFrontsRenderingDataModel(
pressedPage: PressedPage,
@@ -28,8 +29,6 @@ case class DotcomFrontsRenderingDataModel(
isAdFreeUser: Boolean,
isNetworkFront: Boolean,
mostViewed: Seq[Trail],
- mostCommented: Option[Trail],
- mostShared: Option[Trail],
deeplyRead: Option[Seq[Trail]],
contributionsServiceUrl: String,
canonicalUrl: String,
@@ -43,8 +42,6 @@ object DotcomFrontsRenderingDataModel {
request: RequestHeader,
pageType: PageType,
mostViewed: Seq[RelatedContentItem],
- mostCommented: Option[Content],
- mostShared: Option[Content],
deeplyRead: Option[Seq[Trail]],
): DotcomFrontsRenderingDataModel = {
val edition = Edition.edition(request)
@@ -59,6 +56,7 @@ object DotcomFrontsRenderingDataModel {
val config = Config(
switches = switches,
abTests = ActiveExperiments.getJsMap(request),
+ serverSideABTests = ABTests.allTests(request),
ampIframeUrl = DotcomRenderingUtils.assetURL("data/vendor/amp-iframe.html"),
googletagUrl = Configuration.googletag.jsLocation,
stage = common.Environment.stage,
@@ -75,8 +73,17 @@ object DotcomFrontsRenderingDataModel {
.map { _.perEdition.mapKeys(_.id) }
.getOrElse(Map.empty[String, EditionCommercialProperties])
+ val lighterPage = page.copy(collections =
+ page.collections.map(collection =>
+ collection.copy(
+ curated = collection.curated.map(content => content.withoutCommercial),
+ backfill = collection.backfill.map(content => content.withoutCommercial),
+ ),
+ ),
+ )
+
DotcomFrontsRenderingDataModel(
- pressedPage = page,
+ pressedPage = lighterPage,
nav = nav,
editionId = edition.id,
editionLongForm = edition.displayName,
@@ -90,8 +97,6 @@ object DotcomFrontsRenderingDataModel {
isAdFreeUser = views.support.Commercial.isAdFree(request),
isNetworkFront = page.isNetworkFront,
mostViewed = mostViewed.map(content => Trail.pressedContentToTrail(content.faciaContent)(request)),
- mostCommented = mostCommented.flatMap(ContentCard.fromApiContent).flatMap(Trail.contentCardToTrail),
- mostShared = mostShared.flatMap(ContentCard.fromApiContent).flatMap(Trail.contentCardToTrail),
deeplyRead = deeplyRead,
contributionsServiceUrl = Configuration.contributionsService.url,
canonicalUrl = CanonicalLink(request, page.metadata.webUrl),
diff --git a/common/app/model/dotcomrendering/DotcomNewslettersPageRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomNewslettersPageRenderingDataModel.scala
index 10a73c53834d..197cdac2d3c3 100644
--- a/common/app/model/dotcomrendering/DotcomNewslettersPageRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/DotcomNewslettersPageRenderingDataModel.scala
@@ -14,6 +14,7 @@ import play.api.mvc.RequestHeader
import views.support.{CamelCase, JavaScriptPage}
import services.newsletters.model.{NewsletterResponseV2, NewsletterLayout}
import services.NewsletterData
+import ab.ABTests
case class DotcomNewslettersPageRenderingDataModel(
newsletters: List[NewsletterData],
@@ -58,6 +59,7 @@ object DotcomNewslettersPageRenderingDataModel {
val config = Config(
switches = switches,
abTests = ActiveExperiments.getJsMap(request),
+ serverSideABTests = ABTests.allTests(request),
ampIframeUrl = DotcomRenderingUtils.assetURL("data/vendor/amp-iframe.html"),
googletagUrl = Configuration.googletag.jsLocation,
stage = common.Environment.stage,
diff --git a/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala
index f2ed6e4057f2..c550a8410d8e 100644
--- a/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala
@@ -1,5 +1,6 @@
package model.dotcomrendering
+import ab.ABTests
import com.gu.contentapi.client.model.v1.{Block => APIBlock, Blocks => APIBlocks}
import com.gu.contentapi.client.utils.AdvertisementFeature
import com.gu.contentapi.client.utils.format.{ImmersiveDisplay, InteractiveDesign}
@@ -10,19 +11,22 @@ import conf.Configuration
import crosswords.CrosswordPageWithContent
import experiments.ActiveExperiments
import model.dotcomrendering.DotcomRenderingUtils._
-import model.dotcomrendering.pageElements.{AudioBlockElement, ImageBlockElement, PageElement, Role, TextCleaner}
-import model.liveblog.BlockAttributes
+import model.dotcomrendering.pageElements._
+import model.meta.BlocksOn
import model.{
ArticleDateTimes,
Badges,
CanonicalLiveBlog,
ContentFormat,
ContentPage,
+ ContentType,
CrosswordData,
DotcomContentType,
GUDateTimeFormatNew,
+ Gallery,
GalleryPage,
ImageContentPage,
+ ImageMedia,
InteractivePage,
LiveBlogPage,
MediaPage,
@@ -33,6 +37,7 @@ import play.api.libs.json._
import play.api.mvc.RequestHeader
import services.NewsletterData
import views.support.{CamelCase, ContentLayout, JavaScriptPage}
+
// -----------------------------------------------------------------
// DCR DataModel
// -----------------------------------------------------------------
@@ -90,6 +95,7 @@ case class DotcomRenderingDataModel(
pageType: PageType,
starRating: Option[Int],
audioArticleImage: Option[PageElement],
+ trailPicture: Option[PageElement],
trailText: String,
nav: Nav,
showBottomSocialButtons: Boolean,
@@ -168,6 +174,7 @@ object DotcomRenderingDataModel {
"pageType" -> model.pageType,
"starRating" -> model.starRating,
"audioArticleImage" -> model.audioArticleImage,
+ "trailPicture" -> model.trailPicture,
"trailText" -> model.trailText,
"nav" -> model.nav,
"showBottomSocialButtons" -> model.showBottomSocialButtons,
@@ -197,13 +204,13 @@ object DotcomRenderingDataModel {
}
def forInteractive(
- page: InteractivePage,
- blocks: APIBlocks,
+ pageBlocks: BlocksOn[InteractivePage],
request: RequestHeader,
pageType: PageType,
): DotcomRenderingDataModel = {
val baseUrl = if (request.isAmp) Configuration.amp.baseUrl else Configuration.dotcom.baseUrl
-
+ val page = pageBlocks.page
+ val blocks = pageBlocks.blocks
apply(
page = page,
request = request,
@@ -225,8 +232,7 @@ object DotcomRenderingDataModel {
}
def forArticle(
- page: PageWithStoryPackage, // for now, any non-liveblog page type
- blocks: APIBlocks,
+ pageBlocks: BlocksOn[PageWithStoryPackage],
request: RequestHeader,
pageType: PageType,
newsletter: Option[NewsletterData],
@@ -234,21 +240,21 @@ object DotcomRenderingDataModel {
val baseUrl = if (request.isAmp) Configuration.amp.baseUrl else Configuration.dotcom.baseUrl
val linkedData =
LinkedData.forArticle(
- article = page.article,
+ article = pageBlocks.page.article,
baseURL = baseUrl,
fallbackLogo = Configuration.images.fallbackLogo,
)
apply(
- page = page,
+ page = pageBlocks.page,
request = request,
pagination = None,
linkedData = linkedData,
- mainBlock = blocks.main,
- bodyBlocks = blocks.body.getOrElse(Nil).toSeq,
+ mainBlock = pageBlocks.blocks.main,
+ bodyBlocks = pageBlocks.blocks.body.getOrElse(Nil).toSeq,
pageType = pageType,
- hasStoryPackage = page.related.hasStoryPackage,
- storyPackage = getStoryPackage(page.related.faciaItems, request),
+ hasStoryPackage = pageBlocks.page.related.hasStoryPackage,
+ storyPackage = getStoryPackage(pageBlocks.page.related.faciaItems, request),
pinnedPost = None,
keyEvents = Nil,
newsletter = newsletter,
@@ -365,14 +371,14 @@ object DotcomRenderingDataModel {
}
def forLiveblog(
- page: LiveBlogPage,
- blocks: APIBlocks,
+ pageBlocks: BlocksOn[LiveBlogPage],
request: RequestHeader,
pageType: PageType,
filterKeyEvents: Boolean,
forceLive: Boolean,
newsletter: Option[NewsletterData],
): DotcomRenderingDataModel = {
+ val page = pageBlocks.page
val pagination = page.currentPage.pagination.map(paginationInfo => {
Pagination(
currentPage = page.currentPage.currentPage.pageNumber,
@@ -384,8 +390,9 @@ object DotcomRenderingDataModel {
)
})
- val bodyBlocks = blocksForLiveblogPage(page, blocks, filterKeyEvents).map(ensureSummaryTitle)
+ val bodyBlocks = blocksForLiveblogPage(pageBlocks, filterKeyEvents).map(ensureSummaryTitle)
+ val blocks = pageBlocks.blocks
val allTimelineBlocks = blocks.body match {
case Some(allBlocks) if allBlocks.nonEmpty =>
allBlocks.filter(block => block.attributes.keyEvent.contains(true) || block.attributes.summary.contains(true))
@@ -462,13 +469,17 @@ object DotcomRenderingDataModel {
)
def hasAffiliateLinks(
+ content: ContentType,
blocks: Seq[APIBlock],
): Boolean = {
- blocks.exists(block => DotcomRenderingUtils.stringContainsAffiliateableLinks(block.bodyHtml))
+ content match {
+ case gallery: Gallery => gallery.lightbox.containsAffiliateableLinks
+ case _ => blocks.exists(block => DotcomRenderingUtils.stringContainsAffiliateableLinks(block.bodyHtml))
+ }
}
val shouldAddAffiliateLinks = DotcomRenderingUtils.shouldAddAffiliateLinks(content)
- val shouldAddDisclaimer = hasAffiliateLinks(bodyBlocks)
+ val shouldAddDisclaimer = hasAffiliateLinks(content, bodyBlocks)
val contentDateTimes: ArticleDateTimes = ArticleDateTimes(
webPublicationDate = content.trail.webPublicationDate,
@@ -486,6 +497,7 @@ object DotcomRenderingDataModel {
val config = Config(
switches = switches,
abTests = ActiveExperiments.getJsMap(request),
+ serverSideABTests = ABTests.allTests(request),
ampIframeUrl = assetURL("data/vendor/amp-iframe.html"),
googletagUrl = Configuration.googletag.jsLocation,
stage = common.Environment.stage,
@@ -504,28 +516,50 @@ object DotcomRenderingDataModel {
val dcrTags = content.tags.tags.map(Tag.apply)
+ def getImageBlockElement(imageMedia: ImageMedia, role: Role) = {
+ val imageData = imageMedia.allImages.headOption
+ .map { d =>
+ Map(
+ "copyright" -> "",
+ "alt" -> d.altText.getOrElse(""),
+ "caption" -> d.caption.getOrElse(""),
+ "credit" -> d.credit.getOrElse(""),
+ )
+ }
+ .getOrElse(Map.empty)
+ ImageBlockElement(
+ imageMedia,
+ imageData,
+ Some(true),
+ role,
+ Seq.empty,
+ )
+ }
+
val audioImageBlock: Option[ImageBlockElement] =
if (page.metadata.contentType.contains(DotcomContentType.Audio)) {
for {
thumbnail <- page.item.elements.thumbnail
} yield {
- val imageData = thumbnail.images.allImages.headOption
- .map { d =>
- Map(
- "copyright" -> "",
- "alt" -> d.altText.getOrElse(""),
- "caption" -> d.caption.getOrElse(""),
- "credit" -> d.credit.getOrElse(""),
- )
- }
- .getOrElse(Map.empty)
- ImageBlockElement(
- thumbnail.images,
- imageData,
- Some(true),
- Role(Some("inline")),
- Seq.empty,
- )
+ getImageBlockElement(thumbnail.images, Role(Some("inline")))
+ }
+ } else {
+ None
+ }
+
+ val trailPicture: Option[ImageBlockElement] =
+ if (page.metadata.contentType.contains(DotcomContentType.Gallery)) {
+ for {
+ imageMedia <- page.item.trail.trailPicture
+ } yield {
+ // DCAR only relies on 'height', 'width', and 'isMaster' fields,
+ // so we remove all other properties to reduce unnecessary data.
+ val filteredImageMedia = ImageMedia(imageMedia.allImages.map { image =>
+ image.copy(fields = image.fields.filter(f => {
+ f._1 == "height" || f._1 == "width" || f._1 == "isMaster"
+ }))
+ })
+ getImageBlockElement(filteredImageMedia, Role(Some("inline")))
}
} else {
None
@@ -609,6 +643,7 @@ object DotcomRenderingDataModel {
DotcomRenderingDataModel(
affiliateLinksDisclaimer = addAffiliateLinksDisclaimerDCR(shouldAddAffiliateLinks, shouldAddDisclaimer),
audioArticleImage = audioImageBlock,
+ trailPicture = trailPicture,
author = author,
badge = Badges.badgeFor(content).map(badge => DCRBadge(badge.seriesTag, badge.imageUrl)),
beaconURL = Configuration.debug.beaconUrl,
diff --git a/common/app/model/dotcomrendering/DotcomRenderingSupportTypes.scala b/common/app/model/dotcomrendering/DotcomRenderingSupportTypes.scala
index 1137f8b7831f..d1f8628edd68 100644
--- a/common/app/model/dotcomrendering/DotcomRenderingSupportTypes.scala
+++ b/common/app/model/dotcomrendering/DotcomRenderingSupportTypes.scala
@@ -124,7 +124,6 @@ object Block {
content,
shouldAddAffiliateLinks,
isMainBlock,
- content.metadata.format.exists(_.display == ImmersiveDisplay),
campaigns,
calloutsUrl,
),
@@ -170,6 +169,7 @@ object Commercial {
case class Config(
switches: Map[String, Boolean],
abTests: Map[String, String],
+ serverSideABTests: Map[String, String],
googletagUrl: String,
stage: String,
frontendAssetsFullURL: String,
diff --git a/common/app/model/dotcomrendering/DotcomRenderingUtils.scala b/common/app/model/dotcomrendering/DotcomRenderingUtils.scala
index 9f59477d8a95..d4fba9adc09b 100644
--- a/common/app/model/dotcomrendering/DotcomRenderingUtils.scala
+++ b/common/app/model/dotcomrendering/DotcomRenderingUtils.scala
@@ -1,15 +1,15 @@
package model.dotcomrendering
import com.github.nscala_time.time.Imports.DateTime
-import com.gu.contentapi.client.model.v1.ElementType.Text
import com.gu.contentapi.client.model.v1.{Block => APIBlock, BlockElement => ClientBlockElement, Blocks => APIBlocks}
-import com.gu.contentapi.client.utils.format.LiveBlogDesign
+import com.gu.contentapi.client.utils.format.{ImmersiveDisplay, LiveBlogDesign}
import com.gu.contentapi.client.utils.{AdvertisementFeature, DesignType}
import common.Edition
import conf.switches.Switches
import conf.{Configuration, Static}
import model.content.Atom
import model.dotcomrendering.pageElements.{PageElement, TextCleaner}
+import model.meta.BlocksOn
import model.pressed.{PressedContent, SpecialReport}
import model.{
ArticleDateTimes,
@@ -54,7 +54,7 @@ object DotcomRenderingUtils {
case (Some(date), Some(team)) =>
Some(
DotcomRenderingMatchData(
- s"${Configuration.ajax.url}/sport/cricket/match/$date/${team}.json?dcr=true",
+ s"${Configuration.ajax.url}/sport/cricket/match-scoreboard/$date/${team}.json",
CricketMatchType,
),
)
@@ -157,10 +157,10 @@ object DotcomRenderingUtils {
}
def blocksForLiveblogPage(
- liveblog: LiveBlogPage,
- blocks: APIBlocks,
+ pageBlocks: BlocksOn[LiveBlogPage],
filterKeyEvents: Boolean,
): Seq[APIBlock] = {
+ val blocks = pageBlocks.blocks
// When the key events filter is on, we'd need all of the key events rather than just the latest 60 blocks
val allBlocks =
getKeyEventsIfFiltered(filterKeyEvents, blocks)
@@ -172,7 +172,7 @@ object DotcomRenderingUtils {
// of the response so we use those
val relevantBlocks = if (allBlocks.isEmpty) blocks.body.getOrElse(Nil) else allBlocks
- val ids = liveblog.currentPage.currentPage.blocks.map(_.id).toSet
+ val ids = pageBlocks.page.currentPage.currentPage.blocks.map(_.id).toSet
relevantBlocks.filter(block => ids(block.id))
}.toSeq
def stringContainsAffiliateableLinks(textString: String): Boolean = {
@@ -185,7 +185,6 @@ object DotcomRenderingUtils {
article: ContentType,
affiliateLinks: Boolean,
isMainBlock: Boolean,
- isImmersive: Boolean,
campaigns: Option[JsValue],
calloutsUrl: Option[String],
): List[PageElement] = {
@@ -201,12 +200,14 @@ object DotcomRenderingUtils {
pageUrl = request.uri,
atoms = atoms,
isMainBlock,
- isImmersive,
+ article.content.metadata.format.exists(_.display == ImmersiveDisplay),
campaigns,
calloutsUrl,
article.elements.thumbnail,
edition,
article.trail.webPublicationDate,
+ article.content.isGallery,
+ article.content.isUSProductionOffice,
),
)
.filter(PageElement.isSupported)
@@ -242,27 +243,53 @@ object DotcomRenderingUtils {
}
}
+ def withoutDeepNull(json: JsValue): JsValue = {
+ json match {
+ case JsObject(fields) =>
+ JsObject(fields.collect {
+ case (key, value) if value != JsNull => key -> withoutDeepNull(value)
+ })
+ case JsArray(values) =>
+ JsArray(values.collect {
+ case value if value != JsNull => withoutDeepNull(value)
+ })
+ case other => other
+ }
+ }
+
def shouldAddAffiliateLinks(content: ContentType): Boolean = {
- val contentHtml = Jsoup.parse(content.fields.body)
- val bodyElements = contentHtml.select("body").first().children()
-
- /** On smaller devices, the disclaimer is inserted before paragraph 2 of the article body and floats left. This
- * logic ensures there are two clear paragraphs of text at the top of the article. We don't support inserting the
- * disclaimer next to other element types. It also ensures the second paragraph is long enough to accommodate the
- * disclaimer appearing alongside it.
- */
- if (bodyElements.size >= 2) {
- val firstEl = bodyElements.get(0)
- val secondEl = bodyElements.get(1)
- if (firstEl.tagName == "p" && secondEl.tagName == "p" && secondEl.text().length >= 150) {
- AffiliateLinksCleaner.shouldAddAffiliateLinks(
- switchedOn = Switches.AffiliateLinks.isSwitchedOn,
- showAffiliateLinks = content.content.fields.showAffiliateLinks,
- alwaysOffTags = Configuration.affiliateLinks.alwaysOffTags,
- tagPaths = content.content.tags.tags.map(_.id),
- )
+ if (content.content.isGallery) {
+ // For galleries, the disclaimer is only inserted in the header so we don't need
+ // a check for paragraphs as in other articles
+ AffiliateLinksCleaner.shouldAddAffiliateLinks(
+ switchedOn = Switches.AffiliateLinks.isSwitchedOn,
+ showAffiliateLinks = content.content.fields.showAffiliateLinks,
+ alwaysOffTags = Configuration.affiliateLinks.alwaysOffTags,
+ tagPaths = content.content.tags.tags.map(_.id),
+ )
+ } else {
+ val contentHtml = Jsoup.parse(content.fields.body)
+ val bodyElements = contentHtml.select("body").first().children()
+
+ /** On smaller devices, the disclaimer is inserted before paragraph 2 of the article body and floats left. This
+ * logic ensures there are two clear paragraphs of text at the top of the article. We don't support inserting the
+ * disclaimer next to other element types. It also ensures the second paragraph is long enough to accommodate the
+ * disclaimer appearing alongside it.
+ */
+ if (bodyElements.size >= 2) {
+ val firstEl = bodyElements.get(0)
+ val secondEl = bodyElements.get(1)
+ if (firstEl.tagName == "p" && secondEl.tagName == "p" && secondEl.text().length >= 150) {
+ AffiliateLinksCleaner.shouldAddAffiliateLinks(
+ switchedOn = Switches.AffiliateLinks.isSwitchedOn,
+ showAffiliateLinks = content.content.fields.showAffiliateLinks,
+ alwaysOffTags = Configuration.affiliateLinks.alwaysOffTags,
+ tagPaths = content.content.tags.tags.map(_.id),
+ )
+ } else false
} else false
- } else false
+ }
+
}
def contentDateTimes(content: ContentType): ArticleDateTimes = {
@@ -307,7 +334,7 @@ object DotcomRenderingUtils {
): Option[OnwardCollectionResponse] = {
faciaItems match {
case Nil => None
- case _ =>
+ case _ =>
Some(
OnwardCollectionResponse(
heading = "More on this story",
diff --git a/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala
index 2cf5dc72cf7d..09dc061e9dea 100644
--- a/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala
@@ -14,6 +14,7 @@ import play.api.mvc.RequestHeader
import services.IndexPage
import views.support.{CamelCase, JavaScriptPage, PreviousAndNext}
import model.PressedCollectionFormat.pressedContentFormat
+import ab.ABTests
case class DotcomTagPagesRenderingDataModel(
contents: Seq[PressedContent],
@@ -85,6 +86,7 @@ object DotcomTagPagesRenderingDataModel {
val config = Config(
switches = switches,
abTests = ActiveExperiments.getJsMap(request),
+ serverSideABTests = ABTests.allTests(request),
ampIframeUrl = DotcomRenderingUtils.assetURL("data/vendor/amp-iframe.html"),
googletagUrl = Configuration.googletag.jsLocation,
stage = common.Environment.stage,
diff --git a/common/app/model/dotcomrendering/ElementsEnhancer.scala b/common/app/model/dotcomrendering/ElementsEnhancer.scala
index a754b6b466a7..4fa1911ee2f8 100644
--- a/common/app/model/dotcomrendering/ElementsEnhancer.scala
+++ b/common/app/model/dotcomrendering/ElementsEnhancer.scala
@@ -19,6 +19,7 @@ object ElementsEnhancer {
elementType match {
case "model.dotcomrendering.pageElements.ListBlockElement" => enhanceListBlockElement(elementWithId)
case "model.dotcomrendering.pageElements.TimelineBlockElement" => enhanceTimelineBlockElement(elementWithId)
+ case "model.dotcomrendering.pageElements.ProductBlockElement" => enhanceProductBlockElement(elementWithId)
case _ => elementWithId;
}
case _ => element
@@ -33,6 +34,10 @@ object ElementsEnhancer {
elementWithId ++ Json.obj("items" -> listItemsWithIds)
}
+ def enhanceProductBlockElement(elementWithId: JsObject): JsObject = {
+ elementWithId ++ Json.obj("content" -> enhanceElements(elementWithId.value("content")))
+ }
+
def enhanceTimelineBlockElement(element: JsObject): JsObject = {
val sectionsList = element.value("sections").as[List[JsObject]]
val sectionsListWithIds = sectionsList.map { section =>
@@ -75,6 +80,7 @@ object ElementsEnhancer {
Json.obj("keyEvents" -> enhanceObjectsWithElements(obj.value("keyEvents"))) ++
Json.obj("pinnedPost" -> enhanceObjectWithElements(obj.value("pinnedPost"))) ++
Json.obj("promotedNewsletter" -> obj.value("promotedNewsletter")) ++
- Json.obj("audioArticleImage" -> enhanceElement(obj.value("audioArticleImage")))
+ Json.obj("audioArticleImage" -> enhanceElement(obj.value("audioArticleImage"))) ++
+ Json.obj("trailPicture" -> enhanceElement(obj.value("trailPicture")))
}
}
diff --git a/common/app/model/dotcomrendering/MostPopular.scala b/common/app/model/dotcomrendering/MostPopular.scala
index f1de836f26f2..ee0f64f974b7 100644
--- a/common/app/model/dotcomrendering/MostPopular.scala
+++ b/common/app/model/dotcomrendering/MostPopular.scala
@@ -12,8 +12,6 @@ object OnwardCollectionResponse {
case class OnwardCollectionResponseDCR(
tabs: Seq[OnwardCollectionResponse],
- mostCommented: Option[Trail],
- mostShared: Option[Trail],
)
object OnwardCollectionResponseDCR {
implicit val onwardCollectionResponseForDRCWrites: OWrites[OnwardCollectionResponseDCR] =
diff --git a/common/app/model/dotcomrendering/Trail.scala b/common/app/model/dotcomrendering/Trail.scala
index b8ae1e530fdb..0dd420ad300b 100644
--- a/common/app/model/dotcomrendering/Trail.scala
+++ b/common/app/model/dotcomrendering/Trail.scala
@@ -5,6 +5,7 @@ import com.gu.commercial.branding.{Branding, BrandingType, Dimensions, Logo => C
import common.{Edition, LinkTo}
import implicits.FaciaContentFrontendHelpers.FaciaContentFrontendHelper
import layout.{ContentCard, DiscussionSettings}
+import model.dotcomrendering.DotcomRenderingUtils.withoutNull
import model.{Article, ContentFormat, ImageMedia, InlineImage, Pillar}
import model.pressed.PressedContent
import play.api.libs.json.{Json, OWrites, Writes}
@@ -33,6 +34,8 @@ case class Trail(
avatarUrl: Option[String],
branding: Option[Branding],
discussion: DiscussionSettings,
+ trailText: Option[String],
+ galleryCount: Option[Int],
)
object Trail {
@@ -53,7 +56,35 @@ object Trail {
implicit val discussionWrites: OWrites[DiscussionSettings] = Json.writes[DiscussionSettings]
- implicit val OnwardItemWrites: OWrites[Trail] = Json.writes[Trail]
+ implicit val OnwardItemWrites: Writes[Trail] = Writes { trail =>
+ val jsObject = Json.obj(
+ "url" -> trail.url,
+ "linkText" -> trail.linkText,
+ "showByline" -> trail.showByline,
+ "byline" -> trail.byline,
+ "masterImage" -> trail.masterImage,
+ "image" -> trail.image,
+ "carouselImages" -> trail.carouselImages,
+ "ageWarning" -> trail.ageWarning,
+ "isLiveBlog" -> trail.isLiveBlog,
+ "pillar" -> trail.pillar,
+ "designType" -> trail.designType,
+ "format" -> trail.format,
+ "webPublicationDate" -> trail.webPublicationDate,
+ "headline" -> trail.headline,
+ "mediaType" -> trail.mediaType,
+ "shortUrl" -> trail.shortUrl,
+ "kickerText" -> trail.kickerText,
+ "starRating" -> trail.starRating,
+ "avatarUrl" -> trail.avatarUrl,
+ "branding" -> trail.branding,
+ "discussion" -> trail.discussion,
+ "trailText" -> trail.trailText,
+ "galleryCount" -> trail.galleryCount,
+ )
+
+ withoutNull(jsObject)
+ }
private def contentCardToAvatarUrl(contentCard: ContentCard): Option[String] = {
@@ -99,43 +130,6 @@ object Trail {
url <- masterImage.url
} yield url
- def contentCardToTrail(contentCard: ContentCard): Option[Trail] = {
- for {
- properties <- contentCard.properties
- maybeContent <- properties.maybeContent
- metadata = maybeContent.metadata
- pillar <- metadata.pillar
- url <- properties.webUrl
- headline = contentCard.header.headline
- isLiveBlog = properties.isLiveBlog
- showByline = properties.showByline
- webPublicationDate <- contentCard.webPublicationDate.map(x => x.toDateTime().toString())
- shortUrl <- contentCard.shortUrl
- } yield Trail(
- url = url,
- linkText = "",
- showByline = showByline,
- byline = contentCard.byline.map(x => x.get),
- masterImage = getMasterUrl(maybeContent.trail.trailPicture),
- image = maybeContent.trail.thumbnailPath,
- carouselImages = getImageSources(maybeContent.trail.trailPicture),
- ageWarning = None,
- isLiveBlog = isLiveBlog,
- pillar = TrailUtils.normalisePillar(Some(pillar)),
- designType = metadata.designType.toString,
- format = metadata.format.getOrElse(ContentFormat.defaultContentFormat),
- webPublicationDate = webPublicationDate,
- headline = headline,
- mediaType = contentCard.mediaType.map(x => x.toString),
- shortUrl = shortUrl,
- kickerText = contentCard.header.kicker.flatMap(_.properties.kickerText),
- starRating = contentCard.starRating,
- avatarUrl = contentCardToAvatarUrl(contentCard),
- branding = contentCard.branding,
- discussion = contentCard.discussionSettings,
- )
- }
-
def pressedContentToTrail(content: PressedContent)(implicit
request: RequestHeader,
): Trail = {
@@ -168,6 +162,8 @@ object Trail {
avatarUrl = None,
branding = content.branding(Edition(request)),
discussion = DiscussionSettings.fromTrail(content),
+ trailText = content.card.trailText,
+ galleryCount = content.card.galleryCount,
)
}
}
diff --git a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala
index 189b9d0ee834..447966bc3910 100644
--- a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala
+++ b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala
@@ -1,33 +1,15 @@
package model.dotcomrendering.pageElements
-
-import com.gu.contentapi.client.model.v1.Crossword
-import com.gu.contentapi.json.CirceEncoders._
-import io.circe.syntax._
-import implicits.Dates.CapiRichDateTime
-import model.dotcomrendering.DotcomRenderingUtils
-import play.api.libs.json.{JsObject, Json, JsValue}
+import model.CrosswordData
+import play.api.libs.json.{JsValue, Json}
case class EditionsCrosswordRenderingDataModel(
- crosswords: Iterable[Crossword],
+ crosswords: Iterable[CrosswordData],
)
object EditionsCrosswordRenderingDataModel {
- def apply(crosswords: Iterable[Crossword]): EditionsCrosswordRenderingDataModel =
- new EditionsCrosswordRenderingDataModel(crosswords.map(crossword => {
- val shipSolutions =
- crossword.dateSolutionAvailable
- .map(_.toJoda.isBeforeNow)
- .getOrElse(crossword.solutionAvailable)
-
- if (shipSolutions) {
- crossword
- } else {
- crossword.copy(entries = crossword.entries.map(_.copy(solution = None)))
- }
- }))
-
- def toJson(model: EditionsCrosswordRenderingDataModel): JsValue =
+ def toJson(model: EditionsCrosswordRenderingDataModel): JsValue = {
Json.obj(
- "crosswords" -> Json.parse(model.crosswords.asJson.deepDropNullValues.toString()),
+ "newCrosswords" -> Json.toJson(model.crosswords),
)
+ }
}
diff --git a/common/app/model/dotcomrendering/pageElements/PageElement.scala b/common/app/model/dotcomrendering/pageElements/PageElement.scala
index 80b8416d2f44..9cc534d4c83f 100644
--- a/common/app/model/dotcomrendering/pageElements/PageElement.scala
+++ b/common/app/model/dotcomrendering/pageElements/PageElement.scala
@@ -5,6 +5,12 @@ import com.gu.contentapi.client.model.v1.ElementType.{List => GuList, Map => GuM
import com.gu.contentapi.client.model.v1.EmbedTracksType.DoesNotTrack
import com.gu.contentapi.client.model.v1.{
EmbedTracking,
+ LinkType,
+ ProductDisplayType,
+ ProductElementFields,
+ ProductCTA => ApiProductCta,
+ ProductCustomAttribute => ApiProductCustomAttribute,
+ ProductImage => ApiProductImage,
SponsorshipType,
TimelineElementFields,
WitnessElementFields,
@@ -22,7 +28,7 @@ import org.joda.time.DateTime
import org.jsoup.Jsoup
import play.api.libs.json._
import views.support.cleaner.SoundcloudHelper
-import views.support.{ImgSrc, SrcSet, Video700}
+import views.support.{AffiliateLinksCleaner, ImgSrc, SrcSet, Video700}
import java.net.URLEncoder
import scala.jdk.CollectionConverters._
@@ -428,12 +434,14 @@ object MapBlockElement {
case class MediaAtomBlockElementMediaAsset(
url: String,
mimeType: Option[String],
+ dimensions: Option[AssetDimensions],
+ aspectRatio: Option[String],
)
object MediaAtomBlockElementMediaAsset {
implicit val MediaAtomBlockElementMediaAssetWrites: Writes[MediaAtomBlockElementMediaAsset] =
Json.writes[MediaAtomBlockElementMediaAsset]
def fromMediaAsset(asset: MediaAsset): MediaAtomBlockElementMediaAsset = {
- MediaAtomBlockElementMediaAsset(asset.id, asset.mimeType)
+ MediaAtomBlockElementMediaAsset(asset.id, asset.mimeType, asset.dimensions, asset.aspectRatio)
}
}
case class MediaAtomBlockElement(
@@ -446,6 +454,7 @@ case class MediaAtomBlockElement(
expired: Option[Boolean],
activeVersion: Option[Long],
channelId: Option[String],
+ videoPlayerFormat: Option[VideoPlayerFormat],
) extends PageElement
object MediaAtomBlockElement {
implicit val MediaAtomBlockElementWrites: Writes[MediaAtomBlockElement] = Json.writes[MediaAtomBlockElement]
@@ -497,6 +506,60 @@ object PullquoteBlockElement {
implicit val PullquoteBlockElementWrites: Writes[PullquoteBlockElement] = Json.writes[PullquoteBlockElement]
}
+case class LinkBlockElement(
+ url: Option[String],
+ label: Option[String],
+ linkType: LinkType,
+) extends PageElement
+object LinkBlockElement {
+ implicit val LinkTypeWrites: Writes[LinkType] = Writes { linkType =>
+ JsString(linkType.name)
+ }
+ implicit val LinkBlockElementWrites: Writes[LinkBlockElement] = Json.writes[LinkBlockElement]
+}
+
+case class ProductImage(
+ url: String,
+ caption: String,
+ height: Int,
+ width: Int,
+ alt: String,
+ credit: String,
+ displayCredit: Boolean,
+)
+case class ProductCustomAttribute(
+ name: String,
+ value: String,
+)
+case class ProductCta(
+ text: String,
+ price: String,
+ retailer: String,
+ url: String,
+)
+case class ProductBlockElement(
+ productName: String,
+ brandName: String,
+ primaryHeadingHtml: String,
+ secondaryHeadingHtml: String,
+ starRating: String,
+ productCtas: List[ProductCta],
+ customAttributes: List[ProductCustomAttribute],
+ image: Option[ProductImage],
+ content: Seq[PageElement],
+ displayType: ProductDisplayType,
+) extends PageElement
+object ProductBlockElement {
+ implicit val ProductBlockElementImageWrites: Writes[ProductImage] = Json.writes[ProductImage]
+ implicit val ProductBlockElementCTAWrites: Writes[ProductCta] = Json.writes[ProductCta]
+ implicit val ProductBlockElementCustomAttributeWrites: Writes[ProductCustomAttribute] =
+ Json.writes[ProductCustomAttribute]
+ implicit val ProductBlockElementDisplayTypeWrites: Writes[ProductDisplayType] = Writes { displayType =>
+ JsString(displayType.name)
+ }
+ implicit val ProductBlockElementWrites: Writes[ProductBlockElement] = Json.writes[ProductBlockElement]
+}
+
case class QABlockElement(id: String, title: String, img: Option[String], html: String, credit: String)
extends PageElement
object QABlockElement {
@@ -883,6 +946,8 @@ object PageElement {
case _: VineBlockElement => true
case _: ListBlockElement => true
case _: TimelineBlockElement => true
+ case _: LinkBlockElement => true
+ case _: ProductBlockElement => true
// TODO we should quick fail here for these rather than pointlessly go to DCR
case table: TableBlockElement if table.isMandatory.exists(identity) => true
@@ -903,6 +968,8 @@ object PageElement {
overrideImage: Option[ImageElement],
edition: Edition,
webPublicationDate: DateTime,
+ isGallery: Boolean,
+ isUSProductionOffice: Boolean,
): List[PageElement] = {
def extractAtom: Option[Atom] =
@@ -920,7 +987,7 @@ object PageElement {
element.`type` match {
case Text =>
val textCleaners =
- TextCleaner.affiliateLinks(pageUrl, addAffiliateLinks) _ andThen
+ TextCleaner.affiliateLinks(pageUrl, addAffiliateLinks, isUSProductionOffice) _ andThen
TextCleaner.sanitiseLinks(edition)
for {
@@ -1012,7 +1079,7 @@ object PageElement {
List(
ImageBlockElement(
ImageMedia(imageAssets.toSeq),
- imageDataFor(element),
+ imageDataFor(element, isGallery, pageUrl, addAffiliateLinks, isUSProductionOffice),
element.imageTypeData.flatMap(_.displayCredit),
Role(element.imageTypeData.flatMap(_.role), defaultRole),
imageSources,
@@ -1243,12 +1310,13 @@ object PageElement {
mediaAtom.id,
mediaAtom.title,
mediaAtom.defaultHtml,
- mediaAtom.assets.map(MediaAtomBlockElementMediaAsset.fromMediaAsset),
+ mediaAtom.activeAssets.map(MediaAtomBlockElementMediaAsset.fromMediaAsset),
mediaAtom.duration,
mediaAtom.posterImage.map(NSImage1.imageMediaToSequence),
mediaAtom.expired,
mediaAtom.activeVersion,
mediaAtom.channelId,
+ mediaAtom.videoPlayerFormat,
),
)
}
@@ -1387,13 +1455,25 @@ object PageElement {
),
)
.toList
+
+ case Link =>
+ element.linkTypeData
+ .map(d =>
+ LinkBlockElement(
+ AffiliateLinksCleaner.replaceUrlInLink(d.url, pageUrl, addAffiliateLinks, isUSProductionOffice),
+ d.label,
+ d.linkType.getOrElse(LinkType.ProductButton),
+ ),
+ )
+ .toList
+
case Interactive =>
element.interactiveTypeData
.map(d =>
InteractiveBlockElement(d.iframeUrl, d.alt, d.scriptUrl.map(ensureHTTPS), d.role, d.isMandatory, d.caption),
)
.toList
- case Table => element.tableTypeData.map(d => TableBlockElement(d.html, Role(d.role), d.isMandatory)).toList
+ case Table => element.tableTypeData.map(d => TableBlockElement(d.html, Role(d.role), d.isMandatory)).toList
case Witness => {
(for {
wtd <- element.witnessTypeData
@@ -1479,6 +1559,8 @@ object PageElement {
edition,
webPublicationDate,
item,
+ isGallery,
+ isUSProductionOffice,
)
}.toSeq,
listElementType = listTypeData.`type`.map(_.name),
@@ -1498,10 +1580,29 @@ object PageElement {
edition,
webPublicationDate,
timelineTypeData,
+ isGallery,
+ isUSProductionOffice,
),
)
}.toList
+ case Product =>
+ element.productTypeData.map { productTypeData =>
+ makeProduct(
+ addAffiliateLinks,
+ pageUrl,
+ atoms,
+ isImmersive,
+ campaigns,
+ calloutsUrl,
+ edition,
+ webPublicationDate,
+ productTypeData,
+ isGallery,
+ isUSProductionOffice,
+ )
+ }.toList
+
case EnumUnknownElementType(f) => List(UnknownBlockElement(None))
case _ => Nil
}
@@ -1517,6 +1618,8 @@ object PageElement {
edition: Edition,
webPublicationDate: DateTime,
timelineTypeData: TimelineElementFields,
+ isGallery: Boolean,
+ isUSProductionOffice: Boolean,
) = {
timelineTypeData.sections.map { section =>
TimelineSection(
@@ -1540,6 +1643,8 @@ object PageElement {
overrideImage = None,
edition,
webPublicationDate,
+ isGallery,
+ isUSProductionOffice,
)
.headOption
},
@@ -1556,6 +1661,8 @@ object PageElement {
overrideImage = None,
edition,
webPublicationDate,
+ isGallery,
+ isUSProductionOffice,
)
}.toSeq,
)
@@ -1574,6 +1681,8 @@ object PageElement {
edition: Edition,
webPublicationDate: DateTime,
item: v1.ListItem,
+ isGallery: Boolean,
+ isUSProductionOffice: Boolean,
) = {
ListItem(
elements = item.elements.flatMap { element =>
@@ -1589,6 +1698,8 @@ object PageElement {
overrideImage = None,
edition,
webPublicationDate,
+ isGallery,
+ isUSProductionOffice,
)
}.toSeq,
title = item.title,
@@ -1601,6 +1712,112 @@ object PageElement {
)
}
+ private def makeProduct(
+ addAffiliateLinks: Boolean,
+ pageUrl: String,
+ atoms: Iterable[Atom],
+ isImmersive: Boolean,
+ campaigns: Option[JsValue],
+ calloutsUrl: Option[String],
+ edition: Edition,
+ webPublicationDate: DateTime,
+ product: ProductElementFields,
+ isGallery: Boolean,
+ isUSProductionOffice: Boolean,
+ ) = {
+
+ def createProductCta(
+ cta: ApiProductCta,
+ pageUrl: String,
+ addAffiliateLinks: Boolean,
+ isUSProductionOffice: Boolean,
+ ): Option[ProductCta] = {
+ for {
+ // URL must exist and be non-empty
+ url <- AffiliateLinksCleaner
+ .replaceUrlInLink(cta.url, pageUrl, addAffiliateLinks, isUSProductionOffice)
+ .filter(_.nonEmpty)
+
+ // Must have either non-empty text, or both non-empty price & retailer
+ if cta.text.exists(_.nonEmpty) ||
+ (cta.price.exists(_.nonEmpty) && cta.retailer.exists(_.nonEmpty))
+ } yield ProductCta(
+ text = cta.text.getOrElse(""),
+ price = cta.price.getOrElse(""),
+ retailer = cta.retailer.getOrElse(""),
+ url = url,
+ )
+ }
+
+ def createProductCustomAttribute(apiCustomAttribute: ApiProductCustomAttribute): Option[ProductCustomAttribute] = {
+ for {
+ name <- apiCustomAttribute.name if name.nonEmpty
+ value <- apiCustomAttribute.value if value.nonEmpty
+ } yield ProductCustomAttribute(
+ name = name,
+ value = value,
+ )
+ }
+
+ def createProductImage(apiImage: ApiProductImage): Option[ProductImage] = {
+ for {
+ url <- apiImage.file if url.nonEmpty
+ height <- apiImage.height
+ width <- apiImage.width
+ displayCredit <- apiImage.displayCredit
+ credit <- apiImage.credit
+ alt <- apiImage.alt
+ } yield ProductImage(
+ url = url,
+ caption = apiImage.caption.getOrElse(""),
+ credit = credit,
+ height = height,
+ width = width,
+ displayCredit = displayCredit,
+ alt = alt,
+ )
+ }
+
+ ProductBlockElement(
+ content = product.content
+ .getOrElse(List())
+ .flatMap { element =>
+ PageElement.make(
+ element,
+ addAffiliateLinks,
+ pageUrl,
+ atoms,
+ isMainBlock = false,
+ isImmersive,
+ campaigns,
+ calloutsUrl,
+ overrideImage = None,
+ edition,
+ webPublicationDate,
+ isGallery,
+ isUSProductionOffice,
+ )
+ }
+ .toSeq,
+ productName = product.productName.getOrElse(""),
+ brandName = product.brandName.getOrElse(""),
+ primaryHeadingHtml = product.primaryHeading.getOrElse(""),
+ secondaryHeadingHtml = product.secondaryHeading.getOrElse(""),
+ starRating = product.starRating.getOrElse("none-selected"),
+ productCtas = product.productCtas
+ .getOrElse(Seq.empty)
+ .flatMap(cta => createProductCta(cta, pageUrl, addAffiliateLinks, isUSProductionOffice))
+ .toList,
+ customAttributes = product.customAttributes
+ .getOrElse(Seq.empty)
+ .flatMap(apiAttr => createProductCustomAttribute(apiAttr))
+ .toList,
+ image = product.image.flatMap(apiImage => createProductImage(apiImage)),
+ displayType = product.displayType,
+ )
+
+ }
+
private[this] def ensureHTTPS(url: String): String = {
val http = "http://"
@@ -1912,12 +2129,24 @@ object PageElement {
pageElement.flatten
}
- private def imageDataFor(element: ApiBlockElement): Map[String, String] = {
+ private def imageDataFor(
+ element: ApiBlockElement,
+ isGallery: Boolean,
+ pageUrl: String,
+ addAffiliateLinks: Boolean,
+ isUSProductionOffice: Boolean,
+ ): Map[String, String] = {
element.imageTypeData.map { d =>
Map(
"copyright" -> d.copyright,
"alt" -> d.alt,
- "caption" -> d.caption,
+ "caption" -> {
+ if (isGallery) {
+ d.caption.map(TextCleaner.cleanGalleryCaption(_, pageUrl, addAffiliateLinks, isUSProductionOffice))
+ } else {
+ d.caption
+ }
+ },
"credit" -> d.credit,
) collect { case (k, Some(v)) => (k, v) }
} getOrElse Map()
diff --git a/common/app/model/dotcomrendering/pageElements/TextCleaner.scala b/common/app/model/dotcomrendering/pageElements/TextCleaner.scala
index 2c3ad1f8ab03..d8473cba6c4e 100644
--- a/common/app/model/dotcomrendering/pageElements/TextCleaner.scala
+++ b/common/app/model/dotcomrendering/pageElements/TextCleaner.scala
@@ -1,23 +1,30 @@
package model.dotcomrendering.pageElements
-import common.{Edition, LinkTo}
+import common.{Edition, GuLogging, LinkTo}
import conf.Configuration.{affiliateLinks => affiliateLinksConfig}
import model.{Tag, Tags}
import org.jsoup.Jsoup
-import views.support.AffiliateLinksCleaner
+import org.jsoup.nodes.Document
+import views.support.{AffiliateLinksCleaner, HtmlCleaner}
import scala.jdk.CollectionConverters._
import scala.util.matching.Regex
object TextCleaner {
- def affiliateLinks(pageUrl: String, addAffiliateLinks: Boolean)(html: String): String = {
+ def affiliateLinks(pageUrl: String, addAffiliateLinks: Boolean, isUSProductionOffice: Boolean)(
+ html: String,
+ ): String = {
if (addAffiliateLinks) {
val doc = Jsoup.parseBodyFragment(html)
val links = AffiliateLinksCleaner.getAffiliateableLinks(doc)
+ val skimlinksId =
+ if (isUSProductionOffice) affiliateLinksConfig.skimlinksUSId else affiliateLinksConfig.skimlinksDefaultId
links.foreach(el => {
- val id = affiliateLinksConfig.skimlinksId
- el.attr("href", AffiliateLinksCleaner.linkToSkimLink(el.attr("href"), pageUrl, id)).attr("rel", "sponsored")
+ el.attr(
+ "href",
+ AffiliateLinksCleaner.linkToSkimLink(el.attr("href"), pageUrl, skimlinksId),
+ ).attr("rel", "sponsored")
})
if (links.nonEmpty) {
@@ -30,6 +37,29 @@ object TextCleaner {
}
}
+ def cleanGalleryCaption(
+ caption: String,
+ pageUrl: String,
+ shouldAddAffiliateLinks: Boolean,
+ isUSProductionOffice: Boolean,
+ ): String = {
+
+ val cleaners = List(
+ GalleryCaptionCleaner,
+ GalleryAffiliateLinksCleaner(
+ pageUrl,
+ shouldAddAffiliateLinks,
+ isUSProductionOffice,
+ ),
+ )
+
+ val cleanedHtml = cleaners.foldLeft(Jsoup.parseBodyFragment(caption)) { case (html, cleaner) =>
+ cleaner.clean(html)
+ }
+ cleanedHtml.outputSettings().prettyPrint(false)
+ cleanedHtml.body.html
+ }
+
def sanitiseLinks(edition: Edition)(html: String): String = {
val doc = Jsoup.parseBodyFragment(html)
val links = doc.body().getElementsByTag("a")
@@ -108,3 +138,43 @@ object TagLinker {
}
}
}
+
+object GalleryCaptionCleaner extends HtmlCleaner {
+ override def clean(galleryCaption: Document): Document = {
+ // There is an inconsistent number of
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("")
+
+ // is removed in place of having a element
+ firstStrong.foreach(_.remove())
+
+ if (captionTitleText.isEmpty) {
+ galleryCaption
+ } else {
+ captionTitle.html(captionTitleText)
+ galleryCaption.body.prependChild(captionTitle)
+ galleryCaption
+ }
+ }
+}
+
+case class GalleryAffiliateLinksCleaner(
+ pageUrl: String,
+ shouldAddAffiliateLinks: Boolean,
+ isUSProductionOffice: Boolean,
+) extends HtmlCleaner
+ with GuLogging {
+
+ override def clean(document: Document): Document = {
+ val skimlinksId =
+ if (isUSProductionOffice) affiliateLinksConfig.skimlinksUSId else affiliateLinksConfig.skimlinksDefaultId
+
+ if (shouldAddAffiliateLinks) {
+ AffiliateLinksCleaner.replaceLinksInHtml(document, pageUrl, skimlinksId)
+ } else document
+ }
+}
diff --git a/common/app/model/facia/PressedCollection.scala b/common/app/model/facia/PressedCollection.scala
index efb307095a2e..5eb672807ca4 100644
--- a/common/app/model/facia/PressedCollection.scala
+++ b/common/app/model/facia/PressedCollection.scala
@@ -1,9 +1,8 @@
package model.facia
import com.gu.commercial.branding.ContainerBranding
-import com.gu.facia.api.{models => fapi}
-import com.gu.facia.api.models.{GroupsConfig}
-import com.gu.facia.api.utils.ContainerBrandingFinder
+import com.gu.facia.api.FAPI
+import com.gu.facia.api.utils.{BoostLevel, ContainerBrandingFinder}
import com.gu.facia.client.models.{Branded, TargetedTerritory}
import common.Edition
import model.pressed._
@@ -20,7 +19,6 @@ case class PressedCollection(
href: Option[String],
description: Option[String],
collectionType: String,
- groupsConfig: Option[GroupsConfig],
uneditable: Boolean,
showTags: Boolean,
showSections: Boolean,
@@ -52,6 +50,21 @@ case class PressedCollection(
def totalSize: Int = curated.size + backfill.size
+ lazy val withDefaultBoostLevels = {
+ val (defaultBoostCurated, defaultBoostBackfill) = FAPI
+ .applyDefaultBoostLevelsAndGroups[PressedContent](
+ groupsConfig = config.groupsConfig,
+ collectionType = config.collectionType,
+ contents = curated ++ backfill,
+ getBoostLevel = _.display.boostLevel.getOrElse(BoostLevel.Default),
+ setBoostLevel = (content, level) => content.withBoostLevel(Some(level)),
+ setGroup = (content, group) => content.withCard(content.card.copy(group = group)),
+ )
+ .splitAt(curated.length)
+
+ copy(curated = defaultBoostCurated, backfill = defaultBoostBackfill)
+ }
+
def lite(visible: Int): PressedCollection = {
val liteCurated = curated.take(visible)
val liteBackfill = backfill.take(visible - liteCurated.length)
@@ -98,7 +111,6 @@ object PressedCollection {
collection.href,
collection.collectionConfig.description,
collection.collectionConfig.collectionType,
- collection.collectionConfig.groupsConfig,
collection.collectionConfig.uneditable,
collection.collectionConfig.showTags,
collection.collectionConfig.showSections,
diff --git a/common/app/model/liveblog/BlockElement.scala b/common/app/model/liveblog/BlockElement.scala
index ca23b4f907b4..2e36cbaafbc1 100644
--- a/common/app/model/liveblog/BlockElement.scala
+++ b/common/app/model/liveblog/BlockElement.scala
@@ -182,6 +182,8 @@ object BlockElement {
case Recipe => Some(UnsupportedBlockElement(None))
case ElementType.List => Some(UnsupportedBlockElement(None))
case Timeline => Some(UnsupportedBlockElement(None))
+ case Link => Some(UnsupportedBlockElement(None))
+ case Product => Some(UnsupportedBlockElement(None))
}
}
diff --git a/common/app/model/meta.scala b/common/app/model/meta.scala
index 831aab3c618c..b08869d260da 100644
--- a/common/app/model/meta.scala
+++ b/common/app/model/meta.scala
@@ -358,11 +358,6 @@ case class MetaData(
def hasSurveyAd(request: RequestHeader): Boolean =
DfpAgent.hasSurveyAd(fullAdUnitPath, this, request)
- def omitMPUsFromContainers(edition: Edition): Boolean =
- if (isPressedPage) {
- DfpAgent.omitMPUsFromContainers(id, edition)
- } else false
-
val isSecureContact: Boolean = Set(
"help/ng-interactive/2017/mar/17/contact-the-guardian-securely",
"help/2016/sep/19/how-to-contact-the-guardian-securely",
@@ -564,12 +559,25 @@ case class TagCombiner(
private val webTitle: String = webTitleOverrides.getOrElse(id, s"${leftTag.name} + ${rightTag.name}")
+ val javascriptConfigOverrides: Map[String, JsValue] = Map(
+ ("keywords", JsString(List(leftTag.properties.webTitle, rightTag.properties.webTitle).mkString(","))),
+ ("keywordIds", JsString(List(leftTag.id, rightTag.id).mkString(","))),
+ (
+ "references",
+ JsArray(
+ (leftTag.properties.references ++ rightTag.properties.references).map(ref => Reference.toJavaScript(ref.id)),
+ ),
+ ),
+ )
+
override val metadata: MetaData = MetaData.make(
id = id,
section = leftTag.metadata.section,
webTitle = webTitle,
pagination = pagination,
description = Some(DotcomContentType.TagIndex.name),
+ javascriptConfigOverrides = javascriptConfigOverrides,
+ isFront = true,
commercial = Some(
// We only use the left tag for CommercialProperties
CommercialProperties(
diff --git a/common/app/model/meta/BlocksOn.scala b/common/app/model/meta/BlocksOn.scala
new file mode 100644
index 000000000000..54e0fb6cebed
--- /dev/null
+++ b/common/app/model/meta/BlocksOn.scala
@@ -0,0 +1,13 @@
+package model.meta
+
+import com.gu.contentapi.client.model.v1.Blocks
+
+/** Blocks are often passed around with the Page they belong to. It makes sense to give them a type that holds the two
+ * together - this reduces parameter-count on many methods, improves consistency, and makes clear what things usefully
+ * belong together for the work we're performing.
+ *
+ * https://docondev.com/blog/2020/6/2/refactoring-introduce-parameter-object
+ */
+case class BlocksOn[+P](page: P, blocks: Blocks) {
+ def mapBoth[Q >: P](p: P => Q, b: Blocks => Blocks) = BlocksOn(p(page), b(blocks))
+}
diff --git a/common/app/model/pressedContent.scala b/common/app/model/pressedContent.scala
index ce73775c2b76..eec2b6f75f51 100644
--- a/common/app/model/pressedContent.scala
+++ b/common/app/model/pressedContent.scala
@@ -1,8 +1,10 @@
package model.pressed
import com.gu.commercial.branding.Branding
+import com.gu.facia.api.utils.BoostLevel
import com.gu.facia.api.{models => fapi}
import common.Edition
+import model.content.MediaAtom
import model.{ContentFormat, Pillar}
import views.support.ContentOldAgeDescriber
@@ -25,6 +27,28 @@ sealed trait PressedContent {
def withoutTrailText: PressedContent
+ def withoutCommercial: PressedContent
+
+ def withBoostLevel(level: Option[BoostLevel]): PressedContent
+
+ def withCard(card: PressedCard): PressedContent
+
+ protected def propertiesWithoutCommercial(properties: PressedProperties): PressedProperties =
+ properties.copy(
+ maybeContent = properties.maybeContent.map(storyWithoutCommercial),
+ )
+
+ private def storyWithoutCommercial(story: PressedStory): PressedStory =
+ story.copy(
+ tags = story.tags.copy(
+ tags = story.tags.tags.map(tag =>
+ tag.copy(
+ properties = tag.properties.copy(commercial = None),
+ ),
+ ),
+ ),
+ )
+
def isPaidFor: Boolean = properties.isPaidFor
def branding(edition: Edition): Option[Branding] =
@@ -72,9 +96,23 @@ final case class CuratedContent(
], // This is currently an option, as we introduce the new field. It can then become a value type.
supportingContent: List[PressedContent],
cardStyle: CardStyle,
+ mediaAtom: Option[MediaAtom],
) extends PressedContent {
override def withoutTrailText: PressedContent = copy(card = card.withoutTrailText)
+
+ override def withoutCommercial: PressedContent = copy(
+ properties = propertiesWithoutCommercial(properties),
+ supportingContent = supportingContent.map(_.withoutCommercial),
+ )
+
+ override def withBoostLevel(level: Option[BoostLevel]): PressedContent = copy(
+ display = display.copy(boostLevel = level),
+ )
+
+ override def withCard(card: PressedCard): PressedContent = copy(
+ card = card,
+ )
}
object CuratedContent {
@@ -89,6 +127,13 @@ object CuratedContent {
supportingContent = content.supportingContent.map((sc) => PressedContent.make(sc, false)),
cardStyle = CardStyle.make(content.cardStyle),
enriched = Some(EnrichedContent.empty),
+ mediaAtom = content.mediaAtom.flatMap { atom =>
+ atom.data match {
+ case mediaAtom: com.gu.contentatom.thrift.AtomData.Media =>
+ Some(MediaAtom.makeFromThrift(atom.id, mediaAtom.media))
+ case _ => None
+ }
+ },
)
}
}
@@ -103,6 +148,16 @@ final case class SupportingCuratedContent(
cardStyle: CardStyle,
) extends PressedContent {
override def withoutTrailText: PressedContent = copy(card = card.withoutTrailText)
+
+ override def withoutCommercial: PressedContent = copy(properties = propertiesWithoutCommercial(properties))
+
+ override def withBoostLevel(level: Option[BoostLevel]): PressedContent = copy(
+ display = display.copy(boostLevel = level),
+ )
+
+ override def withCard(card: PressedCard): PressedContent = copy(
+ card = card,
+ )
}
object SupportingCuratedContent {
@@ -129,8 +184,19 @@ final case class LinkSnap(
enriched: Option[
EnrichedContent,
], // This is currently an option, as we introduce the new field. It can then become a value type.
+ mediaAtom: Option[MediaAtom],
) extends PressedContent {
override def withoutTrailText: PressedContent = copy(card = card.withoutTrailText)
+
+ override def withoutCommercial: PressedContent = copy(properties = propertiesWithoutCommercial(properties))
+
+ override def withBoostLevel(level: Option[BoostLevel]): PressedContent = copy(
+ display = display.copy(boostLevel = level),
+ )
+
+ override def withCard(card: PressedCard): PressedContent = copy(
+ card = card,
+ )
}
object LinkSnap {
@@ -143,6 +209,7 @@ object LinkSnap {
display = PressedDisplaySettings.make(content, None),
enriched = Some(EnrichedContent.empty),
format = ContentFormat.defaultContentFormat,
+ mediaAtom = None,
)
}
}
@@ -157,6 +224,16 @@ final case class LatestSnap(
) extends PressedContent {
override def withoutTrailText: PressedContent = copy(card = card.withoutTrailText)
+
+ override def withoutCommercial: PressedContent = copy(properties = propertiesWithoutCommercial(properties))
+
+ override def withBoostLevel(level: Option[BoostLevel]): PressedContent = copy(
+ display = display.copy(boostLevel = level),
+ )
+
+ override def withCard(card: PressedCard): PressedContent = copy(
+ card = card,
+ )
}
object LatestSnap {
diff --git a/common/app/model/trails.scala b/common/app/model/trails.scala
index e6ecc09893e7..7c1479d398b0 100644
--- a/common/app/model/trails.scala
+++ b/common/app/model/trails.scala
@@ -24,23 +24,23 @@ object Trail {
.orElse(elements.videos.headOption.map(_.images))
.orElse(elements.thumbnail.map(_.images))
- // Try to take the master 5:3 image. At render-time, the image resizing service will size the image according to card width.
+ // Try to take the master image (5:4 or 5:3). At render-time, the image resizing service will size the image according to card width.
// Filtering the list images here means that facia-press does not need to slim down the Trail object.
trailImageMedia.flatMap { imageMedia =>
val filteredTrailImages = imageMedia.allImages.filter { image =>
- IsRatio(5, 3, image.width, image.height)
+ IsRatio(5, 4, image.width, image.height) || IsRatio(5, 3, image.width, image.height)
}
val masterTrailImage = filteredTrailImages.find(_.isMaster).map { master =>
ImageMedia.make(List(master))
}
- // If there isn't a 5:3 image, no ImageMedia object will be created.
+ // If there isn't a 5:4 or 5:3 image, no ImageMedia object will be created.
lazy val largestTrailImage = filteredTrailImages.sortBy(-_.width).headOption.map { bestImage =>
ImageMedia.make(List(bestImage))
}
- // Choose the master 5:3 image, or the largest 5:3 image.
+ // Choose the master image (5:4 or 5:3), or the largest image (5:4 or 5:3).
masterTrailImage.orElse(largestTrailImage)
}
}
diff --git a/common/app/navigation/FooterLinks.scala b/common/app/navigation/FooterLinks.scala
index 7eb67e473953..31b181c8b98f 100644
--- a/common/app/navigation/FooterLinks.scala
+++ b/common/app/navigation/FooterLinks.scala
@@ -1,6 +1,11 @@
package navigation
import common.{Edition, editions}
+import common.editions.Uk.{networkFrontId => UK}
+import common.editions.Us.{networkFrontId => US}
+import common.editions.Au.{networkFrontId => AU}
+import common.editions.International.{networkFrontId => INT}
+import common.editions.Europe.{networkFrontId => EUR}
case class FooterLink(
text: String,
@@ -11,14 +16,18 @@ case class FooterLink(
object FooterLinks {
- // Footer column one
-
+ // Helpers
val complaintsAndCorrections =
FooterLink("Complaints & corrections", "/info/complaints-and-corrections", "complaints")
val secureDrop = FooterLink("SecureDrop", "https://www.theguardian.com/securedrop", "securedrop")
val privacyPolicy = FooterLink("Privacy policy", "/info/privacy", "privacy")
val cookiePolicy = FooterLink("Cookie policy", "/info/cookies", "cookie")
val termsAndConditions = FooterLink("Terms & conditions", "/help/terms-of-service", "terms")
+ val accessibilitySettings = FooterLink(
+ "Accessibility settings",
+ "/help/accessibility-help",
+ "accessibility settings",
+ )
def help(edition: String): FooterLink =
FooterLink(
@@ -29,186 +38,230 @@ object FooterLinks {
)
def workForUs(edition: String): FooterLink =
FooterLink("Work for us", "https://workforus.theguardian.com", s"${edition} : footer : work for us")
+ def allTopics(edition: String): FooterLink =
+ FooterLink("All topics", "/index/subjects/a", s"${edition} : footer : all topics")
+ def allWriters(edition: String): FooterLink =
+ FooterLink("All writers", "/index/contributors", s"${edition} : footer : all contributors")
+ val digitalNewspaperArchive: FooterLink =
+ FooterLink("Digital newspaper archive", "https://theguardian.newspapers.com", "digital newspaper archive")
+ def taxStrategy(edition: String): FooterLink =
+ FooterLink(
+ "Tax strategy",
+ "https://uploads.guim.co.uk/2025/09/05/Tax_strategy_for_the_year_ended_31_March_2025.pdf",
+ s"${edition} : footer : tax strategy",
+ )
+ def newsletters(edition: String): FooterLink = {
+ FooterLink(
+ text = "Newsletters",
+ url = s"/email-newsletters?INTCMP=DOTCOM_FOOTER_NEWSLETTER_${edition.toUpperCase}",
+ dataLinkName = s"$edition : footer : newsletters",
+ )
+ }
+ def modernSlaveryActStatement(edition: String): FooterLink = {
+ FooterLink(
+ "Modern Slavery Act",
+ "https://uploads.guim.co.uk/2025/09/05/Modern_Slavery_Statement_2025.pdf",
+ s"$edition : footer : modern slavery act statement",
+ )
+ }
+ def tipUsOff(edition: String): FooterLink = {
+ FooterLink("Tip us off", "https://www.theguardian.com/tips", s"$edition : footer : tips")
+ }
+ def searchJobs(edition: String): FooterLink = {
+ FooterLink("Search jobs", "https://jobs.theguardian.com", s"$edition : footer : jobs")
+ }
+
+ def socialLinks(edition: String): Iterable[FooterLink] = {
+ /*
+ * The `socials` list preserves the order of the links in the footer.
+ * Change the order here, if required.
+ */
+ val socials = List(
+ "bluesky" -> "Bluesky",
+ "facebook" -> "Facebook",
+ "instagram" -> "Instagram",
+ "linkedin" -> "LinkedIn",
+ "threads" -> "Threads",
+ "tiktok" -> "TikTok",
+ "youtube" -> "YouTube",
+ )
+
+ val defaultLinks: Map[String, String] = Map(
+ "bluesky" -> "https://bsky.app/profile/theguardian.com",
+ "facebook" -> "https://www.facebook.com/theguardian",
+ "instagram" -> "https://www.instagram.com/guardian",
+ "linkedin" -> "https://www.linkedin.com/company/theguardian",
+ "threads" -> "https://www.threads.com/@guardian",
+ "tiktok" -> "https://www.tiktok.com/@guardian",
+ "youtube" -> "https://www.youtube.com/user/TheGuardian",
+ )
+
+ /* Some editions have regional accounts. We can override the defaults here */
+ val editionOverrides: Map[String, Map[String, String]] = Map(
+ "au" -> Map(
+ "bluesky" -> "https://bsky.app/profile/australia.theguardian.com",
+ "facebook" -> "https://www.facebook.com/theguardianaustralia",
+ "instagram" -> "https://www.instagram.com/guardianaustralia",
+ "linkedin" -> "https://www.linkedin.com/company/guardianaustralia",
+ "threads" -> "https://www.threads.com/@guardianaustralia",
+ "tiktok" -> "https://www.tiktok.com/@guardianaustralia",
+ "youtube" -> "https://www.youtube.com/@GuardianAustralia",
+ ),
+ "us" -> Map(
+ "bluesky" -> "https://bsky.app/profile/us.theguardian.com",
+ "threads" -> "https://www.threads.com/@guardian_us",
+ ),
+ )
+ val urls: Map[String, String] = defaultLinks ++ editionOverrides.getOrElse(edition, Map.empty)
+
+ socials.map { case (key, displayName) =>
+ FooterLink(displayName, urls(key), s"$edition : footer : $displayName")
+ }
+ }
+
+ /* Column one */
val ukListOne = List(
- FooterLink("About us", "/about", "uk : footer : about us"),
- help("uk"),
+ FooterLink("About us", "/about", s"$UK : footer : about us"),
+ help(UK),
complaintsAndCorrections,
+ FooterLink("Contact us", "/help/contact-us", s"$UK : footer : contact us"),
+ tipUsOff(UK),
secureDrop,
- workForUs("uk"),
privacyPolicy,
cookiePolicy,
+ modernSlaveryActStatement(UK),
+ taxStrategy(UK),
termsAndConditions,
- FooterLink("Contact us", "/help/contact-us", "uk : footer : contact us"),
)
val usListOne = List(
- FooterLink("About us", "/info/about-guardian-us", "us : footer : about us"),
- help("us"),
+ FooterLink("About us", "/info/about-guardian-us", s"$US : footer : about us"),
+ help(US),
complaintsAndCorrections,
+ FooterLink("Contact us", "/info/about-guardian-us/contact", s"$US : footer : contact us"),
+ tipUsOff(US),
secureDrop,
- workForUs("us"),
privacyPolicy,
cookiePolicy,
+ taxStrategy(US),
termsAndConditions,
- FooterLink("Contact us", "/info/about-guardian-us/contact", "us : footer : contact us"),
)
val auListOne = List(
- FooterLink("About us", "/info/about-guardian-australia", "au : footer : about us"),
- FooterLink("Information", "/info", "au : footer : information"),
+ FooterLink("About us", "/info/about-guardian-australia", s"$AU : footer : about us"),
+ FooterLink("Information", "/info", s"$AU : footer : information"),
+ help(AU),
complaintsAndCorrections,
- help("au"),
+ FooterLink("Contact us", "/info/2013/may/26/contact-guardian-australia", s"$AU : footer : contact us"),
+ tipUsOff(AU),
secureDrop,
- workForUs("australia"),
- privacyPolicy,
- termsAndConditions,
- FooterLink("Contact us", "/info/2013/may/26/contact-guardian-australia", "au : footer : contact us"),
- )
-
- val intListOne = List(
- help("international"),
- complaintsAndCorrections,
- secureDrop,
- workForUs("international"),
privacyPolicy,
cookiePolicy,
+ taxStrategy(AU),
termsAndConditions,
- FooterLink("Contact us", "/help/contact-us", "international : footer : contact us"),
)
- // Footer column two
-
- def allTopics(edition: String): FooterLink =
- FooterLink("All topics", "/index/subjects/a", s"${edition} : footer : all topics")
- def allWriters(edition: String): FooterLink =
- FooterLink("All writers", "/index/contributors", s"${edition} : footer : all contributors")
- val digitalNewspaperArchive: FooterLink =
- FooterLink("Digital newspaper archive", "https://theguardian.newspapers.com", "digital newspaper archive")
- def taxStrategy(edition: String): FooterLink =
- FooterLink(
- "Tax strategy",
- "https://uploads.guim.co.uk/2024/08/27/TAX_STRATEGY_FOR_THE_YEAR_ENDED_31_MARCH_2025.pdf",
- s"${edition} : footer : tax strategy",
- )
- def facebook(edition: String): FooterLink =
- FooterLink("Facebook", "https://www.facebook.com/theguardian", s"${edition} : footer : facebook")
- def youtube(edition: String): FooterLink =
- FooterLink("YouTube", "https://www.youtube.com/user/TheGuardian", s"${edition} : footer : youtube")
- def linkedin(edition: String): FooterLink =
- FooterLink("LinkedIn", "https://www.linkedin.com/company/theguardian", s"${edition} : footer : linkedin")
- def instagram(edition: String): FooterLink =
- FooterLink("Instagram", "https://www.instagram.com/guardian", s"${edition} : footer : instagram")
- def newsletters(edition: String): FooterLink =
- FooterLink(
- text = "Newsletters",
- url = s"/email-newsletters?INTCMP=DOTCOM_FOOTER_NEWSLETTER_${edition.toUpperCase}",
- dataLinkName = s"$edition : footer : newsletters",
+ def genericListOne(edition: String): List[FooterLink] = {
+ List(
+ FooterLink("About us", "/about", s"$edition : footer : about us"),
+ help(edition),
+ complaintsAndCorrections,
+ FooterLink("Contact us", "/help/contact-us", s"$edition : footer : contact us"),
+ tipUsOff(edition),
+ secureDrop,
+ privacyPolicy,
+ cookiePolicy,
+ taxStrategy(edition),
+ termsAndConditions,
)
+ }
+ /* Column two */
val ukListTwo = List(
- allTopics("uk"),
- allWriters("uk"),
- FooterLink(
- "Modern Slavery Act",
- "https://uploads.guim.co.uk/2024/09/04/Modern_Slavery_Statement_2024_.pdf",
- "uk : footer : modern slavery act statement",
- ),
- taxStrategy("uk"),
+ allTopics(UK),
+ allWriters(UK),
+ newsletters(UK),
digitalNewspaperArchive,
- facebook("uk"),
- youtube("uk"),
- instagram("uk"),
- linkedin("uk"),
- newsletters("uk"),
- )
+ ) ++ socialLinks(UK)
val usListTwo = List(
- allTopics("us"),
- allWriters("us"),
+ allTopics(US),
+ allWriters(US),
+ newsletters(US),
digitalNewspaperArchive,
- taxStrategy("us"),
- facebook("us"),
- youtube("us"),
- instagram("us"),
- linkedin("us"),
- newsletters("us"),
- )
+ ) ++ socialLinks(US)
val auListTwo = List(
- allTopics("au"),
- allWriters("au"),
- FooterLink("Events", "/guardian-masterclasses/guardian-masterclasses-australia", "au : footer : masterclasses"),
+ allTopics(AU),
+ allWriters(AU),
+ newsletters(AU),
digitalNewspaperArchive,
- taxStrategy("au"),
- facebook("au"),
- youtube("au"),
- instagram("au"),
- linkedin("au"),
- newsletters("au"),
- )
+ ) ++ socialLinks(AU)
- val intListTwo = List(
- allTopics("international"),
- allWriters("international"),
- digitalNewspaperArchive,
- taxStrategy("international"),
- facebook("international"),
- youtube("international"),
- instagram("international"),
- linkedin("international"),
- newsletters("international"),
- )
+ def genericListTwo(edition: String): List[FooterLink] = {
+ List(
+ allTopics(edition),
+ allWriters(edition),
+ newsletters(edition),
+ digitalNewspaperArchive,
+ ) ++ socialLinks(edition)
+ }
- // Footer column three
+ /* Column three */
val ukListThree = List(
- FooterLink("Advertise with us", "https://advertising.theguardian.com", "uk : footer : advertise with us"),
- FooterLink("Guardian Labs", "/guardian-labs", "uk : footer : guardian labs"),
- FooterLink("Search jobs", "https://jobs.theguardian.com", "uk : footer : jobs"),
- FooterLink("Patrons", "https://patrons.theguardian.com?INTCMP=footer_patrons", "uk : footer : patrons"),
+ FooterLink("Advertise with us", "https://advertising.theguardian.com", s"$UK : footer : advertise with us"),
+ FooterLink("Guardian Labs", "/guardian-labs", s"$UK : footer : guardian labs"),
+ searchJobs(UK),
+ FooterLink("Patrons", "https://patrons.theguardian.com?INTCMP=footer_patrons", s"$UK : footer : patrons"),
+ workForUs(UK),
+ accessibilitySettings,
)
val usListThree = List(
FooterLink(
"Advertise with us",
"https://usadvertising.theguardian.com",
- "us : footer : advertise with us",
+ s"$US : footer : advertise with us",
),
- FooterLink("Guardian Labs", "/guardian-labs-us", "us : footer : guardian labs"),
- FooterLink("Search jobs", "https://jobs.theguardian.com", "us : footer : jobs"),
+ FooterLink("Guardian Labs", "/guardian-labs-us", s"$US : footer : guardian labs"),
+ searchJobs(US),
+ workForUs(US),
+ accessibilitySettings,
)
val auListThree = List(
- FooterLink("Guardian Labs", "/guardian-labs-australia", "au : footer : guardian labs"),
FooterLink(
"Advertise with us",
"https://ausadvertising.theguardian.com/",
- "au : footer : advertise with us",
+ s"$AU : footer : advertise with us",
),
- cookiePolicy,
+ FooterLink("Guardian Labs", "/guardian-labs-australia", s"$AU : footer : guardian labs"),
+ workForUs(AU),
+ accessibilitySettings,
)
- val intListThree = List(
- FooterLink(
- "Advertise with us",
- "https://advertising.theguardian.com",
- "international : footer : advertise with us",
- ),
- FooterLink(
- "Search UK jobs",
- "https://jobs.theguardian.com",
- "international : footer : uk-jobs",
- ),
- )
+ def genericListThree(edition: String): List[FooterLink] = {
+ List(
+ FooterLink(
+ "Advertise with us",
+ "https://advertising.theguardian.com",
+ s"$edition : footer : advertise with us",
+ ),
+ FooterLink("Search UK jobs", "https://jobs.theguardian.com", s"$edition : footer : jobs"),
+ FooterLink("Tips", "https://www.theguardian.com/tips", s"$edition : footer : tips"),
+ accessibilitySettings,
+ workForUs(edition),
+ )
+ }
def getFooterByEdition(edition: Edition): Seq[Seq[FooterLink]] =
edition match {
case editions.Uk => Seq(ukListOne, ukListTwo, ukListThree)
case editions.Us => Seq(usListOne, usListTwo, usListThree)
case editions.Au => Seq(auListOne, auListTwo, auListThree)
- case editions.International => Seq(intListOne, intListTwo, intListThree)
- case _ => Seq(intListOne, intListTwo, intListThree)
+ case editions.International => Seq(genericListOne(INT), genericListTwo(INT), genericListThree(INT))
+ case editions.Europe => Seq(genericListOne(EUR), genericListTwo(EUR), genericListThree(EUR))
}
-
}
diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala
index 88308651749b..5532591ddced 100644
--- a/common/app/navigation/NavLinks.scala
+++ b/common/app/navigation/NavLinks.scala
@@ -17,9 +17,9 @@ object NavLinks {
val auPolitics = NavLink("AU politics", "/australia-news/australian-politics", longTitle = Some("Politics"))
val auImmigration = NavLink("Immigration", "/australia-news/australian-immigration-and-asylum")
val indigenousAustralia = NavLink("Indigenous Australia", "/australia-news/indigenous-australians")
- val indigenousAustraliaOpinion = NavLink("Indigenous", "/commentisfree/series/indigenousx")
- val usNews = NavLink("US", "/us-news", longTitle = Some("US news"))
+ val usNews = NavLink("US news", "/us-news", longTitle = Some("US news"))
val usPolitics = NavLink("US politics", "/us-news/us-politics")
+ val usImmigration = NavLink("US immigration", "/us-news/usimmigration")
val education = {
val teachers = NavLink("Teachers", "/teacher-network")
@@ -176,6 +176,7 @@ object NavLinks {
val fashion = NavLink("Fashion", "/fashion")
val fashionAu = NavLink("Fashion", "/au/lifeandstyle/fashion")
val theFilterUk = NavLink("The Filter", "/uk/thefilter")
+ val theFilterUs = NavLink("The Filter", "/thefilter-us")
val food = NavLink("Food", "/food")
val foodAu = NavLink("Food", "/au/food")
val relationshipsAu = NavLink("Relationships", "/au/lifeandstyle/relationships")
@@ -211,16 +212,6 @@ object NavLinks {
),
)
val insideTheGuardian = NavLink("Inside the Guardian", "https://www.theguardian.com/insidetheguardian")
- val observer = NavLink(
- "The Observer",
- "/observer",
- children = List(
- NavLink("Comment", "/theobserver/news/comment"),
- NavLink("The New Review", "/theobserver/new-review"),
- NavLink("Observer Magazine", "/theobserver/magazine"),
- NavLink("Observer Food Monthly", "/theobserver/foodmonthly"),
- ),
- )
val weekly = NavLink("Guardian Weekly", "https://www.theguardian.com/weekly")
val digitalNewspaperArchive = NavLink("Digital Archive", "https://theguardian.newspapers.com")
val crosswords = NavLink(
@@ -229,13 +220,12 @@ object NavLinks {
children = List(
NavLink("Blog", "/crosswords/crossword-blog"),
NavLink("Quick", "/crosswords/series/quick"),
- NavLink("Speedy", "/crosswords/series/speedy"),
+ NavLink("Sunday quick", "/crosswords/series/sunday-quick"),
+ NavLink("Mini", "/crosswords/series/mini-crossword"),
NavLink("Quick cryptic", "/crosswords/series/quick-cryptic"),
- NavLink("Everyman", "/crosswords/series/everyman"),
NavLink("Quiptic", "/crosswords/series/quiptic"),
NavLink("Cryptic", "/crosswords/series/cryptic"),
NavLink("Prize", "/crosswords/series/prize"),
- NavLink("Azed", "/crosswords/series/azed"),
NavLink("Genius", "/crosswords/series/genius"),
NavLink("Weekend", "/crosswords/series/weekend-crossword"),
NavLink("Special", "/crosswords/series/special"),
@@ -254,22 +244,26 @@ object NavLinks {
val jobs = NavLink("Search jobs", "https://jobs.theguardian.com")
val apps =
NavLink("The Guardian app", "https://app.adjust.com/16xt6hai")
- val auWeekend = NavLink(
- "Australia Weekend",
- "/info/ng-interactive/2021/mar/17/make-sense-of-the-week-with-australia-weekend?INTCMP=header_au_weekend",
- )
val printShop = NavLink("Guardian Print Shop", "/artanddesign/series/gnm-print-sales")
- val auEvents = NavLink("Events", "/guardian-live-australia")
val holidays = NavLink("Holidays", "https://holidays.theguardian.com")
val ukPatrons = NavLink("Patrons", "https://patrons.theguardian.com/?INTCMP=header_patrons")
- val guardianLive =
+ val guardianLiveUK =
NavLink("Live events", "https://www.theguardian.com/guardian-live-events?INTCMP=live_uk_header_dropdown")
+ val guardianLiveAU =
+ NavLink("Live events", "https://www.theguardian.com/guardian-live-events?INTCMP=live_au_header_dropdown")
+ val guardianLiveUS =
+ NavLink("Live events", "https://www.theguardian.com/guardian-live-events?INTCMP=live_us_header_dropdown")
+ val guardianLiveEUR =
+ NavLink("Live events", "https://www.theguardian.com/guardian-live-events?INTCMP=live_eur_header_dropdown")
+ val guardianLiveINT =
+ NavLink("Live events", "https://www.theguardian.com/guardian-live-events?INTCMP=live_int_header_dropdown")
val guardianLicensing = NavLink("Guardian Licensing", s"https://licensing.theguardian.com/")
val jobsRecruiter = NavLink(
"Hire with Guardian Jobs",
"https://recruiters.theguardian.com/?utm_source=gdnwb&utm_medium=navbar&utm_campaign=Guardian_Navbar_Recruiters&CMP_TU=trdmkt&CMP_BUNIT=jobs",
)
val aboutUs = NavLink("About Us", "/about")
+ val tips = NavLink("Tips", "https://www.theguardian.com/tips")
// News Pillar
val ukNewsPillar = NavLink(
@@ -321,6 +315,7 @@ object NavLinks {
climateCrisis,
middleEast,
ukraine,
+ usImmigration,
usSoccer,
usBusiness,
usEnvironment,
@@ -381,7 +376,6 @@ object NavLinks {
children = List(
auColumnists,
cartoons,
- indigenousAustraliaOpinion,
theGuardianView.copy(title = "Editorials"),
letters,
),
@@ -588,6 +582,7 @@ object NavLinks {
)
val usLifestylePillar = ukLifestylePillar.copy(
children = List(
+ theFilterUs,
usWellness,
fashion,
food,
@@ -639,11 +634,11 @@ object NavLinks {
newsletters,
todaysPaper,
insideTheGuardian,
- observer,
weekly.copy(url = s"${weekly.url}?INTCMP=gdnwb_mawns_editorial_gweekly_GW_TopNav_UK"),
crosswords,
wordiply,
corrections,
+ tips,
)
val auOtherLinks = List(
apps,
@@ -656,6 +651,7 @@ object NavLinks {
crosswords,
wordiply,
corrections,
+ tips,
)
val usOtherLinks = List(
apps,
@@ -667,6 +663,7 @@ object NavLinks {
crosswords,
wordiply,
corrections,
+ tips,
)
val intOtherLinks = List(
apps,
@@ -676,11 +673,11 @@ object NavLinks {
newsletters,
todaysPaper,
insideTheGuardian,
- observer,
weekly.copy(url = s"${weekly.url}?INTCMP=gdnwb_mawns_editorial_gweekly_GW_TopNav_Int"),
crosswords,
wordiply,
corrections,
+ tips,
)
val eurOtherLinks = List(
apps,
@@ -690,18 +687,18 @@ object NavLinks {
newsletters,
todaysPaper,
insideTheGuardian,
- observer,
weekly.copy(url = s"${weekly.url}?INTCMP=gdnwb_mawns_editorial_gweekly_GW_TopNav_Int"),
crosswords,
wordiply,
corrections,
+ tips,
)
val ukBrandExtensions = List(
jobs,
jobsRecruiter,
holidays.copy(url = holidays.url + "?INTCMP=holidays_uk_web_newheader"),
- guardianLive,
+ guardianLiveUK,
aboutUs,
digitalNewspaperArchive,
printShop,
@@ -709,16 +706,16 @@ object NavLinks {
guardianLicensing,
)
val auBrandExtensions = List(
- auEvents,
digitalNewspaperArchive,
- auWeekend,
guardianLicensing,
+ guardianLiveAU,
aboutUs,
)
val usBrandExtensions = List(
jobs,
digitalNewspaperArchive,
guardianLicensing,
+ guardianLiveUS,
aboutUs,
)
val intBrandExtensions = List(
@@ -726,6 +723,7 @@ object NavLinks {
holidays.copy(url = holidays.url + "?INTCMP=holidays_int_web_newheader"),
digitalNewspaperArchive,
guardianLicensing,
+ guardianLiveINT,
aboutUs,
)
val eurBrandExtensions = List(
@@ -733,6 +731,7 @@ object NavLinks {
holidays.copy(url = holidays.url + "?INTCMP=holidays_int_web_newheader"),
digitalNewspaperArchive,
guardianLicensing,
+ guardianLiveEUR,
aboutUs,
)
@@ -829,10 +828,8 @@ object NavLinks {
"crosswords/series/weekend-crossword",
"crosswords/series/quiptic",
"crosswords/series/genius",
- "crosswords/series/speedy",
- "crosswords/series/everyman",
+ "crosswords/series/sunday-quick",
"crosswords/series/special",
- "crosswords/series/azed",
"fashion/beauty",
"technology/motoring",
// these last two are here to ensure that content in education and CiF always appear as such in the navigation
diff --git a/common/app/renderers/DotcomRenderingService.scala b/common/app/renderers/DotcomRenderingService.scala
index c88ec4a497ae..882aa8a59325 100644
--- a/common/app/renderers/DotcomRenderingService.scala
+++ b/common/app/renderers/DotcomRenderingService.scala
@@ -11,6 +11,7 @@ import http.{HttpPreconnections, ResultWithPreconnectPreload}
import model.Cached.{RevalidatableResult, WithoutRevalidationResult}
import model.dotcomrendering._
import model.dotcomrendering.pageElements.EditionsCrosswordRenderingDataModel
+import model.meta.BlocksOn
import model.{
CacheTime,
Cached,
@@ -30,7 +31,7 @@ import play.api.libs.ws.{WSClient, WSResponse}
import play.api.mvc.Results.{InternalServerError, NotFound}
import play.api.mvc.{RequestHeader, Result}
import play.twirl.api.Html
-import services.newsletters.model.{NewsletterResponseV2, NewsletterLayout}
+import services.newsletters.model.{NewsletterLayout, NewsletterResponseV2}
import services.{IndexPage, NewsletterData}
import java.lang.System.currentTimeMillis
@@ -55,6 +56,14 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
resetTimeout = Configuration.rendering.timeout * 4,
)
+ private[this] val circuitBreakerLongTimeout = CircuitBreakerRegistry.withConfig(
+ name = "dotcom-rendering-client-long-timeout",
+ system = PekkoActorSystem("dotcom-rendering-client-circuit-breaker-long-timeout"),
+ maxFailures = Configuration.rendering.circuitBreakerMaxFailures,
+ callTimeout = (Configuration.rendering.timeout * 2).plus(200.millis),
+ resetTimeout = Configuration.rendering.timeout * 4,
+ )
+
private[this] def postWithoutHandler(
ws: WSClient,
payload: JsValue,
@@ -139,7 +148,8 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
}
if (CircuitBreakerDcrSwitch.isSwitchedOn) {
- circuitBreaker
+ val breaker = if (timeout > Configuration.rendering.timeout) circuitBreakerLongTimeout else circuitBreaker
+ breaker
.withCircuitBreaker(postWithoutHandler(ws, payload, endpoint, requestId, timeout))
.map(handler)
} else {
@@ -149,18 +159,34 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
def getAMPArticle(
ws: WSClient,
- page: PageWithStoryPackage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[PageWithStoryPackage],
pageType: PageType,
newsletter: Option[NewsletterData],
filterKeyEvents: Boolean = false,
)(implicit request: RequestHeader): Future[Result] =
- baseArticleRequest("/AMPArticle", ws, page, blocks, pageType, filterKeyEvents, false, newsletter)
+ baseArticleRequest("/AMPArticle", ws, pageBlocks, pageType, filterKeyEvents, false, newsletter)
+
+ def getDCARAssets(ws: WSClient, path: String)(implicit request: RequestHeader): Future[Result] = {
+ ws
+ .url(Configuration.rendering.articleBaseURL + path)
+ .withRequestTimeout(Configuration.rendering.timeout)
+ .get()
+ .map { response =>
+ response.status match {
+ case 200 =>
+ Cached(CacheTime.Default)(RevalidatableResult.Ok(Html(response.body)))
+ case _ =>
+ log.error(
+ s"Request to DCR assets failed: status ${response.status}, path: ${request.path}",
+ )
+ NoCache(InternalServerError("Remote renderer error (500)"))
+ }
+ }
+ }
def getAppsArticle(
ws: WSClient,
- page: PageWithStoryPackage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[PageWithStoryPackage],
pageType: PageType,
newsletter: Option[NewsletterData],
filterKeyEvents: Boolean = false,
@@ -169,8 +195,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
baseArticleRequest(
"/AppsArticle",
ws,
- page,
- blocks,
+ pageBlocks,
pageType,
filterKeyEvents,
forceLive,
@@ -179,8 +204,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
def getArticle(
ws: WSClient,
- page: PageWithStoryPackage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[PageWithStoryPackage],
pageType: PageType,
newsletter: Option[NewsletterData],
filterKeyEvents: Boolean = false,
@@ -189,8 +213,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
baseArticleRequest(
"/Article",
ws,
- page,
- blocks,
+ pageBlocks,
pageType,
filterKeyEvents,
forceLive,
@@ -200,29 +223,27 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
private def baseArticleRequest(
path: String,
ws: WSClient,
- page: PageWithStoryPackage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[PageWithStoryPackage],
pageType: PageType,
filterKeyEvents: Boolean,
forceLive: Boolean = false,
newsletter: Option[NewsletterData],
)(implicit request: RequestHeader): Future[Result] = {
- val dataModel = page match {
+ val dataModel = pageBlocks.page match {
case liveblog: LiveBlogPage =>
DotcomRenderingDataModel.forLiveblog(
- liveblog,
- blocks,
+ pageBlocks.copy(page = liveblog),
request,
pageType,
filterKeyEvents,
forceLive,
newsletter,
)
- case _ => DotcomRenderingDataModel.forArticle(page, blocks, request, pageType, newsletter)
+ case _ => DotcomRenderingDataModel.forArticle(pageBlocks, request, pageType, newsletter)
}
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + path, page.metadata.cacheTime)
+ post(ws, json, Configuration.rendering.articleBaseURL + path, pageBlocks.page.metadata.cacheTime)
}
def getBlocks(
@@ -269,20 +290,11 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
})
}
- private def getTimeout: Duration = {
- if (Configuration.environment.stage == "DEV")
- Configuration.rendering.timeout * 5
- else
- Configuration.rendering.timeout
- }
-
def getFront(
ws: WSClient,
page: PressedPage,
pageType: PageType,
mostViewed: Seq[RelatedContentItem],
- mostCommented: Option[Content],
- mostShared: Option[Content],
deeplyRead: Option[Seq[Trail]],
)(implicit request: RequestHeader): Future[Result] = {
val dataModel = DotcomFrontsRenderingDataModel(
@@ -290,13 +302,15 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
request,
pageType,
mostViewed,
- mostCommented,
- mostShared,
deeplyRead,
)
val json = DotcomFrontsRenderingDataModel.toJson(dataModel)
- val timeout = getTimeout
+ val timeout =
+ if (Configuration.environment.stage == "DEV")
+ Configuration.rendering.timeout * 5
+ else
+ Configuration.rendering.timeout * 2
post(ws, json, Configuration.rendering.faciaBaseURL + "/Front", CacheTime.Facia, timeout)
}
@@ -317,46 +331,53 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
def getInteractive(
ws: WSClient,
- page: InteractivePage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[InteractivePage],
pageType: PageType,
)(implicit request: RequestHeader): Future[Result] = {
- val dataModel = DotcomRenderingDataModel.forInteractive(page, blocks, request, pageType)
+ val dataModel = DotcomRenderingDataModel.forInteractive(pageBlocks, request, pageType)
val json = DotcomRenderingDataModel.toJson(dataModel)
// Nb. interactives have a longer timeout because some of them are very
- // large unfortunately. E.g.
+ // large, unfortunately. E.g.
// https://www.theguardian.com/education/ng-interactive/2018/may/29/university-guide-2019-league-table-for-computer-science-information.
- post(ws, json, Configuration.rendering.interactiveBaseURL + "/Interactive", page.metadata.cacheTime, 4.seconds)
+ post(
+ ws,
+ json,
+ Configuration.rendering.interactiveBaseURL + "/Interactive",
+ pageBlocks.page.metadata.cacheTime,
+ 4.seconds,
+ )
}
def getAMPInteractive(
ws: WSClient,
- page: InteractivePage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[InteractivePage],
pageType: PageType,
)(implicit request: RequestHeader): Future[Result] = {
-
- val dataModel = DotcomRenderingDataModel.forInteractive(page, blocks, request, pageType)
+ val dataModel = DotcomRenderingDataModel.forInteractive(pageBlocks, request, pageType)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.interactiveBaseURL + "/AMPInteractive", page.metadata.cacheTime)
+ post(ws, json, Configuration.rendering.interactiveBaseURL + "/AMPInteractive", pageBlocks.page.metadata.cacheTime)
}
def getAppsInteractive(
ws: WSClient,
- page: InteractivePage,
- blocks: Blocks,
+ pageBlocks: BlocksOn[InteractivePage],
pageType: PageType,
)(implicit request: RequestHeader): Future[Result] = {
-
- val dataModel = DotcomRenderingDataModel.forInteractive(page, blocks, request, pageType)
+ val dataModel = DotcomRenderingDataModel.forInteractive(pageBlocks, request, pageType)
val json = DotcomRenderingDataModel.toJson(dataModel)
// Nb. interactives have a longer timeout because some of them are very
// large unfortunately. E.g.
// https://www.theguardian.com/education/ng-interactive/2018/may/29/university-guide-2019-league-table-for-computer-science-information.
- post(ws, json, Configuration.rendering.interactiveBaseURL + "/AppsInteractive", page.metadata.cacheTime, 4.seconds)
+ post(
+ ws,
+ json,
+ Configuration.rendering.interactiveBaseURL + "/AppsInteractive",
+ pageBlocks.page.metadata.cacheTime,
+ 4.seconds,
+ )
}
def getEmailNewsletters(
@@ -379,7 +400,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
)(implicit request: RequestHeader): Future[Result] = {
val dataModel = DotcomRenderingDataModel.forImageContent(imageContent, request, pageType, mainBlock)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + "/Article", CacheTime.Facia)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/Article", imageContent.metadata.cacheTime)
}
def getAppsImageContent(
@@ -390,7 +411,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
)(implicit request: RequestHeader): Future[Result] = {
val dataModel = DotcomRenderingDataModel.forImageContent(imageContent, request, pageType, mainBlock)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + "/AppsArticle", CacheTime.Facia)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/AppsArticle", imageContent.metadata.cacheTime)
}
def getMedia(
@@ -402,7 +423,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
val dataModel = DotcomRenderingDataModel.forMedia(mediaPage, request, pageType, blocks)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + "/Article", CacheTime.Facia)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/Article", mediaPage.metadata.cacheTime)
}
def getAppsMedia(
@@ -414,7 +435,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
val dataModel = DotcomRenderingDataModel.forMedia(mediaPage, request, pageType, blocks)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + "/AppsArticle", CacheTime.Facia)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/AppsArticle", mediaPage.metadata.cacheTime)
}
def getGallery(
@@ -426,7 +447,19 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
val dataModel = DotcomRenderingDataModel.forGallery(gallery, request, pageType, blocks)
val json = DotcomRenderingDataModel.toJson(dataModel)
- post(ws, json, Configuration.rendering.articleBaseURL + "/Article", CacheTime.Facia)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/Article", gallery.metadata.cacheTime)
+ }
+
+ def getAppsGallery(
+ ws: WSClient,
+ gallery: GalleryPage,
+ pageType: PageType,
+ blocks: Blocks,
+ )(implicit request: RequestHeader): Future[Result] = {
+ val dataModel = DotcomRenderingDataModel.forGallery(gallery, request, pageType, blocks)
+
+ val json = DotcomRenderingDataModel.toJson(dataModel)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/AppsArticle", gallery.metadata.cacheTime)
}
def getCrossword(
@@ -451,7 +484,28 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
ws: WSClient,
json: JsValue,
)(implicit request: RequestHeader): Future[Result] = {
- post(ws, json, Configuration.rendering.articleBaseURL + "/FootballDataPage", CacheTime.Football)
+ post(ws, json, Configuration.rendering.articleBaseURL + "/FootballMatchListPage", CacheTime.Football)
+ }
+
+ def getFootballMatchSummaryPage(
+ ws: WSClient,
+ json: JsValue,
+ )(implicit request: RequestHeader): Future[Result] = {
+ post(ws, json, Configuration.rendering.articleBaseURL + "/FootballMatchSummaryPage", CacheTime.FootballMatch)
+ }
+
+ def getCricketPage(
+ ws: WSClient,
+ json: JsValue,
+ )(implicit request: RequestHeader): Future[Result] = {
+ post(ws, json, Configuration.rendering.articleBaseURL + "/CricketMatchPage", CacheTime.Cricket)
+ }
+
+ def getFootballTablesPage(
+ ws: WSClient,
+ json: JsValue,
+ )(implicit request: RequestHeader): Future[Result] = {
+ post(ws, json, Configuration.rendering.articleBaseURL + "/FootballTablesPage", CacheTime.FootballTables)
}
}
diff --git a/common/app/services/FaciaContentConvert.scala b/common/app/services/FaciaContentConvert.scala
index 3f97b493c7dd..88b9676e7c83 100644
--- a/common/app/services/FaciaContentConvert.scala
+++ b/common/app/services/FaciaContentConvert.scala
@@ -39,6 +39,8 @@ object FaciaContentConvert {
editionBranding.edition.id -> editionBranding.branding
}
.toMap,
+ atomId = None,
+ mediaAtom = None,
)
PressedContent.make(curated, false)
diff --git a/common/app/services/IndexPage.scala b/common/app/services/IndexPage.scala
index 0325eb8c37d5..d0c2eccc7c38 100644
--- a/common/app/services/IndexPage.scala
+++ b/common/app/services/IndexPage.scala
@@ -68,7 +68,7 @@ object IndexPage {
accumulation: Vector[((ContainerDisplayConfig, CollectionEssentials), Container)] = Vector.empty,
): Seq[((ContainerDisplayConfig, CollectionEssentials), Container)] = {
groupings.toList match {
- case Nil => accumulation
+ case Nil => accumulation
case grouping :: remainingGroupings =>
val collection = CollectionEssentials.fromFaciaContent(
grouping.items.flatMap { item =>
diff --git a/common/app/services/NewsletterService.scala b/common/app/services/NewsletterService.scala
index 56b605048224..f9853cffaa54 100644
--- a/common/app/services/NewsletterService.scala
+++ b/common/app/services/NewsletterService.scala
@@ -54,7 +54,7 @@ class NewsletterService(newsletterSignupAgent: NewsletterSignupAgent) {
private def getNewsletterResponseFromSignUpPage(articleId: String): Option[NewsletterResponseV2] = {
newsletterSignupAgent.getV2Newsletters() match {
- case Left(_) => None
+ case Left(_) => None
case Right(list) =>
list
.filter(shouldInclude)
diff --git a/common/app/services/Notification.scala b/common/app/services/Notification.scala
index f2c632fc04b8..c69a12f279ee 100644
--- a/common/app/services/Notification.scala
+++ b/common/app/services/Notification.scala
@@ -1,63 +1,54 @@
package services
-import com.amazonaws.services.sns.{AmazonSNSAsync, AmazonSNSAsyncClient}
-import com.amazonaws.services.sns.model.PublishRequest
-import common.{PekkoAsync, GuLogging}
+import common.{GuLogging, PekkoAsync}
import conf.Configuration
-import awswrappers.sns._
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.sns.SnsAsyncClient
+import software.amazon.awssdk.services.sns.model.PublishRequest
+import utils.AWSv2
import scala.concurrent.ExecutionContext
import scala.util.{Failure, Success}
+import scala.jdk.FutureConverters._
trait Notification extends GuLogging {
val topic: String
- lazy val sns: Option[AmazonSNSAsync] = Configuration.aws.credentials.map { credentials =>
- AmazonSNSAsyncClient
- .asyncBuilder()
- .withCredentials(credentials)
- .withRegion(conf.Configuration.aws.region)
+ lazy val sns: SnsAsyncClient =
+ SnsAsyncClient
+ .builder()
+ .credentialsProvider(AWSv2.credentials)
+ .region(Region.of(conf.Configuration.aws.region))
.build()
- }
-
- def send(
- pekkoAsync: PekkoAsync,
- )(subject: String, message: String)(implicit executionContext: ExecutionContext): Unit = {
- val request = new PublishRequest()
- .withTopicArn(topic)
- .withSubject(subject)
- .withMessage(message)
-
- sendAsync(pekkoAsync)(request)
- }
def sendWithoutSubject(pekkoAsync: PekkoAsync)(message: String)(implicit executionContext: ExecutionContext): Unit = {
- val request = new PublishRequest()
- .withTopicArn(topic)
- .withMessage(message)
+ val request = PublishRequest
+ .builder()
+ .topicArn(topic)
+ .message(message)
+ .build()
- sendAsync(pekkoAsync)(request)
+ publishTopic(pekkoAsync)(request)
}
- private def sendAsync(
+ private def publishTopic(
pekkoAsync: PekkoAsync,
- )(request: PublishRequest)(implicit executionContext: ExecutionContext): Unit =
+ )(request: PublishRequest)(implicit executionContext: ExecutionContext): Unit = {
pekkoAsync.after1s {
- sns match {
- case Some(client) =>
- log.info(s"Issuing SNS notification: ${request.getSubject}:${request.getMessage}")
- client.publishFuture(request) onComplete {
- case Success(_) =>
- log.info(s"Successfully published SNS notification: ${request.getSubject}:${request.getMessage}")
+ log.info(s"Issuing SNS notification: ${request.subject()}:${request.message()}")
- case Failure(error) =>
- log.error(s"Failed to publish SNS notification: ${request.getSubject}:${request.getMessage}", error)
- }
- case None =>
- log.error(s"There is NO SNS client available to publish ${request.getSubject}:${request.getMessage}")
- }
+ sns
+ .publish(request)
+ .asScala
+ .onComplete {
+ case Success(_) =>
+ log.info(s"Successfully published SNS notification: ${request.subject()}:${request.message()}")
+ case Failure(error) =>
+ log.error(s"Failed to publish SNS notification: ${request.subject}:${request.message}", error)
+ }
}
+ }
}
object FrontPressNotification extends Notification {
diff --git a/common/app/services/OphanApi.scala b/common/app/services/OphanApi.scala
index 5e860d21182b..89459e8af6e9 100644
--- a/common/app/services/OphanApi.scala
+++ b/common/app/services/OphanApi.scala
@@ -76,12 +76,6 @@ class OphanApi(wsClient: WSClient)(implicit executionContext: ExecutionContext)
def getBreakdown(path: String): Future[JsValue] = getBreakdown(Map("path" -> s"/$path"))
- def getMostReadFacebook(hours: Int): Future[Seq[OphanMostReadItem]] =
- getMostRead("Facebook", hours)
-
- def getMostReadTwitter(hours: Int): Future[Seq[OphanMostReadItem]] =
- getMostRead("Twitter", hours)
-
def getMostRead(referrer: String, hours: Int): Future[Seq[OphanMostReadItem]] =
getMostRead(Map("referrer" -> referrer, "hours" -> hours.toString))
@@ -94,9 +88,6 @@ class OphanApi(wsClient: WSClient)(implicit executionContext: ExecutionContext)
def getMostReadInSection(section: String, days: Int, count: Int): Future[Seq[OphanMostReadItem]] =
getMostRead(Map("days" -> days.toString, "count" -> count.toString, "section" -> section))
- def getMostReferredFromSocialMedia(days: Int): Future[Seq[OphanMostReadItem]] =
- getMostRead(Map("days" -> days.toString, "referrer" -> "social media"))
-
def getMostViewedGalleries(hours: Int, count: Int): Future[Seq[OphanMostReadItem]] =
getMostRead(Map("content-type" -> "gallery", "hours" -> hours.toString, "count" -> count.toString))
@@ -106,17 +97,6 @@ class OphanApi(wsClient: WSClient)(implicit executionContext: ExecutionContext)
def getDeeplyRead(edition: Edition): Future[Seq[OphanDeeplyReadItem]] =
getBody("deeplyread")(Map("country" -> countryFromEdition(edition))).map(_.as[Seq[OphanDeeplyReadItem]])
- def getAdsRenderTime(params: Map[String, Seq[String]]): Future[JsValue] = {
- val validatedParams = for {
- (key, values) <- params
- if Seq("platform", "hours", "ad-slot").contains(key)
- value <- values
- } yield {
- key -> value
- }
- getBody("ads/render-time")(validatedParams)
- }
-
def getSurgingContent(): Future[JsValue] = getBody("surging")()
def getMostViewedVideos(hours: Int, count: Int): Future[JsValue] = {
diff --git a/common/app/services/ParameterStore.scala b/common/app/services/ParameterStore.scala
index e163e5fb7429..ec80d3ac2fc0 100644
--- a/common/app/services/ParameterStore.scala
+++ b/common/app/services/ParameterStore.scala
@@ -1,54 +1,43 @@
package services
-import com.amazonaws.services.simplesystemsmanagement.model.{GetParameterRequest, GetParametersByPathRequest}
-import com.amazonaws.services.simplesystemsmanagement.{
- AWSSimpleSystemsManagement,
- AWSSimpleSystemsManagementClientBuilder,
-}
+import software.amazon.awssdk.services.ssm.SsmClient
+import software.amazon.awssdk.services.ssm.model.{GetParameterRequest, GetParametersByPathRequest}
+import software.amazon.awssdk.regions.Region
import common.GuardianConfiguration
import conf.Configuration
+import utils.AWSv2
import scala.annotation.tailrec
import scala.jdk.CollectionConverters._
class ParameterStore(region: String) {
- private lazy val client: AWSSimpleSystemsManagement = Configuration.aws.credentials
- .map { credentials =>
- AWSSimpleSystemsManagementClientBuilder
- .standard()
- .withCredentials(credentials)
- .withRegion(region)
- .build()
- }
- .getOrElse(throw new RuntimeException("Failed to initialize AWSSimpleSystemsManagement"))
+ private lazy val client: SsmClient =
+ SsmClient.builder().credentialsProvider(AWSv2.credentials).region(Region.of(region)).build()
def get(key: String): String = {
- val parameterRequest = new GetParameterRequest().withWithDecryption(true).withName(key)
- client.getParameter(parameterRequest).getParameter.getValue
+ val parameterRequest = GetParameterRequest.builder().withDecryption(true).name(key).build()
+ client.getParameter(parameterRequest).parameter().value()
}
def getPath(path: String, isRecursiveSearch: Boolean = false): Map[String, String] = {
@tailrec
def pagination(accum: Map[String, String], nextToken: Option[String]): Map[String, String] = {
-
- val parameterRequest = new GetParametersByPathRequest()
- .withWithDecryption(true)
- .withPath(path)
- .withRecursive(isRecursiveSearch)
-
- val parameterRequestWithNextToken = nextToken.map(parameterRequest.withNextToken).getOrElse(parameterRequest)
-
- val result = client.getParametersByPath(parameterRequestWithNextToken)
-
- val resultMap = result.getParameters.asScala.map { param =>
- param.getName -> GuardianConfiguration.unwrapQuotedString(param.getValue)
- }.toMap
-
- Option(result.getNextToken) match {
- case Some(next) => pagination(accum ++ resultMap, Some(next))
- case None => accum ++ resultMap
+ val baseBuilder =
+ GetParametersByPathRequest.builder().path(path).withDecryption(true).recursive(isRecursiveSearch)
+ val parameterRequest = nextToken.fold(baseBuilder)(baseBuilder.nextToken).build()
+ val response = client.getParametersByPath(parameterRequest)
+ val resultMap = response
+ .parameters()
+ .asScala
+ .map { param =>
+ param.name() -> GuardianConfiguration.unwrapQuotedString(param.value())
+ }
+ .toMap
+ Option(response.nextToken()) match {
+ case Some(next) if next.nonEmpty => pagination(accum ++ resultMap, Some(next))
+ case _ => accum ++ resultMap
}
}
diff --git a/common/app/services/S3.scala b/common/app/services/S3.scala
index c2d618c89fd7..23e3c6985930 100644
--- a/common/app/services/S3.scala
+++ b/common/app/services/S3.scala
@@ -1,17 +1,22 @@
package services
-import com.amazonaws.services.s3.model.CannedAccessControlList.{Private, PublicRead}
-import com.amazonaws.services.s3.model._
-import com.amazonaws.services.s3.{AmazonS3, AmazonS3Client}
-import com.amazonaws.util.StringInputStream
import com.gu.etagcaching.aws.s3.ObjectId
import common.GuLogging
import conf.Configuration
import model.PressedPageType
import org.joda.time.DateTime
import services.S3.logS3ExceptionWithDevHint
+import software.amazon.awssdk.core.sync.RequestBody
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL.{PRIVATE, PUBLIC_READ}
+import software.amazon.awssdk.services.s3.model._
+import software.amazon.awssdk.services.s3.presigner.S3Presigner
+import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
+import utils.AWSv2
import java.io._
+import java.nio.charset.StandardCharsets.UTF_8
+import java.time.Duration.ofMinutes
+import java.time.Instant
import java.util.zip.GZIPOutputStream
import scala.io.{Codec, Source}
@@ -19,125 +24,100 @@ trait S3 extends GuLogging {
lazy val bucket = Configuration.aws.frontendStoreBucket
- lazy val client: Option[AmazonS3] = Configuration.aws.credentials.map { credentials =>
- AmazonS3Client.builder
- .withCredentials(credentials)
- .withRegion(conf.Configuration.aws.region)
- .build()
- }
+ lazy private val client = AWSv2.S3Sync
- private def withS3Result[T](key: String)(action: S3Object => T): Option[T] =
- client.flatMap { client =>
- val objectId = ObjectId(bucket, key)
- try {
- val request = new GetObjectRequest(bucket, key)
- val result = client.getObject(request)
- log.info(s"S3 got ${result.getObjectMetadata.getContentLength} bytes from ${result.getKey}")
-
- // http://stackoverflow.com/questions/17782937/connectionpooltimeoutexception-when-iterating-objects-in-s3
- try {
- Some(action(result))
- } catch {
- case e: Exception =>
- throw e
- } finally {
- result.close()
- }
- } catch {
- case e: AmazonS3Exception if e.getStatusCode == 404 =>
- log.warn(s"not found at ${objectId.s3Uri}")
- None
- case e: AmazonS3Exception =>
- logS3ExceptionWithDevHint(objectId, e)
- None
- case e: Exception =>
- throw e
- }
+ def handleS3Errors[T](key: String)(thunk: => T): Option[T] = {
+ val objectId = ObjectId(bucket, key)
+ try {
+ Some(thunk)
+ } catch {
+ case e: NoSuchKeyException if e.statusCode == 404 =>
+ log.warn(s"not found at ${objectId.s3Uri}")
+ None
+ case e: software.amazon.awssdk.services.s3.model.S3Exception =>
+ logS3ExceptionWithDevHint(objectId, e)
+ None
+ case e: Exception =>
+ throw e
}
+ }
- def get(key: String)(implicit codec: Codec): Option[String] =
- withS3Result(key) { result =>
- Source.fromInputStream(result.getObjectContent).mkString
- }
+ def get(key: String)(implicit codec: Codec): Option[String] = handleS3Errors(key)(getResponseAndContent(key)._2)
- def getWithLastModified(key: String): Option[(String, DateTime)] =
- withS3Result(key) { result =>
- val content = Source.fromInputStream(result.getObjectContent).mkString
- val lastModified = new DateTime(result.getObjectMetadata.getLastModified)
- (content, lastModified)
- }
+ def getPresignedUrl(key: String): Option[String] = handleS3Errors(key) {
+ val presignRequest = GetObjectPresignRequest.builder
+ .signatureDuration(ofMinutes(10))
+ .getObjectRequest(GetObjectRequest.builder.bucket(bucket).key(key).build)
+ .build()
+
+ AWSv2.S3PresignerSync.presignGetObject(presignRequest).url.toExternalForm
+ }
- def getLastModified(key: String): Option[DateTime] =
- withS3Result(key) { result =>
- new DateTime(result.getObjectMetadata.getLastModified)
+ private def toDateTime(instant: Instant): DateTime = new DateTime(instant.toEpochMilli)
+
+ def getWithLastModified(key: String): Option[(String, DateTime)] = handleS3Errors(key) {
+ val (resp, content) = getResponseAndContent(key)
+ val lastModified = toDateTime(resp.lastModified())
+ (content, lastModified)
+ }
+
+ private def getResponseAndContent(key: String)(implicit codec: Codec): (GetObjectResponse, String) = {
+ val request = GetObjectRequest.builder().bucket(bucket).key(key).build()
+ val resp = client.getObject(request)
+ val objectResponse = resp.response()
+ log.info(s"S3 got ${objectResponse.contentLength} bytes from $key")
+ try {
+ val content = Source.fromInputStream(resp).mkString
+ (objectResponse, content)
+ } finally {
+ resp.close()
}
+ }
- def putPublic(key: String, value: String, contentType: String): Unit = {
- put(key: String, value: String, contentType: String, PublicRead)
+ def getLastModified(key: String): Option[DateTime] = handleS3Errors(key) {
+ val request = HeadObjectRequest.builder().bucket(bucket).key(key).build()
+ toDateTime(client.headObject(request).lastModified())
}
- def putPublic(key: String, file: File, contentType: String): Unit = {
- val request = new PutObjectRequest(bucket, key, file).withCannedAcl(PublicRead)
- client.foreach(_.putObject(request))
+ def putPublic(key: String, value: String, contentType: String): Unit = {
+ put(key: String, value: String, contentType: String, PUBLIC_READ)
}
def putPrivate(key: String, value: String, contentType: String): Unit = {
- put(key: String, value: String, contentType: String, Private)
+ put(key: String, value: String, contentType: String, PRIVATE)
}
def putPrivateGzipped(key: String, value: String, contentType: String): Unit = {
- putGzipped(key, value, contentType, Private)
- }
-
- private def putGzipped(
- key: String,
- value: String,
- contentType: String,
- accessControlList: CannedAccessControlList,
- ): Unit = {
- lazy val request = {
- val metadata = new ObjectMetadata()
-
- metadata.setCacheControl("no-cache,no-store")
- metadata.setContentType(contentType)
- metadata.setContentEncoding("gzip")
-
- val valueAsBytes = value.getBytes("UTF-8")
- val os = new ByteArrayOutputStream()
- val gzippedStream = new GZIPOutputStream(os)
- gzippedStream.write(valueAsBytes)
- gzippedStream.flush()
- gzippedStream.close()
-
- metadata.setContentLength(os.size())
-
- new PutObjectRequest(bucket, key, new ByteArrayInputStream(os.toByteArray), metadata)
- .withCannedAcl(accessControlList)
- }
+ val os = new ByteArrayOutputStream()
+ val gzippedStream = new GZIPOutputStream(os)
+ gzippedStream.write(value.getBytes(UTF_8))
+ gzippedStream.flush()
+ gzippedStream.close()
+
+ val request = PutObjectRequest
+ .builder()
+ .bucket(bucket)
+ .key(key)
+ .acl(PRIVATE)
+ .cacheControl("no-cache,no-store")
+ .contentType(contentType)
+ .contentEncoding("gzip")
+ .build()
- try {
- client.foreach(_.putObject(request))
- } catch {
- case e: Exception =>
- throw e
- }
+ client.putObject(request, RequestBody.fromBytes(os.toByteArray))
}
- private def put(key: String, value: String, contentType: String, accessControlList: CannedAccessControlList): Unit = {
- val metadata = new ObjectMetadata()
- metadata.setCacheControl("no-cache,no-store")
- metadata.setContentType(contentType)
- metadata.setContentLength(value.getBytes("UTF-8").length)
-
- val request =
- new PutObjectRequest(bucket, key, new StringInputStream(value), metadata).withCannedAcl(accessControlList)
+ private def put(key: String, value: String, contentType: String, accessControlList: ObjectCannedACL): Unit = {
+ val request = PutObjectRequest
+ .builder()
+ .bucket(bucket)
+ .key(key)
+ .acl(accessControlList)
+ .cacheControl("no-cache,no-store")
+ .contentType(contentType)
+ .build()
- try {
- client.foreach(_.putObject(request))
- } catch {
- case e: Exception =>
- throw e
- }
+ client.putObject(request, RequestBody.fromString(value, UTF_8))
}
}
@@ -169,7 +149,6 @@ object S3FrontsApi extends S3 {
object S3Archive extends S3 {
override lazy val bucket: String =
if (Configuration.environment.isNonProd) "aws-frontend-archive-code" else "aws-frontend-archive"
- def getHtml(path: String): Option[String] = get(path)
}
object S3ArchiveOriginals extends S3 {
diff --git a/common/app/services/TagIndexesS3.scala b/common/app/services/TagIndexesS3.scala
index f15c6b51ac14..06d31c6f289a 100644
--- a/common/app/services/TagIndexesS3.scala
+++ b/common/app/services/TagIndexesS3.scala
@@ -22,7 +22,7 @@ object TagIndexesS3 extends S3 {
s"${indexRoot(indexType)}/$pageName.json"
private def putJson[A: Writes](key: String, a: A) =
- putPublic(
+ putPrivate(
key,
Json.stringify(Json.toJson(a)),
"application/json",
diff --git a/common/app/services/newsletters/GoogleRecaptchaValidationApi.scala b/common/app/services/newsletters/GoogleRecaptchaValidationApi.scala
index c0258ed63909..fac936204eac 100644
--- a/common/app/services/newsletters/GoogleRecaptchaValidationApi.scala
+++ b/common/app/services/newsletters/GoogleRecaptchaValidationApi.scala
@@ -9,9 +9,14 @@ import utils.RemoteAddress
import scala.concurrent.Future
class GoogleRecaptchaValidationService(wsClient: WSClient) extends LazyLogging with RemoteAddress {
- def submit(token: String): Future[WSResponse] = {
+ def submit(token: String, shouldUseVisibleKey: Boolean = false): Future[WSResponse] = {
val url = "https://www.google.com/recaptcha/api/siteverify"
- val payload = Map("response" -> Seq(token), "secret" -> Seq(Configuration.google.googleRecaptchaSecret))
+ val secret = if (shouldUseVisibleKey) {
+ Configuration.google.googleRecaptchaSecretVisible
+ } else {
+ Configuration.google.googleRecaptchaSecret
+ }
+ val payload = Map("response" -> Seq(token), "secret" -> Seq(secret))
wsClient
.url(url)
.post(payload)
diff --git a/common/app/services/newsletters/NewsletterSignupAgent.scala b/common/app/services/newsletters/NewsletterSignupAgent.scala
index 4ca3240f9909..af36af653191 100644
--- a/common/app/services/newsletters/NewsletterSignupAgent.scala
+++ b/common/app/services/newsletters/NewsletterSignupAgent.scala
@@ -26,7 +26,7 @@ class NewsletterSignupAgent(newsletterApi: NewsletterApi) extends GuLogging {
def getNewsletterById(listId: Int): Either[String, Option[NewsletterResponse]] = {
newslettersAgent.get() match {
- case Left(err) => Left(err)
+ case Left(err) => Left(err)
case Right(newsletters) =>
Right(
newsletters.find(newsletter => newsletter.listId == listId || newsletter.listIdV1 == listId),
@@ -43,7 +43,7 @@ class NewsletterSignupAgent(newsletterApi: NewsletterApi) extends GuLogging {
def getV2NewsletterById(listId: Int): Either[String, Option[NewsletterResponseV2]] = {
newslettersV2Agent.get() match {
- case Left(err) => Left(err)
+ case Left(err) => Left(err)
case Right(newsletters) =>
Right(
newsletters.find(newsletter => newsletter.listId == listId),
diff --git a/common/app/services/repositories.scala b/common/app/services/repositories.scala
index 6a73603e413b..c9727bf31a6b 100644
--- a/common/app/services/repositories.scala
+++ b/common/app/services/repositories.scala
@@ -74,13 +74,21 @@ trait Index extends ConciergeRepository {
.map { response =>
val trails = response.results.map(IndexPageItem(_)).toList
trails match {
- case Nil => Left(NotFound)
+ case Nil => Left(NotFound)
case head :: _ =>
val tag1 = findTag(head.item, firstTag)
val tag2 = findTag(head.item, secondTag)
if (tag1.isDefined && tag2.isDefined) {
val page = TagCombiner(s"$leftSide+$rightSide", tag1.get, tag2.get, pagination(response))
- Right(IndexPage(page, contents = trails, tags = Tags(Nil), date = DateTime.now, tzOverride = None))
+ Right(
+ IndexPage(
+ page,
+ contents = trails,
+ tags = Tags(List(tag1.get, tag2.get)),
+ date = DateTime.now,
+ tzOverride = None,
+ ),
+ )
} else {
Left(NotFound)
}
diff --git a/common/app/templates/javaScriptConfig.scala.js b/common/app/templates/javaScriptConfig.scala.js
index 76a7859ffc3d..9f908cd3c9cc 100644
--- a/common/app/templates/javaScriptConfig.scala.js
+++ b/common/app/templates/javaScriptConfig.scala.js
@@ -16,6 +16,7 @@
s""""${CamelCase.fromHyphenated(switch.name)}":${switch.isSwitchedOn}"""}.mkString(","))}
},
"tests": { @JavaScript(experiments.ActiveExperiments.getJavascriptConfig) },
+ "serverSideABTests": { @JavaScript(ab.ABTests.getJavascriptConfig) },
"modules": {
"tracking": {
"ready": null
diff --git a/common/app/utils/AWSv2.scala b/common/app/utils/AWSv2.scala
index eb82f689c81d..fbeb520edf39 100644
--- a/common/app/utils/AWSv2.scala
+++ b/common/app/utils/AWSv2.scala
@@ -5,7 +5,8 @@ import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient
import software.amazon.awssdk.regions.Region
import software.amazon.awssdk.regions.Region.EU_WEST_1
-import software.amazon.awssdk.services.s3.{S3AsyncClient, S3AsyncClientBuilder}
+import software.amazon.awssdk.services.s3.presigner.S3Presigner
+import software.amazon.awssdk.services.s3.{S3AsyncClient, S3AsyncClientBuilder, S3Client, S3ClientBuilder}
import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider
import software.amazon.awssdk.services.sts.model.AssumeRoleRequest
import software.amazon.awssdk.services.sts.{StsClient, StsClientBuilder}
@@ -29,14 +30,25 @@ object AWSv2 {
val S3Async: S3AsyncClient = buildS3AsyncClient(credentials)
+ val S3Sync: S3Client = build[S3Client, S3ClientBuilder](S3Client.builder())
+
+ val S3PresignerSync: S3Presigner = S3Presigner.builder().credentialsProvider(credentials).region(region).build()
+
val STS: StsClient = build[StsClient, StsClientBuilder](StsClient.builder())
- def stsCredentials(devProfile: String, roleArn: String): AwsCredentialsProvider = credentialsForDevAndProd(
+ /** Assume a role (roleArn) with STS while allowing local dev to fall back to a profile. sessionName defaults to
+ * "frontend" but can be overridden per caller.
+ */
+ def stsCredentials(
+ devProfile: String,
+ roleArn: String,
+ sessionName: String = "frontend",
+ ): AwsCredentialsProvider = credentialsForDevAndProd(
devProfile,
StsAssumeRoleCredentialsProvider
.builder()
.stsClient(STS)
- .refreshRequest(AssumeRoleRequest.builder.roleSessionName("frontend").roleArn(roleArn).build)
+ .refreshRequest(AssumeRoleRequest.builder.roleSessionName(sessionName).roleArn(roleArn).build)
.build(),
)
diff --git a/common/app/views/fragments/collections/popularExtended.scala.html b/common/app/views/fragments/collections/popularExtended.scala.html
deleted file mode 100644
index 042b098aa5ea..000000000000
--- a/common/app/views/fragments/collections/popularExtended.scala.html
+++ /dev/null
@@ -1,88 +0,0 @@
-@(popular: Seq[model.MostPopular], mostCards: Map[String,Option[layout.ContentCard]] = Map.empty, containerDefinition: Option[layout.FaciaContainer] = None, isFront: Boolean = false)(implicit request: RequestHeader)
-
-@import common.Localisation
-@import layout.FaciaCardHeader
-@import views.html.fragments.items.elements.facia_cards.title
-@import views.html.fragments.items.facia_cards.simpleContentCard
-@import views.support._
-@import views.support.TrailCssClasses.toneClass
-@import views.support.MostPopular.{isAdFree, showMPU, tabsPaneCssClass}
-@import views.support.{GetClasses, RemoveOuterParaHtml}
-@import model.Pillar.RichPillar
-
-@defining(popular.size > 1){ isTabbed =>
-
- @if(isTabbed) {
-
-
- @popular.zipWithRowInfo.map{ case (section, info) =>
- -
-
- Most viewed @Html(Localisation(section.heading.stripPrefix("popular ").stripPrefix("Most viewed ")))
-
-
- }
-
-
- }
-
- @popular.zipWithRowInfo.map{ case (section, info) =>
-
-
-
- @section.trails.zipWithRowInfo.map{ case (trail, info) =>
- @defining(FaciaCardHeader.fromTrail(trail, None)) { header =>
- -
-
-
- @fragments.inlineSvg(s"number-${info.rowNum}", "numbers")
-
-
- @title(header, 2, 2, "headline-list__body", isAction = trail.isActionCard)
- @trail.properties.maybeContent.map { content =>
- @if(content.tags.tags.exists(_.id == "tone/news") || content.tags.tags.exists(_.id == "tone/comment")) {
- @fragments.contentAgeNotice(ContentOldAgeDescriber(content))
- }
- }
-
-
- @RemoveOuterParaHtml(header.headline)
-
- }
- }
-
-
- }
- @if(showMPU(containerDefinition) && isFront) {
-
-
- }
- @if(isTabbed) {
-
-
- }
-
-
- @mostCards.getOrElse("most_commented", None).map { mostCommented =>
-
- @simpleContentCard(mostCommented, 0, 0, "", false, false)
-
- }
-
- @mostCards.getOrElse("most_shared", None).map { mostShared =>
-
- @simpleContentCard(mostShared, 0, 0, "", false, false)
-
- }
-
-
-
-
-}
diff --git a/common/app/views/fragments/containers/facia_cards/container.scala.html b/common/app/views/fragments/containers/facia_cards/container.scala.html
index bcc828a10de5..8286229646c5 100644
--- a/common/app/views/fragments/containers/facia_cards/container.scala.html
+++ b/common/app/views/fragments/containers/facia_cards/container.scala.html
@@ -1,6 +1,6 @@
@import common.commercial.ContainerModel
@import layout.MetaDataHeader
-@import layout.slices.{Dynamic, Fixed, MostPopular, NavList, NavMediaList, Video, VerticalVideo}
+@import layout.slices.{Dynamic, Fixed, MostPopular, NavList, NavMediaList}
@import views.html.fragments.commercial.containers.paidContainer
@import views.html.fragments.audio.containers.flagshipContainer
@import views.html.fragments.containers.facia_cards._
@@ -83,12 +83,6 @@
}
- case Video => {
-
- @videoContainer(containerDefinition, frontProperties)
-
- }
-
case NavMediaList => {
@navMediaListContainer(containerDefinition, frontProperties)
diff --git a/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html b/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
index f1b4c6c6d28e..d22324dd9970 100644
--- a/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
+++ b/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
@@ -1,10 +1,7 @@
@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-@import conf.switches.Switches
@import common.LinkTo
@import model.MostPopular
-@import fragments.commercial.adSlot
-@import layout.ContentCard
@defining("Most viewed") { containerTitle =>
@@ -20,53 +17,20 @@
}
-
- @if(Switches.ExtendedMostPopularFronts.isSwitchedOn) {
-
-
- @defining(Seq(
- MostPopular(
- containerDefinition.displayName.getOrElse(containerTitle),
- containerTitle,
- containerDefinition.items.take(10)
- ),
- MostPopular(
- "Across the guardian",
- containerTitle,
- Nil
- )
- )) { popular =>
- @fragments.collections.popularExtended(popular)
- }
-
-
-
- @adSlot(
- "mostpop",
- Seq("container-inline"),
- Map(),
- optId = None,
- optClassNames = None
- ){ }
-
-
-
- } else {
-
- @defining(Seq(
- MostPopular(
- containerDefinition.displayName.getOrElse(containerTitle),
- containerTitle,
- containerDefinition.items.take(10)
- ),
- MostPopular(
- "Across the guardian",
- containerTitle,
- Nil
- )
- )) { popular =>
- @fragments.collections.popular(popular, Some(containerDefinition), isFront = true)
- }
-
+
+ @defining(Seq(
+ MostPopular(
+ containerDefinition.displayName.getOrElse(containerTitle),
+ containerTitle,
+ containerDefinition.items.take(10)
+ ),
+ MostPopular(
+ "Across the guardian",
+ containerTitle,
+ Nil
+ )
+ )) { popular =>
+ @fragments.collections.popular(popular, Some(containerDefinition), isFront = true)
}
+
}
diff --git a/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html b/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html
deleted file mode 100644
index a058c262ed5e..000000000000
--- a/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html
+++ /dev/null
@@ -1,118 +0,0 @@
-@import model.{InlineImage, VideoPlayer}
-@import views.html.fragments.media.video
-@import views.html.fragments.nav.treats
-@import views.html.fragments.atoms.youtube
-@import views.support.{RenderClasses, Video640, Video700}
-@import model.content.MediaAssetPlatform
-@import model.content.MediaWrapper.VideoContainer
-@import model.VideoFaciaProperties
-@import layout.FaciaCardHeader
-@import model.Pillar.RichPillar
-
-@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-
-
-
-
- @containerDefinition.displayName
-
-
-
-
-
-
-
-
- -
- @treats(containerDefinition, frontProperties)
-
-
- @containerDefinition.collectionEssentials.items.filter(i => i.header.isVideo).zipWithIndex.map { case (item, index) =>
- -
- @item.properties.maybeContent.map { content =>
- @defining(content.elements.mediaAtoms.find(_.assets.exists(_.platform == MediaAssetPlatform.Youtube))) { youTubeAtom =>
- @youTubeAtom.map { youTubeAtom =>
- @youtube(media = youTubeAtom,
- displayCaption = false,
- mediaWrapper = Some(VideoContainer),
- displayDuration = false,
- faciaHeaderProperties = Some(VideoFaciaProperties(header = FaciaCardHeader.fromTrail(item, None),
- showByline = item.properties.showByline, item.properties.byline)),
- isPaidFor = item.isPaidFor,
- pressedContent = Some(item),
- verticalVideo = true
- )
- }
- }
-
-
- @content.elements.mainVideo.map { mainVideo =>
- @defining(VideoPlayer(
- mainVideo,
- Video640,
- item,
- autoPlay = false,
- showControlsAtStart = false,
- path = Some(content.metadata.id)
- )) { player =>
-
-
- @video(player, enhance = false, showEndSlate = false, showOverlay = true, showPoster = false)
-
-
-
- @fragments.inlineSvg("play", "icon")
-
-
- @InlineImage.fromFaciaContent(item).map { fallbackImage =>
-
![]()
1) {data-}src="@Video700.bestSrcFor(fallbackImage.imageMedia)" class="js-video-playlist-image js-video-playlist-image--@{
- index
- }" />
- }
-
-
-
- }
- }
-
- }
- }
-
-
-
-
-
-
- @fragments.inlineSvg("chevron-left", "icon", Seq("vertical-video-playlist__icon", "vertical-video-playlist__icon--prev"))
-
-
- 1
- of @(containerDefinition.collectionEssentials.items.zipWithIndex.length)
-
-
- @fragments.inlineSvg("chevron-right", "icon", Seq("vertical-video-playlist__icon", "vertical-video-playlist__icon--next"))
-
-
-
diff --git a/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html b/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html
deleted file mode 100644
index 81c1c6f25899..000000000000
--- a/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html
+++ /dev/null
@@ -1,102 +0,0 @@
-@import model.{InlineImage, VideoPlayer}
-@import views.html.fragments.media.video
-@import views.html.fragments.nav.treats
-@import views.html.fragments.atoms.youtube
-@import views.support.{RenderClasses, Video640, Video700}
-@import model.content.MediaAssetPlatform
-@import model.content.MediaWrapper.VideoContainer
-@import model.VideoFaciaProperties
-@import layout.FaciaCardHeader
-@import views.support.GetClasses
-@import model.Pillar.RichPillar
-
-@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-
-
-
-
- @containerDefinition.displayName
-
-
-
-
-
-
- @fragments.inlineSvg("chevron-left", "icon", Seq("video-playlist__icon"))
-
-
-
- -
- @treats(containerDefinition, frontProperties)
-
-
- @containerDefinition.collectionEssentials.items.filter(i => i.header.isVideo).zipWithIndex.map { case (item, index) =>
- -
- @item.properties.maybeContent.map { content =>
- @defining(content.elements.mediaAtoms.find(_.assets.exists(_.platform == MediaAssetPlatform.Youtube))) { youTubeAtom =>
- @youTubeAtom.map { youTubeAtom =>
- @youtube(media = youTubeAtom,
- displayCaption = false,
- mediaWrapper = Some(VideoContainer),
- displayDuration = false,
- faciaHeaderProperties = Some(VideoFaciaProperties(header = FaciaCardHeader.fromTrail(item, None),
- showByline = item.properties.showByline, item.properties.byline)),
- isPaidFor = item.isPaidFor,
- pressedContent = Some(item))
- }
- }
-
-
- @content.elements.mainVideo.map { mainVideo =>
- @defining(VideoPlayer(
- mainVideo,
- Video640,
- item,
- autoPlay = false,
- showControlsAtStart = false,
- path = Some(content.metadata.id)
- )) { player =>
-
-
- @video(player, enhance = false, showEndSlate = false, showOverlay = true, showPoster = false)
-
-
-
- @fragments.inlineSvg("play", "icon")
-
-
- @InlineImage.fromFaciaContent(item).map { fallbackImage =>
-
![]()
1) {data-}src="@Video700.bestSrcFor(fallbackImage.imageMedia)" class="js-video-playlist-image js-video-playlist-image--@{
- index
- }" />
- }
-
-
-
- }
- }
-
- }
- }
-
-
-
- @fragments.inlineSvg("chevron-right", "icon", Seq("video-playlist__icon"))
-
-
diff --git a/common/app/views/fragments/immersiveGalleryMainMedia.scala.html b/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
index 265c56efa102..92f9bc54b661 100644
--- a/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
+++ b/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
@@ -39,10 +39,13 @@
@defining(page.item.elements.mainPicture.flatMap(_.images.masterImage)) {
case Some(masterImage) => {
- @fragments.inlineSvg("triangle", "icon")
- @masterImage.caption.map(Html(_))
- @if(masterImage.displayCredit && !masterImage.creditEndsWithCaption) {
- @masterImage.credit.map(Html(_))
+ @if(masterImage.caption.isDefined || (masterImage.displayCredit && !masterImage.creditEndsWithCaption)) {
+ @fragments.inlineSvg("triangle", "icon")
+ @masterImage.caption.map(Html(_))
+
+ @if(masterImage.displayCredit && !masterImage.creditEndsWithCaption) {
+ @masterImage.credit.map(Html(_))
+ }
}
}
diff --git a/common/app/views/support/Commercial.scala b/common/app/views/support/Commercial.scala
index 8bfbea4fda95..758719b85af9 100644
--- a/common/app/views/support/Commercial.scala
+++ b/common/app/views/support/Commercial.scala
@@ -68,67 +68,6 @@ object Commercial {
def isFoundationFundedContent(page: Page): Boolean = page.metadata.commercial.exists(_.isFoundationFunded)
- def isBrandedContent(page: Page)(implicit request: RequestHeader): Boolean = {
- isPaidContent(page) || isSponsoredContent(page) || isFoundationFundedContent(page)
- }
-
- def listSponsorLogosOnPage(page: Page)(implicit request: RequestHeader): Option[Seq[String]] = {
-
- val edition = Edition(request)
- def sponsor(branding: Branding) = branding.sponsorName.toLowerCase
-
- val pageSponsor = page.metadata.commercial.flatMap(_.branding(edition)).map(sponsor)
-
- val allSponsors = page match {
- case front: PressedPage =>
- val containerSponsors = front.collections.flatMap { container =>
- container.branding(edition) flatMap {
- case b: Branding => Some(b.sponsorName.toLowerCase)
- case _ => None
- }
- }
-
- val cardSponsors = front.collections.flatMap { container =>
- container.branding(edition) match {
- case Some(PaidMultiSponsorBranding) =>
- container.curatedPlusBackfillDeduplicated.flatMap(_.branding(edition).map(sponsor))
- case _ => Nil
- }
- }
-
- val allSponsorsOnPage = pageSponsor.toList ++ containerSponsors ++ cardSponsors
- if (allSponsorsOnPage.isEmpty) None else Some(allSponsorsOnPage.distinct)
-
- case _ => pageSponsor map (Seq(_))
- }
-
- allSponsors map (_ map escapeJavaScript)
- }
-
- def getSponsorForGA(page: Page, key: String)(implicit request: RequestHeader): Html =
- Html {
- if (isBrandedContent(page)) {
- listSponsorLogosOnPage(page) match {
- case Some(logos) => s"&$key=${logos.mkString("|")}"
- case _ => ""
- }
- } else { "" }
- }
-
- def getBrandingTypeForGA(page: Page, key: String)(implicit request: RequestHeader): Html =
- Html {
- brandingType(page) match {
- case Some(branding) => s"&$key=${branding.name}"
- case _ => ""
- }
- }
-
- def brandingType(page: Page)(implicit request: RequestHeader): Option[BrandingType] =
- for {
- commercial <- page.metadata.commercial
- branding <- commercial.branding(Edition(request))
- } yield branding.brandingType
-
object topAboveNavSlot {
// The sizesOverride parameter is for testing only.
def cssClasses(metadata: model.MetaData): String = {
diff --git a/common/app/views/support/ContentLayout.scala b/common/app/views/support/ContentLayout.scala
index c6a21285b12d..0a32320bfd6c 100644
--- a/common/app/views/support/ContentLayout.scala
+++ b/common/app/views/support/ContentLayout.scala
@@ -7,7 +7,7 @@ object ContentLayout {
def showBottomSocialButtons(content: model.ContentType): Boolean = {
content match {
case l: Article if l.isLiveBlog => true
- case a: Article =>
+ case a: Article =>
val bodyLength = Jsoup.parseBodyFragment(a.content.fields.body).select("> *").text().length
val mainMediaOffset = if (a.elements.hasMainPicture || a.elements.hasMainVideo || a.hasVideoAtTop) 700 else 0
bodyLength + mainMediaOffset > 1200
diff --git a/common/app/views/support/CutOut.scala b/common/app/views/support/CutOut.scala
index 09d0d420acef..c11f36e57bbb 100644
--- a/common/app/views/support/CutOut.scala
+++ b/common/app/views/support/CutOut.scala
@@ -24,7 +24,7 @@ object CutOut extends GuLogging {
case Some(Cutout(src, Some(width), Some(height))) =>
Try((width.toInt, height.toInt)) match {
case Success((w, h)) => Option(CutOut(src, Orientation.fromDimensions(w, h)))
- case Failure(t) =>
+ case Failure(t) =>
log.warn(s"Could not convert width and height to INT: $t")
None
}
diff --git a/common/app/views/support/EmailHelpers.scala b/common/app/views/support/EmailHelpers.scala
index 4a9e1e8d32af..a7c4b8e18f34 100644
--- a/common/app/views/support/EmailHelpers.scala
+++ b/common/app/views/support/EmailHelpers.scala
@@ -11,7 +11,7 @@ object EmailHelpers {
def imageUrlFromCard(contentCard: ContentCard, width: Int): Option[String] = {
def imageUrl(displayElement: Option[FaciaDisplayElement]): Option[String] =
displayElement.flatMap {
- case InlineImage(imageMedia) => FrontEmailImage(width).bestSrcFor(imageMedia)
+ case InlineImage(imageMedia) => FrontEmailImage(width).bestSrcFor(imageMedia)
case InlineVideo(video, _, maybeFallbackImage) =>
EmailVideoImage.bestSrcFor(video.images).orElse(imageUrl(maybeFallbackImage))
case InlineYouTubeMediaAtom(atom, posterOverride) =>
diff --git a/common/app/views/support/GetClasses.scala b/common/app/views/support/GetClasses.scala
index 7d84196aa516..c5a8ee9d2be8 100644
--- a/common/app/views/support/GetClasses.scala
+++ b/common/app/views/support/GetClasses.scala
@@ -113,8 +113,6 @@ object GetClasses {
slices.Container.customClasses(containerDefinition.container),
disableHide = containerDefinition.hideToggle,
lazyLoad = containerDefinition.shouldLazyLoad,
- dynamicSlowMpu =
- containerDefinition.container == Dynamic(DynamicSlowMPU(omitMPU = false, adFree = isAdFree(request))),
)
/** TODO get rid of this when we consolidate 'all' logic with index logic */
@@ -125,13 +123,12 @@ object GetClasses {
hasTitle,
isHeadlines = false,
isVideo = false,
- commercialOptions = ContainerCommercialOptions(omitMPU = false, adFree = adFree),
+ commercialOptions = ContainerCommercialOptions(adFree = adFree),
hasDesktopShowMore = false,
container = None,
extraClasses = Nil,
disableHide = true,
lazyLoad = false,
- dynamicSlowMpu = false,
)
def forContainer(
@@ -146,7 +143,6 @@ object GetClasses {
extraClasses: Seq[String] = Nil,
disableHide: Boolean = false,
lazyLoad: Boolean,
- dynamicSlowMpu: Boolean,
): String = {
// no toggle for Headlines container as it will be hosting the weather widget instead
val showToggle =
@@ -161,7 +157,6 @@ object GetClasses {
("fc-container--video", isVideo),
("fc-container--lazy-load", lazyLoad),
("js-container--lazy-load", lazyLoad),
- ("fc-container--dynamic-slow-mpu", dynamicSlowMpu),
("fc-container--will-have-toggle", showToggle),
("js-container--toggle", showToggle),
) collect { case (kls, true) =>
diff --git a/common/app/views/support/HtmlCleaner.scala b/common/app/views/support/HtmlCleaner.scala
index f50fc1452368..d74106cccf5b 100644
--- a/common/app/views/support/HtmlCleaner.scala
+++ b/common/app/views/support/HtmlCleaner.scala
@@ -867,6 +867,7 @@ case class AffiliateLinksCleaner(
showAffiliateLinks: Option[Boolean],
appendDisclaimer: Option[Boolean] = None,
tags: List[String],
+ isUSProductionOffice: Boolean,
) extends HtmlCleaner
with GuLogging {
@@ -879,6 +880,7 @@ case class AffiliateLinksCleaner(
tags,
)
) {
+ val skimlinksId = if (isUSProductionOffice) skimlinksUSId else skimlinksDefaultId
AffiliateLinksCleaner.replaceLinksInHtml(document, pageUrl, skimlinksId)
} else document
}
@@ -901,25 +903,28 @@ object AffiliateLinksCleaner {
html
}
- def replaceLinksInElement(html: String, pageUrl: String): TextBlockElement = {
- val doc = Jsoup.parseBodyFragment(html)
- val linksToReplace: mutable.Seq[Element] = getAffiliateableLinks(doc)
- linksToReplace.foreach { el =>
- el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)).attr("rel", "sponsored")
- }
-
- if (linksToReplace.nonEmpty) {
- TextBlockElement(doc.body().html())
- } else {
- TextBlockElement(html)
+ def replaceUrlInLink(
+ url: Option[String],
+ pageUrl: String,
+ addAffiliateLinks: Boolean,
+ isUSProductionOffice: Boolean,
+ ): Option[String] = {
+ val skimlinksId = if (isUSProductionOffice) skimlinksUSId else skimlinksDefaultId
+ val httpsUrl = url.map(ensureHttps)
+ httpsUrl match {
+ case Some(link) if addAffiliateLinks && SkimLinksCache.isSkimLink(link) =>
+ Some(linkToSkimLink(link, pageUrl, skimlinksId))
+ case _ => httpsUrl
}
}
+ def ensureHttps(url: String): String = url.replace("http:", "https:")
+
def isAffiliatable(element: Element): Boolean =
element.tagName == "a" && SkimLinksCache.isSkimLink(element.attr("href"))
def linkToSkimLink(link: String, pageUrl: String, skimlinksId: String): String = {
- val urlEncodedLink = URLEncode(link)
+ val urlEncodedLink = URLEncode(ensureHttps(link))
s"https://go.skimresources.com/?id=$skimlinksId&url=$urlEncodedLink&sref=$host$pageUrl"
}
diff --git a/common/app/views/support/ImageProfile.scala b/common/app/views/support/ImageProfile.scala
index 614df858eb2d..e95712a5b0c4 100644
--- a/common/app/views/support/ImageProfile.scala
+++ b/common/app/views/support/ImageProfile.scala
@@ -150,6 +150,14 @@ class ShareImage(
val overlayAlignParam = "overlay-align=bottom%2Cleft"
val overlayWidthParam = "overlay-width=100p"
+ // If we only use "fit=crop", then fastly will crop to the centre of the image.
+ // This often means that we lose the tops of people's faces which looks bad,
+ // especially since the switch from 5:4 to 5:3 images means that they tend to be
+ // even taller than the social share image's ratios.
+ // Instead, tell fastly to crop to 40:21 (equivalent to 1200:630), anchoring to the top
+ // vertically, but the centre horizontally, BEFORE it resizes and fits the image to 1200x630.
+ val precropParam = "precrop=40:21,offset-x50,offset-y0"
+
override def resizeString: String = {
if (shouldIncludeOverlay) {
val params = Seq(
@@ -158,6 +166,7 @@ class ShareImage(
qualityparam,
autoParam,
fitParam,
+ precropParam,
dprParam,
overlayAlignParam,
overlayWidthParam,
@@ -184,6 +193,8 @@ case class GuardianOldContent(publicationYear: Int) extends ShareImageCategory
case class ObserverStarRating(rating: Int) extends ShareImageCategory
case class GuardianStarRating(rating: Int) extends ShareImageCategory
case object Paid extends ShareImageCategory
+case object FilterUk extends ShareImageCategory
+case object FilterUs extends ShareImageCategory
trait OverlayBase64 {
def overlayUrlBase64(overlay: String): String =
@@ -214,6 +225,10 @@ object OpenGraphImage extends OverlayBase64 {
case ObserverStarRating(rating) => starRatingObserver(rating, shouldIncludeOverlay, shouldUpscale)
case GuardianStarRating(rating) => starRating(rating, shouldIncludeOverlay, shouldUpscale)
case Paid => Item700
+ case FilterUk =>
+ new ShareImage(s"overlay-base64=${overlayUrlBase64("filter-uk.png")}", shouldIncludeOverlay, shouldUpscale)
+ case FilterUs =>
+ new ShareImage(s"overlay-base64=${overlayUrlBase64("filter-us.png")}", shouldIncludeOverlay, shouldUpscale)
}
}
diff --git a/common/app/views/support/MostPopular.scala b/common/app/views/support/MostPopular.scala
index 7d60a3f2bbb5..aa34eb336879 100644
--- a/common/app/views/support/MostPopular.scala
+++ b/common/app/views/support/MostPopular.scala
@@ -9,7 +9,6 @@ object MostPopular extends implicits.Requests {
}
def showMPU(maybeContainer: Option[FaciaContainer]): Boolean = {
- !maybeContainer.exists(_.commercialOptions.omitMPU) &&
!isAdFree(maybeContainer)
}
diff --git a/common/app/views/support/package.scala b/common/app/views/support/package.scala
index 1ff524e6ded1..1b1a6b37b856 100644
--- a/common/app/views/support/package.scala
+++ b/common/app/views/support/package.scala
@@ -239,7 +239,7 @@ object RenderOtherStatus {
result.header.status match {
case 404 => NoCache(NotFound)
case 410 if request.isJson => Cached(60)(JsonComponent(gonePage, "status" -> "GONE"))
- case 410 =>
+ case 410 =>
Cached(60)(
WithoutRevalidationResult(
Gone(
diff --git a/common/test/CommonTestSuite.scala b/common/test/CommonTestSuite.scala
index 9400a56d2ca4..f8f700c52f24 100644
--- a/common/test/CommonTestSuite.scala
+++ b/common/test/CommonTestSuite.scala
@@ -1,5 +1,6 @@
package test
+import ab.ABTestsTest
import conf.CachedHealthCheckTest
import conf.audio.FlagshipFrontContainerSpec
import navigation.NavigationTest
@@ -8,6 +9,7 @@ import renderers.DotcomRenderingServiceTest
class CommonTestSuite
extends Suites(
+ new ABTestsTest,
new CachedHealthCheckTest,
new NavigationTest,
new FlagshipFrontContainerSpec,
diff --git a/common/test/ab/ABTestsTest.scala b/common/test/ab/ABTestsTest.scala
new file mode 100644
index 000000000000..af8c43a04cce
--- /dev/null
+++ b/common/test/ab/ABTestsTest.scala
@@ -0,0 +1,226 @@
+package ab
+
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import play.api.test.FakeRequest
+import play.api.mvc.RequestHeader
+import play.api.libs.typedmap.TypedMap
+
+class ABTestsTest extends AnyFlatSpec with Matchers {
+
+ private val abTestHeader = "X-GU-Server-AB-Tests"
+
+ "ABTests.decorateRequest" should "parse AB test header correctly" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle empty header" in {
+ val request = FakeRequest()
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should be(empty)
+ }
+
+ it should "handle malformed test entries" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,malformed,test2:variant2:extra")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ )
+ }
+
+ it should "handle test entries with missing variant" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle test entries with colons in values" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant:with:colons,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle empty string header" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should be(empty)
+ }
+
+ "ABTests.isParticipating" should "return true when test exists" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isParticipating(enrichedRequest, "test1") should be(true)
+ ABTests.isParticipating(enrichedRequest, "test2") should be(true)
+ }
+
+ it should "return false when test does not exist" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isParticipating(enrichedRequest, "test3") should be(false)
+ }
+
+ it should "return false for empty request" in {
+ val request = FakeRequest()
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isParticipating(enrichedRequest, "test1") should be(false)
+ }
+
+ it should "return false when request has no AB test attributes" in {
+ val request = FakeRequest()
+
+ ABTests.isParticipating(request, "test1") should be(false)
+ }
+
+ "ABTests.isInVariant" should "return true when test and variant match" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isInVariant(enrichedRequest, "test1", "variant1") should be(true)
+ ABTests.isInVariant(enrichedRequest, "test2", "variant2") should be(true)
+ }
+
+ it should "return false when test exists but variant does not match" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isInVariant(enrichedRequest, "test1", "variant2") should be(false)
+ ABTests.isInVariant(enrichedRequest, "test2", "variant1") should be(false)
+ }
+
+ it should "return false when test does not exist" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isInVariant(enrichedRequest, "test3", "variant1") should be(false)
+ }
+
+ it should "return false for empty request" in {
+ val request = FakeRequest()
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.isInVariant(enrichedRequest, "test1", "variant1") should be(false)
+ }
+
+ it should "return false when request has no AB test attributes" in {
+ val request = FakeRequest()
+
+ ABTests.isInVariant(request, "test1", "variant1") should be(false)
+ }
+
+ "ABTests.allTests" should "return all parsed tests" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2,test3:control")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ "test3" -> "control",
+ )
+ }
+
+ it should "return empty map for request without AB tests" in {
+ val request = FakeRequest()
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should be(empty)
+ }
+
+ it should "return empty map when request has no AB test attributes" in {
+ val request = FakeRequest()
+
+ ABTests.allTests(request) should be(empty)
+ }
+
+ "ABTests.getJavascriptConfig" should "return properly formatted JavaScript config" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ val jsConfig = ABTests.getJavascriptConfig(enrichedRequest)
+
+ // The order might vary, so check both possible orders
+ jsConfig should (equal(""""test1":"variant1","test2":"variant2"""") or
+ equal(""""test2":"variant2","test1":"variant1""""))
+ }
+
+ it should "return empty string for request without AB tests" in {
+ val request = FakeRequest()
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.getJavascriptConfig(enrichedRequest) should be("")
+ }
+
+ it should "handle single test" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.getJavascriptConfig(enrichedRequest) should be(""""test1":"variant1"""")
+ }
+
+ it should "return empty string when request has no AB test attributes" in {
+ val request = FakeRequest()
+
+ ABTests.getJavascriptConfig(request) should be("")
+ }
+
+ "ABTests header parsing" should "handle whitespace around test entries" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> " test1:variant1 , test2:variant2 ")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle trailing commas" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,test2:variant2,")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle leading commas" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> ",test1:variant1,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ )
+ }
+
+ it should "handle multiple consecutive commas" in {
+ val request = FakeRequest().withHeaders(abTestHeader -> "test1:variant1,,test2:variant2")
+ val enrichedRequest = ABTests.decorateRequest(request, abTestHeader)
+
+ ABTests.allTests(enrichedRequest) should contain theSameElementsAs Map(
+ "test1" -> "variant1",
+ "test2" -> "variant2",
+ )
+ }
+
+ "ABTests constant values" should "have correct header name" in {
+ abTestHeader should be("X-GU-Server-AB-Tests")
+ }
+}
diff --git a/common/test/common/LinkToTest.scala b/common/test/common/LinkToTest.scala
index de47ca71cb69..eae3aedffa1b 100644
--- a/common/test/common/LinkToTest.scala
+++ b/common/test/common/LinkToTest.scala
@@ -127,8 +127,8 @@ class LinkToTest extends AnyFlatSpec with Matchers with implicits.FakeRequests {
TheGuardianLinkTo("/thefilter", Europe) should endWith(s"www.theguardian.com/uk/thefilter")
}
- it should "correctly editionalise thefilter US to point to uk/thefilter temporarily until we create us/thefilter" in {
- TheGuardianLinkTo("/thefilter", Us) should endWith(s"www.theguardian.com/uk/thefilter")
+ it should "correctly editionalise thefilter US to point to us/thefilter" in {
+ TheGuardianLinkTo("/thefilter", Us) should endWith(s"www.theguardian.com/us/thefilter")
}
object TestCanonicalLink extends CanonicalLink
diff --git a/common/test/common/ModelOrResultTest.scala b/common/test/common/ModelOrResultTest.scala
index e98c296f5962..063fae9a2021 100644
--- a/common/test/common/ModelOrResultTest.scala
+++ b/common/test/common/ModelOrResultTest.scala
@@ -28,8 +28,8 @@ class ModelOrResultTest extends AnyFlatSpec with Matchers with WithTestExecution
sectionName = None,
webPublicationDate = Some(offsetDate.toCapiDateTime),
webTitle = "the title",
- webUrl = "http://www.guardian.co.uk/canonical",
- apiUrl = "http://foo.bar",
+ webUrl = "https://www.theguardian.com/the/id",
+ apiUrl = "https://foo.bar",
elements = None,
)
@@ -46,6 +46,7 @@ class ModelOrResultTest extends AnyFlatSpec with Matchers with WithTestExecution
val audioTag = articleTag.copy(id = "type/audio")
val testArticle = testContent.copy(tags = List(articleTag))
+ val testEvolvedArticle = testArticle.copy(webUrl = "https://www.theguardian.com/the-new-url")
val testGallery = testContent.copy(tags = List(galleryTag))
val testVideo = testContent.copy(tags = List(videoTag))
val testAudio = testContent.copy(tags = List(audioTag))
@@ -102,6 +103,18 @@ class ModelOrResultTest extends AnyFlatSpec with Matchers with WithTestExecution
headers(notFound).apply("X-Accel-Redirect") should be("/type/article/the/id")
}
+ it should "internal redirect to an article with evolved url if it has shown up at the wrong server" in {
+ val notFound = Future {
+ ModelOrResult(
+ item = None,
+ response = stubResponse.copy(content = Some(testEvolvedArticle)),
+ ).left.value
+ }
+
+ status(notFound) should be(200)
+ headers(notFound).apply("X-Accel-Redirect") should be("/type/article/the-new-url")
+ }
+
it should "internal redirect to a video if it has shown up at the wrong server" in {
val notFound = Future {
ModelOrResult(
diff --git a/common/test/common/TrailsToShowcaseTest.scala b/common/test/common/TrailsToShowcaseTest.scala
index a20d88a67f3e..fd68d3958133 100644
--- a/common/test/common/TrailsToShowcaseTest.scala
+++ b/common/test/common/TrailsToShowcaseTest.scala
@@ -1346,7 +1346,13 @@ class TrailsToShowcaseTest extends AnyFlatSpec with Matchers with EitherValues {
isBreaking = false,
showByline = false,
showKickerTag = false,
- imageSlideshowReplace = false,
+ mediaSelect = Some(
+ MediaSelect(
+ showMainVideo = false,
+ imageSlideshowReplace = false,
+ videoReplace = false,
+ ),
+ ),
maybeContent = mayBeContent,
maybeContentId = None,
isLiveBlog = false,
@@ -1363,7 +1369,6 @@ class TrailsToShowcaseTest extends AnyFlatSpec with Matchers with EitherValues {
webUrl = Some("an-article"),
editionBrandings = None,
atomId = None,
- showMainVideo = false,
)
val kicker = kickerText.map { k =>
@@ -1407,6 +1412,7 @@ class TrailsToShowcaseTest extends AnyFlatSpec with Matchers with EitherValues {
val displaySettings = PressedDisplaySettings(
isBoosted = false,
boostLevel = Some(BoostLevel.Default),
+ isImmersive = Some(false),
showBoostedHeadline = false,
showQuotedHeadline = false,
showLivePlayable = false,
@@ -1423,6 +1429,7 @@ class TrailsToShowcaseTest extends AnyFlatSpec with Matchers with EitherValues {
enriched = None,
supportingContent = supportingContent.toList,
cardStyle = CardStyle.make(Editorial),
+ mediaAtom = None,
)
}
}
diff --git a/common/test/common/dfp/LiveBlogTopSponsorshipTest.scala b/common/test/common/dfp/LiveBlogTopSponsorshipTest.scala
new file mode 100644
index 000000000000..2b997b603d36
--- /dev/null
+++ b/common/test/common/dfp/LiveBlogTopSponsorshipTest.scala
@@ -0,0 +1,85 @@
+package common.dfp
+
+import com.gu.contentapi.client.model.v1.TagType
+import common.Edition
+import common.editions.{Uk, Us}
+import model.{Tag, TagProperties}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+class LiveBlogTopSponsorshipTest extends AnyFlatSpec with Matchers {
+ def mkLiveBlogTopSponsorship(
+ lineItemName: String = "test-sponsorship",
+ lineItemId: Long = 7000726282L,
+ sections: Seq[String] = Seq.empty,
+ editions: Seq[Edition] = Seq.empty,
+ keywords: Seq[String] = Seq.empty,
+ adTest: Option[String] = Some("ad-test-param"),
+ targetsAdTest: Boolean = true,
+ ): LiveBlogTopSponsorship = {
+ LiveBlogTopSponsorship(lineItemName, lineItemId, sections, editions, keywords, adTest, targetsAdTest)
+ }
+
+ def mkTag(
+ tagId: String = "sport/cricket",
+ tagSection: String = "sport",
+ tagType: String = "Keyword",
+ ): Tag = {
+ Tag(
+ properties = TagProperties(
+ id = tagId,
+ url = s"https://content.guardianapis.com/$tagId",
+ tagType = tagType,
+ sectionId = tagSection,
+ sectionName = tagSection,
+ webTitle = tagId.split("/").last,
+ webUrl = s"https://www.theguardian.com/$tagId",
+ twitterHandle = None,
+ bio = None,
+ description = None,
+ emailAddress = None,
+ contributorLargeImagePath = None,
+ bylineImageUrl = None,
+ podcast = None,
+ references = Seq.empty,
+ paidContentType = None,
+ commercial = None,
+ ),
+ pagination = None,
+ richLinkId = None,
+ )
+ }
+
+ "matchesKeywordTargeting" should "be true if there is no keyword targeting on the sponsorship" in {
+ val cricketKeywordTag = mkTag()
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(keywords = Seq.empty)
+ liveBlogTopSponsorship.matchesKeywordTargeting(Seq(cricketKeywordTag)) shouldBe true
+ }
+
+ it should "be true if sponsorship keyword targeting matches article keyword tags" in {
+ val cricketKeywordTag = mkTag()
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(keywords = Seq("cricket"))
+ liveBlogTopSponsorship.matchesKeywordTargeting(Seq(cricketKeywordTag)) shouldBe true
+ }
+
+ it should "be false if sponsorship keyword targeting does not match article keyword tags" in {
+ val cricketKeywordTag = mkTag()
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(keywords = Seq("football"))
+ liveBlogTopSponsorship.matchesKeywordTargeting(Seq(cricketKeywordTag)) shouldBe false
+ }
+
+ "matchesEditionTargeting" should "be true if no editions in sponsorship" in {
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(editions = Seq.empty)
+ liveBlogTopSponsorship.matchesEditionTargeting(Uk) shouldBe true
+ }
+
+ it should "be true if edition matches sponsorship" in {
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(editions = Seq(Uk))
+ liveBlogTopSponsorship.matchesEditionTargeting(Uk) shouldBe true
+ }
+
+ it should "be false if edition does not match sponsorship targeted editions" in {
+ val liveBlogTopSponsorship = mkLiveBlogTopSponsorship(editions = Seq(Uk))
+ liveBlogTopSponsorship.matchesEditionTargeting(Us) shouldBe false
+ }
+}
diff --git a/common/test/common/dfp/TakeoverWithEmptyMPUsTest.scala b/common/test/common/dfp/TakeoverWithEmptyMPUsTest.scala
deleted file mode 100644
index 843de67bb33c..000000000000
--- a/common/test/common/dfp/TakeoverWithEmptyMPUsTest.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-package common.dfp
-
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
-import play.api.data.validation.{Invalid, Valid}
-
-class TakeoverWithEmptyMPUsTest extends AnyFlatSpec with Matchers {
-
- "TakeoverWithEmptyMPUs" should "recognise as valid urls that are at least 1 directory deep" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com/uk") should equal(Valid)
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as valid urls that have multiple directories deep" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com/abc/def/ghi") should equal(Valid)
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that have no path" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com") should equal(
- Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us"),
- )
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that have a naked slash path" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com/") should equal(
- Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us"),
- )
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that are invalid" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("123") should equal(
- Invalid("Must be a valid URL. eg: http://www.theguardian.com/us"),
- )
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that are empty" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("") should equal(
- Invalid("Must be a valid URL. eg: http://www.theguardian.com/us"),
- )
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that are empty beyond the naked slash" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com/ ") should equal(
- Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us"),
- )
- }
-
- "TakeoverWithEmptyMPUs" should "recognise as invalid urls that are empty beyond the root" in {
- TakeoverWithEmptyMPUs.mustBeAtLeastOneDirectoryDeep("http://www.theguardian.com ") should equal(
- Invalid("Must be at least one directory deep. eg: http://www.theguardian.com/us"),
- )
- }
-}
diff --git a/common/test/common/facia/FixtureBuilder.scala b/common/test/common/facia/FixtureBuilder.scala
index ab84a7e1563a..5ab2352d882f 100644
--- a/common/test/common/facia/FixtureBuilder.scala
+++ b/common/test/common/facia/FixtureBuilder.scala
@@ -26,7 +26,6 @@ object FixtureBuilder {
href = None,
description = None,
collectionType = "unknown",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -51,10 +50,15 @@ object FixtureBuilder {
def mkProperties(id: Int): PressedProperties =
PressedProperties(
isBreaking = false,
- showMainVideo = false,
+ mediaSelect = Some(
+ MediaSelect(
+ showMainVideo = false,
+ imageSlideshowReplace = false,
+ videoReplace = false,
+ ),
+ ),
showKickerTag = false,
showByline = false,
- imageSlideshowReplace = false,
maybeContent = None,
maybeContentId = Some(id.toString),
isLiveBlog = false,
@@ -114,6 +118,7 @@ object FixtureBuilder {
PressedDisplaySettings(
isBoosted = false,
boostLevel = Some(BoostLevel.Default),
+ isImmersive = Some(false),
showBoostedHeadline = false,
showQuotedHeadline = false,
imageHide = false,
@@ -132,6 +137,7 @@ object FixtureBuilder {
supportingContent = Nil,
cardStyle = DefaultCardstyle,
format = ContentFormat.defaultContentFormat,
+ mediaAtom = None,
)
}
@@ -145,6 +151,7 @@ object FixtureBuilder {
display = mkDisplay(),
enriched = None,
format = ContentFormat.defaultContentFormat,
+ mediaAtom = None,
)
}
}
diff --git a/common/test/common/facia/PressedCollectionBuilder.scala b/common/test/common/facia/PressedCollectionBuilder.scala
index 1310d940c04c..0c5486e74e9f 100644
--- a/common/test/common/facia/PressedCollectionBuilder.scala
+++ b/common/test/common/facia/PressedCollectionBuilder.scala
@@ -51,7 +51,6 @@ object PressedCollectionBuilder {
),
description = Some("desc"),
collectionType,
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
diff --git a/common/test/conf/CachedHealthCheckTest.scala b/common/test/conf/CachedHealthCheckTest.scala
index 886f9550e630..5c2581711f62 100644
--- a/common/test/conf/CachedHealthCheckTest.scala
+++ b/common/test/conf/CachedHealthCheckTest.scala
@@ -32,7 +32,7 @@ import scala.util.Random
val path = s"/path/${Random.alphanumeric.take(12).mkString}"
statusCode match {
case 200 => HealthCheckResult(path, HealthCheckResultTypes.Success(statusCode), date, expiration)
- case _ =>
+ case _ =>
HealthCheckResult(path, HealthCheckResultTypes.Failure(statusCode, "Something went bad"), date, expiration)
}
}
diff --git a/common/test/helpers/FaciaTestData.scala b/common/test/helpers/FaciaTestData.scala
index 2cd6b88728f3..39000abcd11f 100644
--- a/common/test/helpers/FaciaTestData.scala
+++ b/common/test/helpers/FaciaTestData.scala
@@ -118,7 +118,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -147,7 +146,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -176,7 +174,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -205,7 +202,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -234,7 +230,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -263,7 +258,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -292,7 +286,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -321,7 +314,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -350,7 +342,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -371,7 +362,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
@@ -392,7 +382,6 @@ trait FaciaTestData extends ModelHelper {
href = None,
description = None,
collectionType = "",
- groupsConfig = None,
uneditable = false,
showTags = false,
showSections = false,
diff --git a/common/test/html/BrazeEmailFormatterTest.scala b/common/test/html/BrazeEmailFormatterTest.scala
index 48d64e4d8031..f83308ed70c1 100644
--- a/common/test/html/BrazeEmailFormatterTest.scala
+++ b/common/test/html/BrazeEmailFormatterTest.scala
@@ -3,6 +3,7 @@ package html
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import play.twirl.api.Html
+import org.jsoup.Jsoup
class BrazeEmailFormatterTest extends AnyFlatSpec with Matchers {
@@ -83,7 +84,10 @@ class BrazeEmailFormatterTest extends AnyFlatSpec with Matchers {
|
- Merchandising: blended component -
-
- @if(isTabbed) {
-
-}
diff --git a/common/app/views/fragments/containers/facia_cards/container.scala.html b/common/app/views/fragments/containers/facia_cards/container.scala.html
index bcc828a10de5..8286229646c5 100644
--- a/common/app/views/fragments/containers/facia_cards/container.scala.html
+++ b/common/app/views/fragments/containers/facia_cards/container.scala.html
@@ -1,6 +1,6 @@
@import common.commercial.ContainerModel
@import layout.MetaDataHeader
-@import layout.slices.{Dynamic, Fixed, MostPopular, NavList, NavMediaList, Video, VerticalVideo}
+@import layout.slices.{Dynamic, Fixed, MostPopular, NavList, NavMediaList}
@import views.html.fragments.commercial.containers.paidContainer
@import views.html.fragments.audio.containers.flagshipContainer
@import views.html.fragments.containers.facia_cards._
@@ -83,12 +83,6 @@
}
- case Video => {
-
-
- }
-
- -
- @popular.zipWithRowInfo.map{ case (section, info) =>
-
- - - Most viewed @Html(Localisation(section.heading.stripPrefix("popular ").stripPrefix("Most viewed "))) - - - } -
- }
-
- @popular.zipWithRowInfo.map{ case (section, info) =>
-
-
-
-
- }
- @if(showMPU(containerDefinition) && isFront) {
- -
- @section.trails.zipWithRowInfo.map{ case (trail, info) =>
- @defining(FaciaCardHeader.fromTrail(trail, None)) { header =>
-
-
- - - @fragments.inlineSvg(s"number-${info.rowNum}", "numbers") - -- @RemoveOuterParaHtml(header.headline) -- @title(header, 2, 2, "headline-list__body", isAction = trail.isActionCard) - @trail.properties.maybeContent.map { content => - @if(content.tags.tags.exists(_.id == "tone/news") || content.tags.tags.exists(_.id == "tone/comment")) { - @fragments.contentAgeNotice(ContentOldAgeDescriber(content)) - } - } --
- }
- }
-
-
- }
- @if(isTabbed) {
-
- @mostCards.getOrElse("most_commented", None).map { mostCommented =>
-
-
-
-
- @simpleContentCard(mostCommented, 0, 0, "", false, false)
-
- }
-
- @mostCards.getOrElse("most_shared", None).map { mostShared =>
-
- @simpleContentCard(mostShared, 0, 0, "", false, false)
-
- }
-
- @videoContainer(containerDefinition, frontProperties)
-
- }
-
case NavMediaList => {
@navMediaListContainer(containerDefinition, frontProperties)
diff --git a/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html b/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
index f1b4c6c6d28e..d22324dd9970 100644
--- a/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
+++ b/common/app/views/fragments/containers/facia_cards/mostPopularContainer.scala.html
@@ -1,10 +1,7 @@
@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-@import conf.switches.Switches
@import common.LinkTo
@import model.MostPopular
-@import fragments.commercial.adSlot
-@import layout.ContentCard
@defining("Most viewed") { containerTitle =>
-
- @if(Switches.ExtendedMostPopularFronts.isSwitchedOn) {
-
@@ -20,53 +17,20 @@
}
-
- } else {
-
- @defining(Seq(
- MostPopular(
- containerDefinition.displayName.getOrElse(containerTitle),
- containerTitle,
- containerDefinition.items.take(10)
- ),
- MostPopular(
- "Across the guardian",
- containerTitle,
- Nil
- )
- )) { popular =>
- @fragments.collections.popularExtended(popular)
- }
-
-
-
-
- @adSlot(
- "mostpop",
- Seq("container-inline"),
- Map(),
- optId = None,
- optClassNames = None
- ){ }
-
-
- @defining(Seq(
- MostPopular(
- containerDefinition.displayName.getOrElse(containerTitle),
- containerTitle,
- containerDefinition.items.take(10)
- ),
- MostPopular(
- "Across the guardian",
- containerTitle,
- Nil
- )
- )) { popular =>
- @fragments.collections.popular(popular, Some(containerDefinition), isFront = true)
- }
-
+
+ @defining(Seq(
+ MostPopular(
+ containerDefinition.displayName.getOrElse(containerTitle),
+ containerTitle,
+ containerDefinition.items.take(10)
+ ),
+ MostPopular(
+ "Across the guardian",
+ containerTitle,
+ Nil
+ )
+ )) { popular =>
+ @fragments.collections.popular(popular, Some(containerDefinition), isFront = true)
}
+
}
diff --git a/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html b/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html
deleted file mode 100644
index a058c262ed5e..000000000000
--- a/common/app/views/fragments/containers/facia_cards/verticalVideoContainer.scala.html
+++ /dev/null
@@ -1,118 +0,0 @@
-@import model.{InlineImage, VideoPlayer}
-@import views.html.fragments.media.video
-@import views.html.fragments.nav.treats
-@import views.html.fragments.atoms.youtube
-@import views.support.{RenderClasses, Video640, Video700}
-@import model.content.MediaAssetPlatform
-@import model.content.MediaWrapper.VideoContainer
-@import model.VideoFaciaProperties
-@import layout.FaciaCardHeader
-@import model.Pillar.RichPillar
-
-@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-
-
-
-
-
-- @containerDefinition.displayName -
-
-
-
-
-
diff --git a/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html b/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html
deleted file mode 100644
index 81c1c6f25899..000000000000
--- a/common/app/views/fragments/containers/facia_cards/videoContainer.scala.html
+++ /dev/null
@@ -1,102 +0,0 @@
-@import model.{InlineImage, VideoPlayer}
-@import views.html.fragments.media.video
-@import views.html.fragments.nav.treats
-@import views.html.fragments.atoms.youtube
-@import views.support.{RenderClasses, Video640, Video700}
-@import model.content.MediaAssetPlatform
-@import model.content.MediaWrapper.VideoContainer
-@import model.VideoFaciaProperties
-@import layout.FaciaCardHeader
-@import views.support.GetClasses
-@import model.Pillar.RichPillar
-
-@(containerDefinition: layout.FaciaContainer, frontProperties: model.FrontProperties)(implicit requestHeader: RequestHeader)
-
--
-
- - @treats(containerDefinition, frontProperties) - - - @containerDefinition.collectionEssentials.items.filter(i => i.header.isVideo).zipWithIndex.map { case (item, index) => -
-
- @item.properties.maybeContent.map { content =>
- @defining(content.elements.mediaAtoms.find(_.assets.exists(_.platform == MediaAssetPlatform.Youtube))) { youTubeAtom =>
- @youTubeAtom.map { youTubeAtom =>
- @youtube(media = youTubeAtom,
- displayCaption = false,
- mediaWrapper = Some(VideoContainer),
- displayDuration = false,
- faciaHeaderProperties = Some(VideoFaciaProperties(header = FaciaCardHeader.fromTrail(item, None),
- showByline = item.properties.showByline, item.properties.byline)),
- isPaidFor = item.isPaidFor,
- pressedContent = Some(item),
- verticalVideo = true
- )
- }
- }
-
-
- @content.elements.mainVideo.map { mainVideo =>
- @defining(VideoPlayer(
- mainVideo,
- Video640,
- item,
- autoPlay = false,
- showControlsAtStart = false,
- path = Some(content.metadata.id)
- )) { player =>
- --- @video(player, enhance = false, showEndSlate = false, showOverlay = true, showPoster = false) ---- } - } -@fragments.inlineSvg("play", "icon")---- @InlineImage.fromFaciaContent(item).map { fallbackImage => --
1) {data-}src="@Video700.bestSrcFor(fallbackImage.imageMedia)" class="js-video-playlist-image js-video-playlist-image--@{ - index - }" /> - } -
- }
- }
-
-
- @fragments.inlineSvg("chevron-left", "icon", Seq("vertical-video-playlist__icon", "vertical-video-playlist__icon--prev"))
-
-
- 1
- of @(containerDefinition.collectionEssentials.items.zipWithIndex.length)
-
-
- @fragments.inlineSvg("chevron-right", "icon", Seq("vertical-video-playlist__icon", "vertical-video-playlist__icon--next"))
-
-
-
-
-
-
-
-- @containerDefinition.displayName -
-
-
- @fragments.inlineSvg("chevron-left", "icon", Seq("video-playlist__icon"))
-
-
-
diff --git a/common/app/views/fragments/immersiveGalleryMainMedia.scala.html b/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
index 265c56efa102..92f9bc54b661 100644
--- a/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
+++ b/common/app/views/fragments/immersiveGalleryMainMedia.scala.html
@@ -39,10 +39,13 @@
@defining(page.item.elements.mainPicture.flatMap(_.images.masterImage)) {
case Some(masterImage) => {
-
-
- - @treats(containerDefinition, frontProperties) - - - @containerDefinition.collectionEssentials.items.filter(i => i.header.isVideo).zipWithIndex.map { case (item, index) => -
-
- @item.properties.maybeContent.map { content =>
- @defining(content.elements.mediaAtoms.find(_.assets.exists(_.platform == MediaAssetPlatform.Youtube))) { youTubeAtom =>
- @youTubeAtom.map { youTubeAtom =>
- @youtube(media = youTubeAtom,
- displayCaption = false,
- mediaWrapper = Some(VideoContainer),
- displayDuration = false,
- faciaHeaderProperties = Some(VideoFaciaProperties(header = FaciaCardHeader.fromTrail(item, None),
- showByline = item.properties.showByline, item.properties.byline)),
- isPaidFor = item.isPaidFor,
- pressedContent = Some(item))
- }
- }
-
-
- @content.elements.mainVideo.map { mainVideo =>
- @defining(VideoPlayer(
- mainVideo,
- Video640,
- item,
- autoPlay = false,
- showControlsAtStart = false,
- path = Some(content.metadata.id)
- )) { player =>
- --- @video(player, enhance = false, showEndSlate = false, showOverlay = true, showPoster = false) ---- } - } -@fragments.inlineSvg("play", "icon")---- @InlineImage.fromFaciaContent(item).map { fallbackImage => --
1) {data-}src="@Video700.bestSrcFor(fallbackImage.imageMedia)" class="js-video-playlist-image js-video-playlist-image--@{ - index - }" /> - } -
- }
- }
-